Commit Graph

108 Commits (5d1500f4f6fa70b497a3873471609f144a18590b)

Author SHA1 Message Date
王鑫 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
ruyaxie 06a35cd645 feat():修复缓存Bug2 2024-09-30 19:06:56 +08:00
ruyaxie 6fbff659c5 feat():修复缓存Bug 2024-09-30 18:17:25 +08:00
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 e5b5222c39 Merge branch 'dev.saas' into dev 2024-09-30 16:41:54 +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 535eae941e Merge pull request 'feat():优化' (#29) from dev.saas.yp into dev.saas
Reviewed-on: #29
2024-09-30 14:44:23 +08:00
YangPeng bd2865ebc5 feat():优化 2024-09-30 14:43:22 +08:00
yangpeng eef2467a61 Merge pull request 'feat():优化' (#27) from dev.saas.yp into dev.saas
Reviewed-on: #27
2024-09-30 14:36:40 +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 c241897dfe Merge pull request 'dev.saas.yp' (#22) from dev.saas.yp into dev.saas
Reviewed-on: #22
2024-09-30 12:02:43 +08:00
YangPeng 6f9079ec5f feat():修改JDK版本问题 2024-09-30 12:01:29 +08:00
xieyaru070903 eff427473f Merge pull request 'feat():修复Redis' (#19) from dev.parse into dev
Reviewed-on: #19
2024-09-30 10:41:50 +08:00
ruyaxie c87bf8a2fa feat():修复Redis 2024-09-30 10:41:15 +08:00
xieyaru070903 0bb5a912f7 Merge pull request 'dev.parse' (#17) from dev.parse into dev
Reviewed-on: #17
2024-09-30 09:14:38 +08:00
ruyaxie 1d43fa7888 feat():修复cloud-common冲突 2024-09-30 09:13:45 +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
王鑫 2084013449 Merge branch 'dev.data.process' into dev
# Conflicts:
#	pom.xml
2024-09-29 20:04:28 +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
xieyaru070903 5f391234e2 Merge pull request 'dev.saas' (#12) from dev.saas into dev
Reviewed-on: #12
2024-09-29 17:44:19 +08:00
xieyaru070903 127c941d1c Merge pull request 'dev.saas.yp' (#11) from dev.saas.yp into dev.saas
Reviewed-on: #11
2024-09-29 17:43:23 +08:00
xieyaru070903 f3428404a2 Merge pull request 'fix():增添协议解析的YML' (#10) from dev.parse into dev
Reviewed-on: #10
2024-09-29 17:31:24 +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
王鑫 1e19d99748 fix():提交数据处理模块的kafka工具类, 2024-09-29 16:58:58 +08:00
xieyaru070903 93f78cdc3e Merge pull request 'fix():修复框架bug' (#9) from dev.parse into dev
Reviewed-on: #9
2024-09-29 12:28:07 +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
LiHD 1f98e4ea26 Merge pull request 'dev.gateway' (#7) from dev.gateway into dev
Reviewed-on: #7
2024-09-29 10:54:34 +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
yanchouchou 70ee6d0628 Merge pull request 'dev.saas' (#5) from dev.saas into dev
Reviewed-on: #5
2024-09-29 10:33:30 +08:00
yanchouchou 7971b67277 Merge pull request 'fix():更新模块cloud-modules-enterprise' (#4) from dev.saas.yp into dev.saas
Reviewed-on: #4
2024-09-29 10:32:45 +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
yanchouchou 0303b4fe72 Merge pull request 'dev.saas' (#2) from dev.saas into dev
Reviewed-on: #2
2024-09-29 09:40:01 +08:00
yanchouchou 1b982ed5a2 Merge pull request 'dev.saas.yp' (#1) from dev.saas.yp into dev.saas
Reviewed-on: #1
2024-09-29 09:39:30 +08:00