dongxiaodong
|
757f51a2dd
|
Merge branch 'server_five' into server_five_dongxiaodong
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/CoupletMsgApplication.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/consumer/KafkaConsumerQuickStart.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/contents/KafkaContents.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/producer/KafkaProducerQuickStart.java
|
2024-04-02 14:24:20 +08:00 |
|
dongxiaodong
|
5b499eb8c3
|
Kafka测试
|
2024-04-02 14:22:55 +08:00 |
|
dongxiaodong
|
143176fd5a
|
Kafka测试
|
2024-04-01 20:48:43 +08:00 |
 liuyunhu
|
f597b6cbfc
|
虎，车辆模块完善，前台完善，功能已完成
|
2024-03-31 22:10:30 +08:00 |
|
liuyunhu
|
42c80590ff
|
虎，车辆模块优化，车辆和类型的关联
|
2024-03-31 10:53:19 +08:00 |
lijiayao
|
09c28eb1fb
|
Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
# couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml
# couplet-modules/couplet-file/src/main/resources/bootstrap.yml
# couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
# couplet-modules/couplet-job/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
# couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
|
2024-03-30 00:42:31 +08:00 |
|
liuyunhu
|
3a4ddc8f2e
|
虎，车辆模块优化、mq模块测试，无法传输参数，数据到达交换机就停了
|
2024-03-29 22:32:16 +08:00 |