diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5fb8da1c..63135994 100644 --- 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: diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index 7f2a61f2..83102523 100644 --- 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 diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..b8a34fba 100644 --- 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 # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae..2c0d1cac 100644 --- 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 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a457..34e44941 100644 --- 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 # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab7816..e977811c 100644 --- 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 # 共享配置