From bc52aa918d34f14a88425feb52f95f9265a52886 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Thu, 29 Feb 2024 17:30:04 +0800
Subject: [PATCH] =?UTF-8?q?gateway=E7=9A=84=E9=85=8D=E7=BD=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9D=8F=E4=BA=86=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E7=AD=89=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml
index 2c1c006eb..c77b87f49 100644
--- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml
+++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/resources/application.yml
@@ -16,19 +16,21 @@ spring:
     allow-circular-references: true
   config:
     import:
-      - optional:nacos:jeecg-gateway-dev.yaml
+      - optional:nacos:${spring.application.name}-@profile.name@.yaml
   cloud:
     nacos:
       config:
-        server-addr: localhost:8848
-        namespace: public
-      #        username: @config.username@
-      #        password: @config.password@
+        server-addr: @config.server-addr@
+        group: @config.group@
+        namespace: @config.namespace@
+        username: @config.username@
+        password: @config.password@
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: public
-    #        username: @config.username@
-    #        password: @config.password@
+        group: @config.group@
+        namespace: @config.namespace@
+        username: @config.username@
+        password: @config.password@
     gateway:
       discovery:
         locator:
@@ -56,7 +58,7 @@ spring:
         flow:  # 指定数据源名称
           # 指定nacos数据源
           nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
+            server-addr: @config.server-addr@
             # 指定配置文件
             dataId: ${spring.application.name}-flow-rules
             # 指定分组
@@ -68,7 +70,7 @@ spring:
         #降级规则
         degrade:
           nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
+            server-addr: @config.server-addr@
             dataId: ${spring.application.name}-degrade-rules
             groupId: SENTINEL_GROUP
             rule-type: degrade
@@ -76,7 +78,7 @@ spring:
         #系统规则
         system:
           nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
+            server-addr: @config.server-addr@
             dataId: ${spring.application.name}-system-rules
             groupId: SENTINEL_GROUP
             rule-type: system
@@ -84,7 +86,7 @@ spring:
         #授权规则
         authority:
           nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
+            server-addr: @config.server-addr@
             dataId: ${spring.application.name}-authority-rules
             groupId: SENTINEL_GROUP
             rule-type: authority
@@ -92,7 +94,7 @@ spring:
         #热点参数
         param-flow:
           nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
+            server-addr: @config.server-addr@
             dataId: ${spring.application.name}-param-rules
             groupId: SENTINEL_GROUP
             rule-type: param-flow
@@ -100,7 +102,7 @@ spring:
         #网关流控规则
         gw-flow:
           nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
+            server-addr: @config.server-addr@
             dataId: ${spring.application.name}-flow-rules
             groupId: SENTINEL_GROUP
             rule-type: gw-flow
@@ -108,7 +110,7 @@ spring:
         #API流控规则
         gw-api-group:
           nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
+            server-addr: @config.server-addr@
             dataId: ${spring.application.name}-api-rules
             groupId: SENTINEL_GROUP
             rule-type: gw-api-group