From e571fe6f423fa15736fb5360ffcffc4829acb30f Mon Sep 17 00:00:00 2001
From: liuhuazhong <liuhuazhong@qq.com>
Date: Wed, 6 Nov 2024 14:42:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=85=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-auth/src/main/resources/bootstrap.yml   | 22 ++++---------------
 .../src/main/resources/bootstrap.yml          | 10 ++-------
 .../src/main/resources/bootstrap.yml          |  6 ++---
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 625b9b8f..95a9dfdd 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -13,19 +13,17 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: cc149503-5508-4da9-a735-9505e2a91363
         # 服务注册地址
-        server-addr: 172.20.32.181:31203
+        server-addr: nacos-ci4s.argo.svc:8848
         username: nacos
         password: h1n2x3j4y5@
         retry:
           enabled: true
       config:
-        namespace: cc149503-5508-4da9-a735-9505e2a91363
         username: nacos
         password: h1n2x3j4y5@
         # 配置中心地址
-        server-addr: 172.20.32.181:31203
+        server-addr: nacos-ci4s.argo.svc:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -38,18 +36,6 @@ spring:
             refresh: true
 
   redis:
-    host: 172.20.32.88
+    host: 172.20.32.150
     port: 6379
-    password:
-
-oauth2:
-    url: http://172.20.32.106:8080
-#    url: http://110.41.62.43:8088
-    client-id: ci4s
-    client-secret: 123456
-    user-authorization-uri: ${oauth2.url}/oauth/authorize
-    access-token-uri: ${oauth2.url}/oauth/token
-    logout-uri: ${oauth2.url}/logout
-    redirect-uri: http://172.20.32.83:8002/authorize
-    check-token-uri: ${oauth2.url}/oauth/check_token
-    login-page: ${oauth2.url}/login.html
+    password:
\ No newline at end of file
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 7f060cdc..bcfd24d8 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -4,10 +4,6 @@ server:
 
 # Spring
 spring:
-  redis:
-    host: 172.20.32.88
-    port: 6379
-    password:
   application:
     # 应用名称
     name: ruoyi-gateway
@@ -18,18 +14,16 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 172.20.32.181:31203
+        server-addr: nacos-ci4s.argo.svc:8848
         username: nacos
         password: h1n2x3j4y5@
         retry:
           enabled: true
-        namespace: cc149503-5508-4da9-a735-9505e2a91363
       config:
-        namespace: cc149503-5508-4da9-a735-9505e2a91363
         username: nacos
         password: h1n2x3j4y5@
         # 配置中心地址
-        server-addr: 172.20.32.181:31203
+        server-addr: nacos-ci4s.argo.svc: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 e69f69d3..4172ade8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -14,16 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        namespace: cc149503-5508-4da9-a735-9505e2a91363
-        server-addr: 172.20.32.181:31203
+        server-addr: nacos-ci4s.argo.svc:8848
         username: nacos
         password: h1n2x3j4y5@
       config:
-        namespace: cc149503-5508-4da9-a735-9505e2a91363
         username: nacos
         password: h1n2x3j4y5@
         # 配置中心地址
-        server-addr: 172.20.32.181:31203
+        server-addr: nacos-ci4s.argo.svc:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置