From d94776ba25ffcd19cdd7970048ed88d9212bd394 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 10:10:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-gateway/src/main/resources/bootstrap.yml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 8982467..b0dd1de 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@
     allow-bean-definition-overriding: true
   profiles:
     # 环境配置
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
 ---
 spring:
   config:
@@ -23,7 +23,7 @@
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 192.168.110.169:8848
+        server-addr: 127.0.0.1:8848
         service: ${spring.application.name}
         group: DEFAULT_GROUP
         namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
@@ -31,7 +31,7 @@
         password: nacos
       config:
         # 配置中心地址
-        server-addr: 192.168.110.169:8848
+        server-addr: 127.0.0.1:8848
         namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
         username: nacos
         password: nacos
@@ -41,18 +41,18 @@
         file-extension: yml
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application.${spring.cloud.nacos.config.file-extension}
     sentinel:
       # 取消控制台懒加载
       eager: true
       transport:
         # 控制台地址
-        dashboard: 192.168.110.169:8718
+        dashboard: 127.0.0.1:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 192.168.110.169:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-ruoyi-gateway
             groupId: DEFAULT_GROUP
             username: nacos

--
Gitblit v1.7.1