clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
代码大师麦克劳瑞 2023-09-01 01:42:13 +00:00 committed by Gitee
parent b00775f988 4e77b37234
commit 836e9f25c9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-compose.yml
View File

@ -2,7 +2,7 @@ version : '3.8'
services: services:
ruoyi-nacos: ruoyi-nacos:
container_name: ruoyi-nacos container_name: ruoyi-nacos
image: nacos/nacos-server image: nacos/nacos-server:2.2.1
build: build:
context: ./nacos context: ./nacos
environment: environment:

3
docker/nacos/conf/application.properties
View File

@ -30,3 +30,6 @@ nacos.core.auth.server.identity.key=serverIdentity
nacos.core.auth.server.identity.value=security nacos.core.auth.server.identity.value=security
nacos.istio.mcp.server.enabled=false nacos.istio.mcp.server.enabled=false
### 2.1.0 ???
nacos.core.auth.plugin.nacos.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789

6
ruoyi-auth/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

9
ruoyi-gateway/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置
@ -33,7 +35,8 @@ spring:
datasource: datasource:
ds1: ds1:
nacos: nacos:
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
dataId: sentinel-ruoyi-gateway dataId: sentinel-ruoyi-gateway
groupId: DEFAULT_GROUP groupId: DEFAULT_GROUP
data-type: json data-type: json

6
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

6
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,12 @@ spring:
nacos: nacos:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 127.0.0.1:8848 # server-addr: 127.0.0.1:8848
server-addr: ruoyi-nacos:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置