From 5e3231d59b46adfb6e44cd4b4fb17ece12c931a9 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期三, 11 九月 2024 12:02:16 +0800
Subject: [PATCH] !582 优化admin配置文件读取 * update 优化admin监控配置读取名称 * update 优化admin监控配置读取

---
 ruoyi-admin/src/main/resources/application-dev.yml |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 5589e58..f122020 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -5,24 +5,26 @@
   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@
 
---- # 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 绔彛 闅忕潃涓诲簲鐢ㄧ鍙i閫� 閬垮厤闆嗙兢鍐茬獊
-    port: 2${server.port}
-    protocol: http
-    server-address: 127.0.0.1:7700
-    store-strategy: disk
+--- # snail-job 閰嶇疆
+snail-job:
+  enabled: true
+  # 闇�瑕佸湪 SnailJob 鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝g‘鍒嗘淳浠诲姟
+  group: "ruoyi_group"
+  # SnailJob 鎺ュ叆楠岃瘉浠ょ墝 璇﹁ script/sql/snail_job.sql `sj_group_config` 琛�
+  token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+  server:
+    host: 127.0.0.1
+    port: 17888
+  # 璇﹁ script/sql/snail_job.sql `sj_namespace` 琛�
+  namespace: ${spring.profiles.active}
+  # 闅忎富搴旂敤绔彛椋橀��
+  port: 2${server.port}
 
 --- # 鏁版嵁婧愰厤缃�
 spring:
@@ -97,13 +99,14 @@
     port: 6379
     # 鏁版嵁搴撶储寮�
     database: 0
-    # 瀵嗙爜(濡傛病鏈夊瘑鐮佽娉ㄩ噴鎺�)
-    # password:
+    # redis 瀵嗙爜蹇呴』閰嶇疆
+    password: ruoyi123
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
     # 鏄惁寮�鍚痵sl
     ssl.enabled: false
 
+# redisson 閰嶇疆
 redisson:
   # redis key鍓嶇紑
   keyPrefix:

--
Gitblit v1.9.3