diff --git a/pom.xml b/pom.xml index d52b4c8b..35e2e3ec 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,11 @@ ${sgzb.version} + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + com.bonus.sgzb diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml index a6d8ea64..9f0d30f2 100644 --- a/sgzb-auth/src/main/resources/bootstrap.yml +++ b/sgzb-auth/src/main/resources/bootstrap.yml @@ -14,17 +14,19 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h onlineApprove: /lbcloud-oauth/oauth/token wechatAppId: crhmaxnE diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml index 2968520f..e5242684 100644 --- a/sgzb-gateway/src/main/resources/bootstrap.yml +++ b/sgzb-gateway/src/main/resources/bootstrap.yml @@ -27,17 +27,19 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h sentinel: # 取消控制台懒加载 eager: true diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java index 7c2d9a70..3f8c3c16 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/SgzbBaseApplication.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * * @author ruoyi */ -@EnableCustomSwagger2 +//@EnableCustomSwagger2 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @EnableCustomConfig @EnableRyFeignClients diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml index b27a2601..6ddf23e5 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml @@ -21,17 +21,19 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h # 禁用Actuator端点的未经身份验证的访问 management: diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml index f98b1aee..6e002357 100644 --- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml @@ -36,14 +36,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h diff --git a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml index ad114b94..8fe7da5d 100644 --- a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml @@ -14,14 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h diff --git a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml index d6921128..908d52c2 100644 --- a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml @@ -14,14 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java index f260cb28..5c329e9a 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java @@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * * @author ruoyi */ -@EnableCustomSwagger2 +//@EnableCustomSwagger2 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @EnableCustomConfig @EnableRyFeignClients diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml index 1a14d54d..c0501c34 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml @@ -21,17 +21,19 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h # 禁用Actuator端点的未经身份验证的访问 management: diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml index bc874092..ec92708b 100644 --- a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml @@ -14,14 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 192.168.0.14:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/SgzbSystemApplication.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/SgzbSystemApplication.java index f5bc6f32..0fbcde02 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/SgzbSystemApplication.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/SgzbSystemApplication.java @@ -12,7 +12,7 @@ import com.bonus.sgzb.common.swagger.annotation.EnableCustomSwagger2; * @author ruoyi */ @EnableCustomConfig -@EnableCustomSwagger2 +//@EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication public class SgzbSystemApplication diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml index 045339c4..365fb56e 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml +++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml @@ -25,17 +25,19 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.16.36.33:8848 namespace: sgzb_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + username: nacos + password: N2$NjW2&CDEOx$mD*y5h #腾讯云sms tencent: sms: