From 457d831e0394c886222d292d2f252e724d640707 Mon Sep 17 00:00:00 2001 From: yanzhen Date: Mon, 3 Apr 2023 19:21:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3copy.sh=E4=B8=AD=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E8=84=9A=E6=9C=AC=E5=90=8D=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/copy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/copy.sh b/docker/copy.sh index ec2915b8..318efb26 100644 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -9,8 +9,8 @@ usage() { # copy sql echo "begin copy sql " -cp ../sql/ry_20220814.sql ./mysql/db -cp ../sql/ry_config_20220510.sql ./mysql/db +cp ../sql/ry_20230223.sql ./mysql/db +cp ../sql/ry_config_20220929.sql ./mysql/db # copy html echo "begin copy html " From a5e47939c013a19922a1a6d8a4af4ca2edd7461a Mon Sep 17 00:00:00 2001 From: yanzhen Date: Tue, 4 Apr 2023 17:13:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACdocker=E6=9E=84=E5=BB=BAnacos=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/nacos/conf/application.properties | 3 +++ 1 file changed, 3 insertions(+) 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 From 50b298b46f987394505a8550591b28fdba3e91b5 Mon Sep 17 00:00:00 2001 From: yanzhen Date: Tue, 16 May 2023 16:34:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3docker=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E6=97=A0=E6=B3=95=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5nacos=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E5=90=8D=E7=A7=B0=E6=9D=A5=E5=BB=BA=E7=AB=8B?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 6 ++++-- ruoyi-gateway/src/main/resources/bootstrap.yml | 9 ++++++--- ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml | 6 ++++-- .../ruoyi-system/src/main/resources/bootstrap.yml | 6 ++++-- 4 files changed, 18 insertions(+), 9 deletions(-) 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 # 共享配置 From 4e77b372347979bcdb5a9bd22648ba9297735aad Mon Sep 17 00:00:00 2001 From: yanzhen Date: Tue, 16 May 2023 16:36:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8C=87=E5=AE=9Anacos=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=8C=87=E5=AE=9A=E5=88=99=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=90=A6=E5=88=99?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: