ruyaxie
|
89c2fc33fa
|
Merge branch 'dev.parse' into dev
# Conflicts:
# pom.xml
|
2024-10-09 16:54:48 +08:00 |
|
ruyaxie
|
1e86779560
|
feat():修复车辆网关报错
|
2024-10-09 16:53:09 +08:00 |
|
ruyaxie
|
4f0fa2e95c
|
Merge branch 'dev.parse' into dev
# Conflicts:
# cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
# cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml
# cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
# cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
# pom.xml
|
2024-10-08 19:51:47 +08:00 |
|
ruyaxie
|
b13931317c
|
feat():parse多余的依赖，车辆管理的启动报错，以及XXLJob依赖问题
|
2024-10-08 19:48:57 +08:00 |
DongZeLiang
|
dcd9ce68df
|
fix（）: 修复包名等格式规范问题
|
2024-10-08 19:12:42 +08:00 |
 YangPeng
|
92c2d7b11b
|
feat():添加剩余注释
|
2024-10-08 19:12:19 +08:00 |
|
YangPeng
|
75b6097fed
|
feat():添加缓存注释
|
2024-10-08 19:12:19 +08:00 |
|
YangPeng
|
c86f2732b0
|
fix():bootstrap.yml其他名字改成yp启动,防止端口占用
|
2024-10-08 19:12:13 +08:00 |
 王鑫
|
553d5933ed
|
fix():重新构建结构
|
2024-10-08 19:10:32 +08:00 |
|
YangPeng
|
ff98f1cc1b
|
fix():添加车辆全部缓存
|
2024-10-08 19:10:32 +08:00 |
|
王鑫
|
9ba5f8e14a
|
fix():重新构建结构
|
2024-10-08 15:54:50 +08:00 |
|
王鑫
|
6dde202353
|
fix():重新构建数据处理结构
|
2024-10-07 20:26:11 +08:00 |
|
王鑫
|
3b2e16a39e
|
Merge branch 'dev' of https://gitea.qinmian.online/wuzudaniu/cloud-plus-server into dev
# Conflicts:
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java
|
2024-10-07 20:20:23 +08:00 |
|
YangPeng
|
39432a1270
|
fix():修复enterpise-cache的pom名称冲突问题
|
2024-10-07 20:16:21 +08:00 |
|
YangPeng
|
c7c51c2305
|
fix():修复enterpise-cache的pom名称冲突问题
|
2024-10-07 20:05:18 +08:00 |
|
YangPeng
|
11ab968c8d
|
Merge branch 'dev.saas.yp' into dev
|
2024-10-07 19:53:37 +08:00 |
|
YangPeng
|
4e3dce703d
|
fix():修复合并bug
|
2024-10-07 19:52:57 +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 |
|
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 |
|
ruyaxie
|
761fd61725
|
feat():修复数据处理
|
2024-10-07 09:12:10 +08:00 |
|
ruyaxie
|
c5f79db964
|
feat():修复缓存Redis-five
|
2024-10-06 21:40:40 +08:00 |
|
ruyaxie
|
bfb3b98684
|
feat():修复缓存Redis-four
|
2024-10-04 21:00:36 +08:00 |
|
YangPeng
|
a138c0dacd
|
feat():优化
|
2024-10-04 16:05:15 +08:00 |
|
YangPeng
|
eea7db374d
|
feat():优化
|
2024-10-04 16:05:15 +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 |
|
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
|
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
|
ecf81cc79e
|
feat():修复代码缓存框架
|
2024-09-30 01:22:53 +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 |