From f4278872babfaf2c60e71df144733d62ef192ddd Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 23 Jan 2026 18:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/resources/application.yml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 584dcd1..b039b51 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -129,7 +129,7 @@
# redis 配置
redis:
# 地址
- host: localhost
+ host: 127.0.0.1
# 端口，默认为6379
port: 6379
# 数据库索引
@@ -163,6 +163,4 @@
# 激活配置文件
profiles:
- #active: daqing-druid,daqing
- active: prod-druid,prod
- #active: dev-druid,dev
\ No newline at end of file
+ active: @spring.profiles.active@
\ No newline at end of file
--
Gitblit v1.9.3