From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
index 22ef1ab..622c93d 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -6,12 +6,15 @@
profiles:
active: @profiles.active@
+logging:
+ config: classpath:logback-plus.xml
+
--- # 鐩戞帶涓績鏈嶅姟绔厤缃�
spring:
security:
user:
- name: ruoyi
- password: 123456
+ name: @monitor.username@
+ password: @monitor.password@
boot:
admin:
ui:
@@ -38,5 +41,8 @@
url: http://localhost:9090/admin
instance:
service-host-type: IP
- username: ruoyi
- password: 123456
+ metadata:
+ username: ${spring.boot.admin.client.username}
+ userpassword: ${spring.boot.admin.client.password}
+ username: @monitor.username@
+ password: @monitor.password@
--
Gitblit v1.9.3