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-auth/src/main/resources/bootstrap.yml | 80 ++++------------------------------------
1 files changed, 8 insertions(+), 72 deletions(-)
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index b37e02b..e4a3673 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
server:
port: 9100
tomcat:
- basedir: /data/tomcat
+ basedir: /mnt/tomcat
# Spring
spring:
profiles:
# 环境配置
- active: dev
-# active: prod
+# active: dev
+ active: prod
application:
# 应用名称
name: ruoyi-auth
@@ -43,70 +43,6 @@
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
---
-seata:
- enabled: true
- application-id: ${spring.application.name}
- tx-service-group: seata_tx_group #此处配置自定义的seata事务分组名称
- enable-auto-data-source-proxy: false #关闭数据库代理
- service:
- vgroup-mapping:
- seata_tx_group: default
- data-source-proxy-mode: AT
- config:
- type: nacos
- nacos:
- # 开发环境
- server-addr: 192.168.110.169:8848
- namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
- group: DEFAULT_GROUP
- data-id: seata-server.properties
- username: nacos
- password: nacos
- # 生产环境
-# server-addr: 192.168.0.137:8848,192.168.0.123:8848
-# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
-# group: DEFAULT_GROUP
-# data-id: seata-server.properties
-# username: nacos
-# password: nacos
- registry:
- type: nacos
- nacos:
- application: seata-server
- # 开发环境
- server-addr: 192.168.110.169:8848
- namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
- group: DEFAULT_GROUP
- username: nacos
- password: nacos
- # 生产环境
-# server-addr: 192.168.0.137:8848,192.168.0.123:8848
-# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
-# group: DEFAULT_GROUP
-# username: nacos
-# password: nacos
- cloud:
- nacos:
- discovery:
- # 开发环境
- server-addr: 192.168.110.169:8848 # nacos注册中心地址
- namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9 # 命名空间
- group: DEFAULT_GROUP
- application: seata-server #Nacos 中 Seata 名称
- username: nacos
- password: nacos
- # 生产环境
-# server-addr: 192.168.0.137:8848,192.168.0.123:8848
-# namespace: c6cf40b5-44e8-43f9-be61-8d10fa830e2a
-# group: DEFAULT_GROUP
-# application: seata-server #Nacos 中 Seata 名称
-# username: nacos
-# password: nacos
- sentinel:
- transport:
- dashboard: 127.0.0.1:8080 # Sentinel控制台地址
- eager: true
----
spring:
config:
activate:
@@ -115,16 +51,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
@@ -133,7 +69,7 @@
file-extension: yml
# 共享配置
shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ - application.${spring.cloud.nacos.config.file-extension}
---
spring:
config:
--
Gitblit v1.7.1