Commit Graph

46 Commits (43f51881ca74974913cc68645496e6d5c8a9afdb)

Author SHA1 Message Date
lijiayao e5c4c0b9a4 perf: 优化 2024-04-06 21:56:29 +08:00
lijiayao 8803a91628 Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five
# Conflicts:
#	couplet-modules/couplet-business/src/main/resources/bootstrap.yml
2024-04-06 21:54:44 +08:00
dongxiaodong 65c64098ab 删除文件 2024-04-06 21:39:26 +08:00
dongxiaodong 165583d024 kafka代码 2024-04-06 21:34:23 +08:00
lijiayao de9f2e6a24 fix: 代码丢失找回 2024-04-06 20:08:16 +08:00
dongxiaodong d8e65c8da3 kafka代码 2024-04-06 20:08:09 +08:00
dongxiaodong 6798b04fc4 kafka代码 2024-04-06 16:29:50 +08:00
dongxiaodong 10b15a6f99 修改故障类 2024-04-06 11:08:41 +08:00
lijiayao 5184d57407 fix: 代码丢失找回 2024-04-06 10:55:51 +08:00
lijiayao ba33f9abb6 fix: 代码丢失找回 2024-04-06 10:47:14 +08:00
lijiayao d2a29b0016 fix: 代码丢失找回 2024-04-06 10:15:12 +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
lijiayao 8de32c8223 Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	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
#	couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/MqController.java
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
2024-04-06 10:02:18 +08:00
dongxiaodong 1db40b4db2 修改故障类 2024-04-06 09:11:03 +08:00
dongxiaodong 1b88d35574 修改故障类 2024-04-06 09:06:07 +08:00
liuyunhu ca46bfe024 Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu 2024-04-05 19:01:21 +08:00
liuyunhu 9419a2f0a6 11 2024-04-05 19:01:11 +08:00
dongxiaodong 71f1bc84e2 判断异常 2024-04-05 18:01:10 +08:00
dongxiaodong 371c80d110 判断异常 2024-04-05 11:37:29 +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
dongxiaodong 976f35f212 Merge branch 'server_five_xiaoyao' into server_five_dongxiaodong
# Conflicts:
#	couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml
2024-04-05 08:40:48 +08:00
dongxiaodong f81f05ae1c 判断异常 2024-04-05 08:38:19 +08:00
lijiayao 9e489bd4ec feat: 事件系统 2024-04-05 08:36:56 +08:00
lijiayao 041aaa4654 feat: 事件系统 2024-04-04 15:04:25 +08:00
dongxiaodong 846073f528 删除没用的文件 2024-04-04 14:45:07 +08:00
lijiayao 9e8106ab46 refactor: 修改框架 2024-04-04 09:48:53 +08:00
dongxiaodong eac6f6076d Merge branch 'server_five' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelMessage.java
2024-04-04 09:00:38 +08:00
lijiayao ad5626f0af refactor: 修改框架 2024-04-04 08:58:43 +08:00
dongxiaodong 703997bd9b dxd解析报文 2024-04-03 10:42:30 +08:00
lijiayao bbd9e52302 新增 2024-04-03 09:00:58 +08:00
dongxiaodong 3947f9414e dxd解析报文 2024-04-02 21:42:16 +08:00
dongxiaodong 99dc4e832f Merge remote-tracking branch 'origin/server_five_xiaoyao' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
2024-04-02 21:38:56 +08:00
lijiayao 00369a6052 新增 2024-04-02 21:36:23 +08:00
lijiayao a9977b44a9 新增 2024-04-02 21:25:33 +08:00
dongxiaodong b644752443 dxd解析报文 2024-04-02 21:15:25 +08:00
lijiayao aaa5d4f868 Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_xiaoyao 2024-04-02 18:28:31 +08:00
dongxiaodong 72b634fcc1 dxd测试 2024-04-02 18:27:56 +08:00
lijiayao 73c2c159e8 Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao 2024-04-02 16:57:19 +08:00
lijiayao 422ffa1f32 新增 2024-04-02 16:57:04 +08:00
dongxiaodong 0bbf40741c dxd测试 2024-04-02 16:56:39 +08:00
dongxiaodong 6c16191d90 dxd测试 2024-04-02 15:20:18 +08:00
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
lijiayao 5148ae5e14 chore: 新增解析系统模块 2024-04-02 14:23:01 +08:00