From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 一月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-gateway/src/main/resources/bootstrap.yml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 1cc5a28..8982467 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -1,7 +1,7 @@
server:
port: 9000
tomcat:
- basedir: /data/tomcat
+ basedir: /mnt/tomcat
max-swallow-size: 100MB
# Spring
spring:
@@ -12,8 +12,8 @@
allow-bean-definition-overriding: true
profiles:
# 环境配置
- active: dev
-# active: prod
+# active: dev
+ active: prod
---
spring:
config:
@@ -68,16 +68,16 @@
nacos:
discovery:
# 服务注册地址
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 127.0.0.1:8848
service: ${spring.application.name}
group: DEFAULT_GROUP
- namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ namespace: 20c168da-8cf1-4fff-bc38-bc62df656b6a
username: nacos
password: nacos
config:
# 配置中心地址
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
- namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
+ server-addr: 127.0.0.1:8848
+ namespace: 20c168da-8cf1-4fff-bc38-bc62df656b6a
username: nacos
password: nacos
group: DEFAULT_GROUP
@@ -86,7 +86,7 @@
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
@@ -97,7 +97,7 @@
datasource:
ds1:
nacos:
- server-addr: 192.168.0.137:8848,192.168.0.123:8848
+ server-addr: 127.0.0.1:8848
dataId: sentinel-ruoyi-gateway
groupId: DEFAULT_GROUP
username: nacos
--
Gitblit v1.7.1