 王鑫
|
b29b1f18db
|
Merge branch 'dev.parse' into dev
# Conflicts:
# cloud-common/cloud-common-saas/pom.xml
# cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/pom.xml
# cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/WarnStrategyCacjeService.java
# cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
# cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FenceGroupUpdateReq.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarAndFenceGroupMiddleController.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceUpdateController.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarAndFenceGroupMiddleMapper.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceUpdateMapper.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarAndFenceGroupMiddleService.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceUpdateService.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarAndFenceGroupMiddleServiceImpl.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceUpdateServiceImpl.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-parse/pom.xml
# cloud-modules/cloud-modules-parse/src/main/java/com/muyu/parse/process/ProcessData.java
|
2024-10-07 18:57:20 +08:00 |
|
王鑫
|
5ac1ef17a3
|
fix():重新构建数据处理结构
|
2024-10-07 18:36:05 +08:00 |
ruyaxie
|
04450b84e6
|
feat():提取公共依赖在最大的pom
|
2024-10-07 15:43:26 +08:00 |
|
王鑫
|
dfdcbdbd86
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# cloud-common/cloud-common-saas/pom.xml
# cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java
# cloud-modules/cloud-modules-enterprise/enterprise-cache/src/main/java/com/muyu/enterpise/cache/VehicleCacheService.java
|
2024-10-07 14:07:19 +08:00 |
|
王鑫
|
536c40a8e2
|
fix():重新构建数据处理结构
|
2024-10-07 14:05:20 +08:00 |
 YangPeng
|
4396e30dfd
|
feat():修改JDK版本问题
|
2024-10-04 16:05:12 +08:00 |
|
王鑫
|
d6167ebfed
|
fix():添加rabbitmq工具类,添加数据处理基础类，添加缓存
|
2024-10-04 16:04:56 +08:00 |
|
ruyaxie
|
e9e32c2ad0
|
feat():修复缓存3
|
2024-10-02 16:45:36 +08:00 |
|
wangxin1
|
d7f31e3482
|
revert a88e91c139
revert fix():修复缓存模块命名冲突问题
|
2024-09-30 19:25:45 +08:00 |
|
王鑫
|
a88e91c139
|
fix():修复缓存模块命名冲突问题
|
2024-10-01 19:20:43 +08:00 |
|
YangPeng
|
d24110090c
|
Merge branch 'dev.saas.yp' into dev
# Conflicts:
# cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/basics/EventQueueConfig.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarAndFenceGroupMiddleController.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceUpdateController.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarAndFenceGroupMiddleMapper.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceUpdateMapper.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarAndFenceGroupMiddleService.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceUpdateService.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarAndFenceGroupMiddleServiceImpl.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceUpdateServiceImpl.java
# cloud-modules/cloud-modules-enterprise/enterprise-cache/pom.xml
|
2024-09-30 16:38:41 +08:00 |
|
王鑫
|
afdc7b3421
|
fix():添加rabbitmq工具类,添加数据处理基础类，添加缓存
|
2024-09-30 16:28:08 +08:00 |
|
YangPeng
|
6f9079ec5f
|
feat():修改JDK版本问题
|
2024-09-30 12:01:29 +08:00 |
|
王鑫
|
dd94f2e39e
|
fix():修复框架bug
|
2024-09-29 22:45:06 +08:00 |
|
王鑫
|
3ac5b84ef6
|
Merge remote-tracking branch 'origin/dev.data.process' into dev.data.process
# Conflicts:
# pom.xml
|
2024-09-29 17:59:23 +08:00 |
|
王鑫
|
1e19d99748
|
fix():提交数据处理模块的kafka工具类，
|
2024-09-29 16:58:58 +08:00 |
|
ruyaxie
|
05e6ecb947
|
fix():修复框架bug
|
2024-09-29 12:20:14 +08:00 |
|
YangPeng
|
49a7e0df4d
|
fix():更新模块cloud-modules-enterprise
|
2024-09-29 10:31:52 +08:00 |
 yanchouchou
|
f0de024410
|
车联网第二期项目
|
2024-09-27 22:49:32 +08:00 |