 王鑫
|
5d1500f4f6
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java
|
2024-10-10 10:00:57 +08:00 |
|
王鑫
|
ead12857c5
|
fix():修复admin账号为空的问题
|
2024-10-10 10:00:25 +08:00 |
ruyaxie
|
08fc9623bc
|
feat():修复车辆网关报错
|
2024-10-09 17:02:51 +08:00 |
|
ruyaxie
|
ee6da76129
|
Merge remote-tracking branch 'origin/dev' 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-parse/pom.xml
# cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
# pom.xml
|
2024-10-09 16:55:09 +08:00 |
|
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 |
|
王鑫
|
5c4e0cde3e
|
fix():修改saas结构
|
2024-10-09 16:33:33 +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 |
|
王鑫
|
65d7fb3de1
|
fix():重新构建结构
|
2024-10-08 19:12:42 +08:00 |
|
王鑫
|
a993b30e6e
|
fix():重新构建结构
|
2024-10-08 19:12:39 +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 |
|
YangPeng
|
1468206f1d
|
Merge branch 'dev' of https://gitea.qinmian.online/wuzudaniu/cloud-plus-server into dev.saas.yp
|
2024-10-08 16:34:34 +08:00 |
|
DongZeLiang
|
47222f5f68
|
fix（）: 修复包名等格式规范问题
|
2024-10-08 16:25:15 +08:00 |
|
王鑫
|
0c8a13439f
|
fix():重新构建结构
|
2024-10-08 16:17:38 +08:00 |
|
YangPeng
|
492be37314
|
feat():添加剩余注释
|
2024-10-08 16:08:45 +08:00 |
|
王鑫
|
5a0f5e28d2
|
fix():重新构建结构
|
2024-10-08 16:05:18 +08:00 |
|
YangPeng
|
e1d45db36e
|
Merge branch 'dev.saas.yp' into dev
# Conflicts:
# cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
|
2024-10-08 16:02:04 +08:00 |
|
YangPeng
|
e50219f9fb
|
feat():添加缓存注释
|
2024-10-08 15:58:28 +08:00 |
|
王鑫
|
54d216b144
|
fix():重新构建结构
|
2024-10-08 15:58:18 +08:00 |
|
王鑫
|
293cb42bcf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-08 15:56:00 +08:00 |
|
王鑫
|
9ba5f8e14a
|
fix():重新构建结构
|
2024-10-08 15:54:50 +08:00 |
|
YangPeng
|
83756518ad
|
fix():bootstrap.yml其他名字改成yp启动,防止端口占用
|
2024-10-07 22:37:39 +08:00 |
|
YangPeng
|
44ec3e9eed
|
Merge branch 'dev.saas.yp' into dev
|
2024-10-07 22:10:46 +08:00 |
|
YangPeng
|
45cb6b2a17
|
fix():添加车辆全部缓存
|
2024-10-07 22:05:38 +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 |
|
ruyaxie
|
226c427255
|
feat():添加协议解析模块描述
|
2024-10-07 18:36:59 +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 |
|
ruyaxie
|
c37e762dd6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-04 20:49:08 +08:00 |
|
ruyaxie
|
cd4a07e637
|
feat():修复缓存Redis-four
|
2024-10-04 20:47:02 +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 |