From aface5ded1e2ecf0e8f98434cb69b354758cefe6 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: 星期一, 16 十二月 2024 18:53:58 +0800
Subject: [PATCH] update 适配 TOPIAM 2.0 单点登录

---
 ruoyi-admin/src/main/resources/application-dev.yml |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index dd769ca..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:
@@ -96,8 +101,8 @@
     port: 6379
     # 鏁版嵁搴撶储寮�
     database: 0
-    # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
-    # password:
+    # redis 瀵嗙爜蹇呴』閰嶇疆
+    password: ruoyi123
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
     # 鏄惁寮�鍚痵sl
@@ -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