From 60af92ed2d17d6bb188e25c68c361d6da6af6cac Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 16 十二月 2024 19:27:49 +0800
Subject: [PATCH] !618 update 适配 TOPAIM 2.0 单点登录 Merge pull request !618 from 马铃薯头/dev
---
ruoyi-admin/src/main/resources/application-dev.yml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index ea5cafa..e4f6086 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -2,11 +2,14 @@
spring.boot.admin.client:
# 澧炲姞瀹㈡埛绔紑鍏�
enabled: true
- url: http://localhost:9090/admin
+ url: http://localhost:9090
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@
--- # snail-job 閰嶇疆
snail-job:
@@ -22,6 +25,8 @@
namespace: ${spring.profiles.active}
# 闅忎富搴旂敤绔彛椋橀��
port: 2${server.port}
+ # 瀹㈡埛绔痠p鎸囧畾
+ host:
--- # 鏁版嵁婧愰厤缃�
spring:
@@ -195,7 +200,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