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 |
|
lijiayao
|
abce267131
|
Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
|
2024-04-06 09:59:54 +08:00 |
|
lijiayao
|
5bf55e27f3
|
fix: 代码丢失找回
|
2024-04-06 09:59:38 +08:00 |
dongxiaodong
|
1db40b4db2
|
修改故障类
|
2024-04-06 09:11:03 +08:00 |
|
dongxiaodong
|
1b88d35574
|
修改故障类
|
2024-04-06 09:06:07 +08:00 |
 ffr
|
2f2547e2b8
|
upd commit
|
2024-04-05 20:08:18 +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
|
9a78e4a2e2
|
判断异常
|
2024-04-05 18:39:02 +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
|
a49e857a78
|
Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-05 09:50:01 +08:00 |
|
lijiayao
|
0b9423d817
|
feat: 事件系统
|
2024-04-05 09:49:04 +08:00 |
|
ffr
|
73546a7a5a
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-05 08:54:23 +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
|
ed31af73b5
|
Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-04 15:05:23 +08:00 |
|
lijiayao
|
041aaa4654
|
feat: 事件系统
|
2024-04-04 15:04:25 +08:00 |
|
dongxiaodong
|
846073f528
|
删除没用的文件
|
2024-04-04 14:45:07 +08:00 |
|
ffr
|
0c71aec748
|
车辆管理
|
2024-04-04 14:37:20 +08:00 |
|
lijiayao
|
9e8106ab46
|
refactor: 修改框架
|
2024-04-04 09:48:53 +08:00 |
|
lijiayao
|
93ccc7535e
|
Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five
|
2024-04-04 09:48:29 +08:00 |
|
liuyunhu
|
4da1d7c52e
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
|
2024-04-04 09:43:21 +08:00 |
|
liuyunhu
|
562deda30a
|
修改远程调用 配置，有的变量没改导致调用不通
|
2024-04-04 09:43:08 +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
|
ab079c7daf
|
Merge remote-tracking branch 'origin/server_five' into server_five
|
2024-04-04 08:58:50 +08:00 |
|
lijiayao
|
ad5626f0af
|
refactor: 修改框架
|
2024-04-04 08:58:43 +08:00 |
|
ffr
|
a9be065140
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
|
2024-04-04 08:57:50 +08:00 |
|
liuyunhu
|
f07dc734e4
|
远程调用 加自动配置扫描
|
2024-04-04 08:50:19 +08:00 |
|
dongxiaodong
|
2affa40686
|
删除没用的文件
|
2024-04-03 11:50:42 +08:00 |
|
ffr
|
e027acc275
|
车辆管理
|
2024-04-03 11:38:59 +08:00 |
|
lijiayao
|
0c1cfb8f28
|
refactor: 修改框架
|
2024-04-03 11:27:17 +08:00 |
|
lijiayao
|
2352def47e
|
refactor: 修改框架
|
2024-04-03 11:01:11 +08:00 |
|
dongxiaodong
|
703997bd9b
|
dxd解析报文
|
2024-04-03 10:42:30 +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 |
|
lijiayao
|
de572170ec
|
Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
|
2024-04-03 09:01:41 +08:00 |
|
lijiayao
|
bbd9e52302
|
新增
|
2024-04-03 09:00:58 +08:00 |
|
ffr
|
c7443b81d7
|
车辆管理
|
2024-04-03 08:38:24 +08:00 |
|
liuyunhu
|
ffa06bc02e
|
虎虎虎虎
|
2024-04-03 08:35:23 +08:00 |
|
liuyunhu
|
4b80034baf
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
|
2024-04-03 08:33:21 +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 |