From 66cec0e46de5457689a70df92003002470f6fead Mon Sep 17 00:00:00 2001 From: yanchouchou <1742922980@qq.com> Date: Thu, 10 Oct 2024 10:31:26 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../enterprise/cache/VehicleCacheService.java | 28 ------------------- .../service/impl/CarFenceServiceImpl.java | 6 +++- .../com/muyu/file/utils/FileUploadUtils.java | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 9 ++---- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 10 ++----- .../src/main/resources/bootstrap.yml | 2 +- 11 files changed, 18 insertions(+), 49 deletions(-) delete mode 100644 cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index b84ada3..fa98884 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # Spring spring: application: diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml index 988beb1..bd8f342 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java deleted file mode 100644 index 019fa3a..0000000 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/VehicleCacheService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.enterprise.cache; - -import com.muyu.common.cache.CacheAbsBasic; -import com.muyu.domain.CarInformation; - -/** - * 车辆缓存服务 - * @className: VehicleCacheService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/30 00:36 ⏰ - * @Version: 1.0 - * @description: - */ -public class VehicleCacheService extends CacheAbsBasic { - - @Override - public String keyPre() { - return "vehicle:info:"; - } - - @Override - public String decode(String key){ - return key.replace("vehicle:info:",""); - } - - -} - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java index 1413f88..2be9101 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java @@ -79,7 +79,11 @@ public class CarFenceServiceImpl .map(CarFenceType::carFenceTypeBuild) .toList(); List carFenceList = carFencePage.getRecords(); - this.optimizeEntity(carFenceList,carFenceClazzList,carFenceTypeList); + this.optimizeEntity(carFenceList, carFenceClazzList, carFenceTypeList); + + +// carFenceCacheService.put(,); + //构建一个新的分页响应对象 return new Page<>() {{ //从查询结果中获取记录，并使用流式处理将每条记录转换为EtlDataScoreResp对象 diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java index 860534f..e06af58 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java @@ -26,7 +26,7 @@ public class FileUploadUtils { /** * 默认大小 50M */ - public static final Long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; + public static final Long DEFAULT_MAX_SIZE = 50 * 1024 * 1024L; /** * 默认的文件名最大长度 100 diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index 7707b6c..e8a41ef 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index c71d3b0..54b39cd 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml index fba9649..d59358c 100644 --- a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml @@ -1,13 +1,13 @@ # Tomcat server: - port: 29705 + port: 9705 # nacos线上地址 nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -51,10 +51,7 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - #kafka共享配置 - #application-kafka-config-dev.yml + #kafka共享配置 application-kafka-config-dev.yml - application-kafka-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index e1f5f2f..0464f4b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml index 9d365d4..3b075d7 100644 --- a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml @@ -1,13 +1,13 @@ # Tomcat -server: - port: 9902 +#server: +# port: 9703 # nacos线上地址 nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -51,10 +51,6 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: com.muyu.system.mapper: DEBUG diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index c62c9e9..5546d90 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: yan1 # Spring spring: