From eafecc3ac0227960f2b8fa377be27f066e10e50f Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 20 五月 2025 10:47:58 +0800
Subject: [PATCH] perf(lb-qms): 优化查询功能和时间范围筛选

---
 ruoyi-admin/src/main/resources/application-dev.yml |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index ea5cafa..fb3a3db 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,16 +1,19 @@
 --- # 鐩戞帶涓績閰嶇疆
 spring.boot.admin.client:
   # 澧炲姞瀹㈡埛绔紑鍏�
-  enabled: true
+  enabled: false
   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@
 
 --- # snail-job 閰嶇疆
 snail-job:
-  enabled: true
+  enabled: false
   # 闇�瑕佸湪 SnailJob 鍚庡彴缁勭鐞嗗垱寤哄搴斿悕绉扮殑缁�,鐒跺悗鍒涘缓浠诲姟鐨勬椂鍊欓�夋嫨瀵瑰簲鐨勭粍,鎵嶈兘姝g‘鍒嗘淳浠诲姟
   group: "ruoyi_group"
   # SnailJob 鎺ュ叆楠岃瘉浠ょ墝 璇﹁ script/sql/snail_job.sql `sj_group_config` 琛�
@@ -22,6 +25,10 @@
   namespace: ${spring.profiles.active}
   # 闅忎富搴旂敤绔彛椋橀��
   port: 2${server.port}
+  # 瀹㈡埛绔痠p鎸囧畾
+  host:
+  # RPC绫诲瀷: netty, grpc
+  rpc-type: grpc
 
 --- # 鏁版嵁婧愰厤缃�
 spring:
@@ -44,15 +51,15 @@
           # rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂)
           url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: root
+          password: 123456
         # 浠庡簱鏁版嵁婧�
-        slave:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-          username:
-          password:
+#        slave:
+#          lazy: true
+#          type: ${spring.datasource.type}
+#          driverClassName: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+#          username:
+#          password:
 #        oracle:
 #          type: ${spring.datasource.type}
 #          driverClassName: oracle.jdbc.OracleDriver
@@ -97,7 +104,7 @@
     # 鏁版嵁搴撶储寮�
     database: 0
     # redis 瀵嗙爜蹇呴』閰嶇疆
-    password: ruoyi123
+    #password: ruoyi123
     # 杩炴帴瓒呮椂鏃堕棿
     timeout: 10s
     # 鏄惁寮�鍚痵sl
@@ -186,6 +193,14 @@
   # 鍓嶇澶栫綉璁块棶鍦板潃
   address: http://localhost:80
   type:
+    keycloak:
+      # keycloak 鏈嶅姟鍣ㄥ湴鍧�
+      server-url: https://lanbaosystem.shlanbao.cn:8443
+      realm: lanbao
+      client-id: DataCapture
+      client-secret: kplisa4lJHEIM6knqefVbxln85QbA5NX
+      redirect-uri: ${justauth.address}/social-callback
+      scopes: [openid, email, phone, profile]
     maxkey:
       # maxkey 鏈嶅姟鍣ㄥ湴鍧�
       # 娉ㄦ剰 濡備笅鍧囬厤缃潎涓嶉渶瑕佷慨鏀� maxkey 宸茬粡鍐呯疆濂戒簡鏁版嵁
@@ -195,7 +210,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