Pre Merge pull request !327 from 代码大师麦克劳瑞/develop

2 years ago · 836e9f25c9
parent b00775f988 4e77b37234
commit 836e9f25c9
6 changed files with 22 additions and 10 deletions
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -2,7 +2,7 @@ version : '3.8'
 services:
  ruoyi-nacos:
    container_name: ruoyi-nacos
-    image: nacos/nacos-server
+    image: nacos/nacos-server:2.2.1
    build:
      context: ./nacos
    environment:
--- a/docker/nacos/conf/application.properties
+++ b/docker/nacos/conf/application.properties
@ -30,3 +30,6 @@ nacos.core.auth.server.identity.key=serverIdentity
 nacos.core.auth.server.identity.value=security

 nacos.istio.mcp.server.enabled=false
+
+### 2.1.0 ???
+nacos.core.auth.plugin.nacos.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@ -14,10 +14,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@ -14,10 +14,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
@ -33,7 +35,8 @@ spring:
      datasource:
        ds1:
          nacos:
-            server-addr: 127.0.0.1:8848
+            # server-addr: 127.0.0.1:8848
+            server-addr: ruoyi-nacos:8848
            dataId: sentinel-ruoyi-gateway
            groupId: DEFAULT_GROUP
            data-type: json
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@ -14,10 +14,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@ -14,10 +14,12 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        # server-addr: 127.0.0.1:8848
+        server-addr: ruoyi-nacos:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置