Commit Graph

16 Commits (43f51881ca74974913cc68645496e6d5c8a9afdb)

Author SHA1 Message Date
lijiayao de9f2e6a24 fix: 代码丢失找回 2024-04-06 20:08:16 +08:00
liuyunhu 78f59d7392 优化 2024-04-06 16:30:00 +08:00
liuyunhu 64caa2296c 11 2024-04-06 10:56:05 +08:00
lijiayao e8c0690352 Merge branch 'server_five_xiaoyao' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/BreakdownServiceImpl.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java
2024-04-06 10:10:11 +08:00
lijiayao 5c2021d6f2 Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java
#	couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleController.java
#	couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleMapper.java
#	couplet-modules/couplet-business/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleMapper.xml
#	couplet-modules/couplet-modules-mq/pom.xml
#	couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/CoupletMqApplatcaion.java
#	couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/MqConsumer.java
2024-04-06 10:04:53 +08:00
liuyunhu 9419a2f0a6 11 2024-04-05 19:01:11 +08:00
lijiayao e5352e3778 Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/contents/StateConstant.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/BreakdownServiceImpl.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java
2024-04-05 10:12:45 +08:00
ffr 4a6124d181 upd commit 2024-04-05 10:10:12 +08:00
lijiayao 0b9423d817 feat: 事件系统 2024-04-05 09:49:04 +08:00
liuyunhu 562deda30a 修改远程调用 配置,有的变量没改导致调用不通 2024-04-04 09:43:08 +08:00
lijiayao 2352def47e refactor: 修改框架 2024-04-03 11:01:11 +08:00
lijiayao 6ab26976d6 Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
# Conflicts:
#	couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java
2024-04-03 09:03:51 +08:00
liuyunhu ffa06bc02e 虎虎虎虎 2024-04-03 08:35:23 +08:00
dongxiaodong 3947f9414e dxd解析报文 2024-04-02 21:42:16 +08:00
liuyunhu 08aec277e6 虎虎虎虎 2024-04-02 14:46:36 +08:00
liuyunhu c3aee00eff 虎虎虎虎 2024-04-02 09:07:40 +08:00