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 | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 35f7a5a..e4f6086 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -2,40 +2,31 @@
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@
---- # powerjob 閰嶇疆
-powerjob:
- worker:
- # 濡備綍寮�鍚皟搴︿腑蹇冭鏌ョ湅鏂囨。鏁欑▼
- enabled: false
- # 闇�瑕佸厛鍦� powerjob 鐧诲綍椤垫墽琛屽簲鐢ㄦ敞鍐屽悗鎵嶈兘浣跨敤
- app-name: ruoyi-worker
- allow-lazy-connect-server: false
- max-appended-wf-context-length: 4096
- max-result-length: 4096
- # 28080 绔彛 闅忕潃涓诲簲鐢ㄧ鍙ｉ閫� 閬垮厤闆嗙兢鍐茬獊
- port: 2${server.port}
- protocol: http
- server-address: 127.0.0.1:7700
- store-strategy: disk
-
---- # easy-retry 閰嶇疆
-easy-retry:
+--- # snail-job 閰嶇疆
+snail-job:
enabled: true
- # 闇�瑕佸湪EasyRetry鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝ｇ‘鍒嗘淳浠诲姟
- group-name: "ruoyi_group"
- token: "ER_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+ # 闇�瑕佸湪 SnailJob 鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝ｇ‘鍒嗘淳浠诲姟
+ group: "ruoyi_group"
+ # SnailJob 鎺ュ叆楠岃瘉浠ょ墝 璇﹁ script/sql/snail_job.sql `sj_group_config` 琛�
+ token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
server:
host: 127.0.0.1
- port: 1788
- # 璇﹁ script/sql/easy_retry.sql `er_namespace` 琛�
+ port: 17888
+ # 璇﹁ script/sql/snail_job.sql `sj_namespace` 琛�
namespace: ${spring.profiles.active}
-
+ # 闅忎富搴旂敤绔彛椋橀��
+ port: 2${server.port}
+ # 瀹㈡埛绔痠p鎸囧畾
+ host:
--- # 鏁版嵁婧愰厤缃�
spring:
@@ -110,13 +101,14 @@
port: 6379
# 鏁版嵁搴撶储寮�
database: 0
- # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
- # password:
+ # redis 瀵嗙爜蹇呴』閰嶇疆
+ password: ruoyi123
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
ssl.enabled: false
+# redisson 閰嶇疆
redisson:
# redis key鍓嶇紑
keyPrefix:
@@ -208,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