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

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:

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

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
         # 共享配置

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

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
         # 共享配置

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
         # 共享配置