(feature)抽取nacos鉴权username到pom中去, 并添加dubbo注册增加username/passowrd

1 year ago · 9aadcfed73
parent e0732ca4f8
commit 9aadcfed73
14 changed files with 32 additions and 26 deletions
--- a/pom.xml
+++ b/pom.xml
@ -71,6 +71,8 @@
                <!-- 环境标识，需要与配置文件的名称相对应 -->
                <profiles.active>dev</profiles.active>
                <nacos.server>127.0.0.1:8848</nacos.server>
+                <nacos.username>nacos</nacos.username>
+                <nacos.password>nacos</nacos.password>
                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                <logstash.address>127.0.0.1:4560</logstash.address>
@ -85,6 +87,8 @@
            <properties>
                <profiles.active>prod</profiles.active>
                <nacos.server>127.0.0.1:8848</nacos.server>
+                <nacos.username>nacos</nacos.username>
+                <nacos.password>nacos</nacos.password>
                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                <logstash.address>127.0.0.1:4560</logstash.address>
--- 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
--- 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}
  # 消费者相关配置
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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: ""
--- 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