diff --git a/pom.xml b/pom.xml index 39094e9e..48e9060a 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,8 @@ dev 127.0.0.1:8848 + nacos + nacos DEFAULT_GROUP DEFAULT_GROUP 127.0.0.1:4560 @@ -85,6 +87,8 @@ prod 127.0.0.1:8848 + nacos + nacos DEFAULT_GROUP DEFAULT_GROUP 127.0.0.1:4560 diff --git a/ruoyi-auth/src/main/resources/application.yml b/ruoyi-auth/src/main/resources/application.yml index eeadd270..f1668017 100644 --- a/ruoyi-auth/src/main/resources/application.yml +++ b/ruoyi-auth/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml index fdc21f6a..45324774 100644 --- a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml +++ b/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml @@ -15,6 +15,8 @@ dubbo: registry: address: nacos://${spring.cloud.nacos.server-addr} group: DUBBO_GROUP + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} parameters: namespace: ${spring.profiles.active} # 消费者相关配置 diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml index 4768daff..1d64ba28 100644 --- a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml +++ b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml b/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml index 92d58f15..85577bf8 100644 --- a/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml +++ b/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml @@ -102,8 +102,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-gateway/src/main/resources/application.yml b/ruoyi-gateway/src/main/resources/application.yml index af8852df..29d35f34 100644 --- a/ruoyi-gateway/src/main/resources/application.yml +++ b/ruoyi-gateway/src/main/resources/application.yml @@ -27,8 +27,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml index 7c0810fd..ab1a950f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml index 4cc54fd8..6110143a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml b/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml index 8a4b058f..0e78f7c7 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml b/ruoyi-modules/ruoyi-system/src/main/resources/application.yml index 641c31c4..957ca72e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml index 327903b7..72df1f87 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-visual/ruoyi-powerjob-server/src/main/resources/application.properties b/ruoyi-visual/ruoyi-powerjob-server/src/main/resources/application.properties index 6c132de6..9e4bef5e 100644 --- a/ruoyi-visual/ruoyi-powerjob-server/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-powerjob-server/src/main/resources/application.properties @@ -37,7 +37,7 @@ spring.cloud.nacos.discovery.group=@nacos.discovery.group@ spring.cloud.nacos.discovery.namespace=${spring.profiles.active} spring.cloud.nacos.config.group=@nacos.config.group@ spring.cloud.nacos.config.namespace=${spring.profiles.active} -spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos +spring.cloud.nacos.username=@nacos.username@ +spring.cloud.nacos.password=@nacos.password@ spring.config.import[0]=optional:nacos:datasource.yml spring.config.import[1]=optional:nacos:${spring.application.name}.properties diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml b/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml index 874b569c..e6dd8d2b 100644 --- a/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml @@ -32,8 +32,8 @@ seata: server-addr: @nacos.server@ group: @nacos.discovery.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ ##if use MSE Nacos with auth, mutex with username/password attribute #access-key: "" #secret-key: "" @@ -47,8 +47,8 @@ seata: group: @nacos.discovery.group@ namespace: ${spring.profiles.active} cluster: default - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ ##if use MSE Nacos with auth, mutex with username/password attribute #access-key: "" #secret-key: "" diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml index f5712c8a..daa8c09c 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml @@ -29,8 +29,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} - username: nacos - password: nacos + username: @nacos.username@ + password: @nacos.password@ config: import: - optional:nacos:application-common.yml