From ed0bf90683083865d1b4437cdcf7170fb3b6460f Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Sat, 21 Sep 2024 19:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 4 ++-- cloud-common/cloud-common-core/pom.xml | 11 +---------- .../gateway/service/impl/ValidateCodeServiceImpl.java | 2 +- cloud-gateway/src/main/resources/bootstrap.yml | 4 ++-- .../src/main/resources/bootstrap.yml | 4 ++-- .../src/main/resources/bootstrap.yml | 4 ++-- .../java/com/muyu/system/CloudSystemApplication.java | 1 - .../src/main/resources/bootstrap.yml | 6 +++--- cloud-modules/pom.xml | 1 - .../src/main/resources/bootstrap.yml | 4 ++-- xxl-job/job-admin/depXXLAdmin.sh | 1 - 11 files changed, 15 insertions(+), 27 deletions(-) diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 336f7e1..c115c71 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 106.54.193.225:8848 + addr: nacos.muyu.icu:8848 user-name: nacos password: nacos - namespace: one + namespace: muyu-cloud # Spring spring: application: diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index 6d1a5dd..57cf128 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -164,15 +164,6 @@ cn.hutool hutool-all - - com.baomidou - mybatis-plus-boot-starter - 3.5.7 - - - com.github.yulichang - mybatis-plus-join-boot-starter - 1.4.11 - + diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java index 978a3b4..879d887 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java @@ -50,7 +50,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService { CaptchaCodeResp.CaptchaCodeRespBuilder respBuilder = CaptchaCodeResp.builder() .captchaEnabled(captchaEnabled); if (!captchaEnabled) { - return Result.success(respBuilder.build()); + return Result.success(respBuilder); } // 保存验证码信息 diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index a9f1fd5..d942aa8 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 106.54.193.225:8848 + addr: nacos.muyu.icu:8848 user-name: nacos password: nacos - namespace: one + namespace: muyu-cloud # Spring spring: 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 51e4a3e..5e13a37 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 106.54.193.225:8848 + addr: nacos.muyu.icu:8848 user-name: nacos password: nacos - namespace: one + namespace: muyu-cloud # 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 1c734ba..e9427c3 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 106.54.193.225:8848 + addr: nacos.muyu.icu:8848 user-name: nacos password: nacos - namespace: one + namespace: muyu-cloud # Spring spring: diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java index 2ad96c1..b01e5db 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java @@ -19,4 +19,3 @@ public class CloudSystemApplication { SpringApplication.run(CloudSystemApplication.class, args); } } - 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 9bcc137..b5e11d5 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 106.54.193.225:8848 + addr: nacos.muyu.icu:8848 user-name: nacos password: nacos - namespace: one + namespace: muyu-cloud # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -57,4 +57,4 @@ spring: - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: - com.muyu.system.mapper: DEBUG + com.muyu.system.mapper: DEBUG \ No newline at end of file diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index bb54ff8..ba0d555 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -12,7 +12,6 @@ cloud-modules-system cloud-modules-gen cloud-modules-file - cloud-breakdown cloud-modules 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 918d3f4..c98034e 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 106.54.193.225:8848 + addr: nacos.muyu.icu:8848 user-name: nacos password: nacos - namespace: one + namespace: muyu-cloud # Spring spring: diff --git a/xxl-job/job-admin/depXXLAdmin.sh b/xxl-job/job-admin/depXXLAdmin.sh index 835d26b..1dc1339 100644 --- a/xxl-job/job-admin/depXXLAdmin.sh +++ b/xxl-job/job-admin/depXXLAdmin.sh @@ -5,4 +5,3 @@ docker run --name xxl-job-admin -d \ -e PARAMS="--spring.config.additional-location=/config/application.properties" \ -v ./log:/data/applogs \ xuxueli/xxl-job-admin:2.4.1 -