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-admin/src/main/resources/application-dev.yml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index b634908..8bc5b94 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -8,8 +8,8 @@
metadata:
username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password}
- username: ruoyi
- password: 123456
+ username: @monitor.username@
+ password: @monitor.password@
--- # snail-job 閰嶇疆
snail-job:
@@ -25,6 +25,10 @@
namespace: ${spring.profiles.active}
# 闅忎富搴旂敤绔彛椋橀��
port: 2${server.port}
+ # 瀹㈡埛绔痠p鎸囧畾
+ host:
+ # RPC绫诲瀷: netty, grpc
+ rpc-type: grpc
--- # 鏁版嵁婧愰厤缃�
spring:
@@ -198,7 +202,7 @@
redirect-uri: ${justauth.address}/social-callback?source=maxkey
topiam:
# topiam 鏈嶅姟鍣ㄥ湴鍧�
- server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol
+ server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
client-id: 449c4*********937************759
client-secret: ac7***********1e0************28d
redirect-uri: ${justauth.address}/social-callback?source=topiam
--
Gitblit v1.9.3