Commit Graph

84 Commits (140ac876eb06b203c4212577fd451498f29796ab)

Author SHA1 Message Date
ruyaxie 443350c8f4 Merge branch 'dev.parse' into dev 2024-09-30 18:09:42 +08:00
ruyaxie 19f99ac116 feat():修复kafka生产者 2024-09-30 16:50:07 +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
YangPeng bd2865ebc5 feat():优化 2024-09-30 14:43:22 +08:00
YangPeng a66329500c feat():优化 2024-09-30 14:34:49 +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 c87bf8a2fa feat():修复Redis 2024-09-30 10:41:15 +08:00
ruyaxie 61dc7f9277 Merge remote-tracking branch 'origin/dev.parse' into dev.parse
# Conflicts:
#	cloud-common/cloud-common-kafka/pom.xml
#	cloud-common/pom.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/dev.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/prod.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/test.xml
2024-09-30 09:12:02 +08:00
ruyaxie 6eff930c84 feat():修复代码缓存框架 2024-09-30 08:59:19 +08:00
ruyaxie ecf81cc79e feat():修复代码缓存框架 2024-09-30 01:22:53 +08:00
ruyaxie 63ebaee731 feat():修复代码缓存框架 2024-09-30 01:13:22 +08:00
王鑫 dd94f2e39e fix():修复框架bug 2024-09-29 22:45:06 +08:00
xieyaru070903 5f391234e2 Merge pull request 'dev.saas' (#12) from dev.saas into dev
Reviewed-on: #12
2024-09-29 17:44:19 +08:00
ruyaxie 491ecec44a fix():增添协议解析的YML 2024-09-29 17:30:09 +08:00
YangPeng efd7a46c68 feat():添加缓存模块封装方法 2024-09-29 17:06:22 +08:00
ruyaxie 3953642310 fix():修复框架bug 2024-09-29 12:26:51 +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
Li HD e491c7de89 fix():初始化 2024-09-29 10:29:43 +08:00
YangPeng 244ceb5b46 fix():添加实现FaultCode添加字段 2024-09-29 00:07:21 +08:00
YangPeng 0ae1ddbbca fix():添加实现cloud-vx pom文件 2024-09-28 18:26:46 +08:00
YangPeng 5994bf1550 fix():修改接口文档,添加注解 controller 和 service 和 domain 2024-09-28 18:21:09 +08:00
YangPeng aa39403714 fix():CarInformation添加实体类 修改其他类的注解 2024-09-30 12:48:15 +08:00
YangPeng 7ae5082c3d feat():message添加注解 2024-09-30 12:18:55 +08:00
YangPeng 40e3a1ceb7 feat():service controller mapper domain 添加注解 2024-09-28 15:11:42 +08:00
王鑫 f645459fb1 fix():修改cloud-module-enterprise的pom 2024-09-28 11:50:49 +08:00
yanchouchou f0de024410 车联网第二期项目 2024-09-27 22:49:32 +08:00