 ffr
|
dcc6def480
|
commit upd
|
2024-04-12 08:35:19 +08:00 |
|
ffr
|
b293555663
|
commit upd
|
2024-04-09 18:40:56 +08:00 |
lijiayao
|
0b3ed78d08
|
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/java/com/couplet/analyze/msg/CoupletMsgApplication.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-09 17:10:47 +08:00 |
|
lijiayao
|
802c97682c
|
修改bug
|
2024-04-09 17:08:21 +08:00 |
|
lijiayao
|
bc8558576f
|
修改bug
|
2024-04-09 17:07:26 +08:00 |
|
lijiayao
|
3fc01c4102
|
Merge branch 'server_five_fufanrui' 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/model/ModelsKafkaMessage.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/ElectronicFenceServiceImpl.java
# couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-09 16:08:45 +08:00 |
|
lijiayao
|
36c5923bba
|
修改bug
|
2024-04-09 16:08:06 +08:00 |
|
ffr
|
9822f2f548
|
commit upd
|
2024-04-09 16:05:16 +08:00 |
|
ffr
|
f1938e4e3e
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-09 15:43:21 +08:00 |
 liuyunhu
|
db23137c38
|
虎虎虎
|
2024-04-09 15:36:19 +08:00 |
|
ffr
|
395b4cc5a5
|
commit upd
|
2024-04-09 15:23:44 +08:00 |
|
lijiayao
|
f2463c9753
|
refactor: 修改框架
|
2024-04-09 15:17:37 +08:00 |
|
liuyunhu
|
f9ce3da77e
|
虎虎虎优化set初始化
|
2024-04-09 15:17:13 +08:00 |
|
lijiayao
|
af273c12cb
|
修改bug
|
2024-04-09 15:08:32 +08:00 |
|
ffr
|
2734077121
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
|
2024-04-09 14:07:53 +08:00 |
|
lijiayao
|
38521412a6
|
修改bug
|
2024-04-09 11:51:54 +08:00 |
|
liuyunhu
|
036db4cd79
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
# couplet-modules/couplet-business/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-modules-mq/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
|
2024-04-09 11:36:09 +08:00 |
|
lijiayao
|
d24288b59e
|
Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-09 11:35:50 +08:00 |
|
liuyunhu
|
4101e76188
|
huhuhu
|
2024-04-09 11:34:58 +08:00 |
|
lijiayao
|
60aa7650f0
|
feat: 优化代码
|
2024-04-09 11:34:04 +08:00 |
dongxiaodong
|
9bb5cf3435
|
优化判断语句
|
2024-04-09 11:33:51 +08:00 |
|
lijiayao
|
33978cf155
|
Merge branch 'server_five_dongxiaodong' 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/model/ModelsKafkaMessage.java
# couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/KafkaTest.java
|
2024-04-09 10:49:27 +08:00 |
|
lijiayao
|
a8fff6ef70
|
feat: 优化代码
|
2024-04-09 10:47:42 +08:00 |
|
dongxiaodong
|
54a091e3b6
|
优化判断语句
|
2024-04-09 09:57:28 +08:00 |
|
ffr
|
f3f7cdd984
|
commit upd ffr
|
2024-04-09 08:42:51 +08:00 |
|
ffr
|
31e78c3c3c
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
# Conflicts:
# couplet-modules/couplet-business/pom.xml
# couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
|
2024-04-08 21:55:12 +08:00 |
|
ffr
|
4488018bce
|
commit upd ffr
|
2024-04-08 21:53:13 +08:00 |
|
lijiayao
|
bcb03022d1
|
feat: 优化代码
|
2024-04-08 21:24:32 +08:00 |
|
lijiayao
|
e52228b381
|
Merge branch 'server_five_dongxiaodong' 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-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 20:42:01 +08:00 |
|
lijiayao
|
7d77386b3a
|
feat: 优化代码
|
2024-04-08 20:41:29 +08:00 |
|
dongxiaodong
|
9f17578564
|
优化判断语句
|
2024-04-08 20:37:02 +08:00 |
|
dongxiaodong
|
aee28d568e
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_dongxiaodong
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/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-modules-mq/src/main/resources/bootstrap.yml
# couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
|
2024-04-08 20:08:38 +08:00 |
|
dongxiaodong
|
c4f1beed8b
|
优化判断语句
|
2024-04-08 20:07:06 +08:00 |
|
liuyunhu
|
db1368379e
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 19:53:15 +08:00 |
|
lijiayao
|
0960e8f9fb
|
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/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-08 19:52:27 +08:00 |
|
liuyunhu
|
72782fbec4
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 19:52:27 +08:00 |
|
lijiayao
|
eca4976a95
|
Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
|
2024-04-08 19:51:40 +08:00 |
|
liuyunhu
|
9327ecae1f
|
huhuhu
|
2024-04-08 19:51:32 +08:00 |
|
lijiayao
|
05b2baf32e
|
feat: 优化代码
|
2024-04-08 19:50:45 +08:00 |
|
liuyunhu
|
be2e99af0c
|
车辆管理模块 加注释 增删改，触发刷新缓存 增加缓存时间
|
2024-04-08 14:44:03 +08:00 |
|
ffr
|
cf92c15bf5
|
fufanruiCommit
|
2024-04-08 14:23:00 +08:00 |
|
liuyunhu
|
1b9c777a87
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 14:05:30 +08:00 |
|
dongxiaodong
|
599d89b6e4
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_dongxiaodong
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/consumer/CodeConsumer.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 14:03:21 +08:00 |
|
lijiayao
|
adc2b87792
|
feat: 电子围栏报警
|
2024-04-08 14:01:55 +08:00 |
|
dongxiaodong
|
adab59900a
|
优化判断语句
|
2024-04-08 14:01:18 +08:00 |
|
liuyunhu
|
b44d92b599
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 13:22:41 +08:00 |
|
liuyunhu
|
e91a4cb6d4
|
车辆管理模块 增删改，触发刷新缓存：set存车辆和对应电子围栏的数据
|
2024-04-08 13:21:23 +08:00 |
|
lijiayao
|
de71107fe0
|
Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java
|
2024-04-08 11:27:14 +08:00 |
|
lijiayao
|
5c65c974c6
|
feat: 电子围栏报警
|
2024-04-08 11:26:11 +08:00 |
|
ffr
|
d41ac8c2fd
|
fufanruiCommit
|
2024-04-08 11:20:08 +08:00 |