Commit Graph

24 Commits (ee6da7612942dd43cac96db5e1639fee0eaa66bc)

Author SHA1 Message Date
王鑫 5c4e0cde3e fix():修改saas结构 2024-10-09 16:33:33 +08:00
DongZeLiang 47222f5f68 fix(): 修复包名等格式规范问题 2024-10-08 16:25:15 +08:00
王鑫 6dde202353 fix():重新构建数据处理结构 2024-10-07 20:26:11 +08:00
王鑫 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
王鑫 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
ruyaxie c5f79db964 feat():修复缓存Redis-five 2024-10-06 21:40:40 +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
ruyaxie 443350c8f4 Merge branch 'dev.parse' into dev 2024-09-30 18:09:42 +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
王鑫 14cc2afd35 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-enterprise/pom.xml
2024-09-30 16:30:20 +08:00
王鑫 afdc7b3421 fix():添加rabbitmq工具类,添加数据处理基础类,添加缓存 2024-09-30 16:28:08 +08:00
ruyaxie f98c11e825 feat():修复Redis缓存 2024-09-30 12:27:32 +08:00
YangPeng 6f9079ec5f feat():修改JDK版本问题 2024-09-30 12:01:29 +08:00
ruyaxie ecf81cc79e feat():修复代码缓存框架 2024-09-30 01:22:53 +08:00
ruyaxie 29f08cbb46 Merge remote-tracking branch 'origin/dev' into dev.parse
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml
2024-09-29 12:26:21 +08:00
ruyaxie 05e6ecb947 fix():修复框架bug 2024-09-29 12:20:14 +08:00
Li HD 6eb46f53ae Merge remote-tracking branch 'origin/dev.gateway' into dev.gateway
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java
#	cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java
2024-09-29 10:51:11 +08:00
Li HD db16c57199 fix():跟新代码 2024-09-29 10:50:18 +08:00
Li HD 90195a9226 fix():初始化 2024-09-29 10:40:08 +08:00
YangPeng 49a7e0df4d fix():更新模块cloud-modules-enterprise 2024-09-29 10:31:52 +08:00