From e0732ca4f83bc03b10853f10e0a9de3c3074dd46 Mon Sep 17 00:00:00 2001 From: lance Date: Wed, 27 Dec 2023 22:22:12 +0800 Subject: [PATCH] =?UTF-8?q?(feature)=E5=85=B6=E4=BB=96=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0nacos=E7=94=A8=E6=88=B7=E5=90=8D=E5=92=8C?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/application.yml | 2 ++ .../ruoyi-demo/src/main/resources/application.yml | 2 ++ .../ruoyi-stream-mq/src/main/resources/application.yml | 2 ++ ruoyi-gateway/src/main/resources/application.yml | 2 ++ .../ruoyi-gen/src/main/resources/application.yml | 2 ++ .../ruoyi-job/src/main/resources/application.yml | 2 ++ .../ruoyi-resource/src/main/resources/application.yml | 2 ++ .../ruoyi-system/src/main/resources/application.yml | 2 ++ .../ruoyi-monitor/src/main/resources/application.yml | 2 ++ .../src/main/resources/application.properties | 2 ++ .../ruoyi-seata-server/src/main/resources/application.yml | 8 ++++---- .../src/main/resources/application.yml | 2 ++ 12 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ruoyi-auth/src/main/resources/application.yml b/ruoyi-auth/src/main/resources/application.yml index 24f58103..eeadd270 100644 --- a/ruoyi-auth/src/main/resources/application.yml +++ b/ruoyi-auth/src/main/resources/application.yml @@ -25,6 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos config: import: - optional:nacos:application-common.yml diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml index d35ec413..4768daff 100644 --- a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml +++ b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml @@ -25,6 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 35b6d1f6..92d58f15 100644 --- a/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml +++ b/ruoyi-example/ruoyi-stream-mq/src/main/resources/application.yml @@ -102,6 +102,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 08bd112a..af8852df 100644 --- a/ruoyi-gateway/src/main/resources/application.yml +++ b/ruoyi-gateway/src/main/resources/application.yml @@ -27,6 +27,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 a6761d83..7c0810fd 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml @@ -25,6 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 5d5b2d77..4cc54fd8 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/application.yml @@ -25,6 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 c86ad8ba..8a4b058f 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml @@ -25,6 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 e2ec8528..641c31c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/application.yml @@ -25,6 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 fe8b3573..327903b7 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml @@ -25,6 +25,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos 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 8f09cfc3..6c132de6 100644 --- a/ruoyi-visual/ruoyi-powerjob-server/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-powerjob-server/src/main/resources/application.properties @@ -37,5 +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.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 5c12ec5a..874b569c 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: - password: + username: nacos + password: nacos ##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: - password: + username: nacos + password: nacos ##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 1072f36b..f5712c8a 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml @@ -29,6 +29,8 @@ spring: # 配置组 group: @nacos.config.group@ namespace: ${spring.profiles.active} + username: nacos + password: nacos config: import: - optional:nacos:application-common.yml