Commit Graph

13 Commits (14cc2afd35ddcbe8eace7ab7515f410fb4ce1e87)

Author SHA1 Message Date
王鑫 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 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 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
YangPeng efd7a46c68 feat():添加缓存模块封装方法 2024-09-29 17:06:22 +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
yanchouchou f0de024410 车联网第二期项目 2024-09-27 22:49:32 +08:00