From 975fe5248cc1f3d999f4d660fc331570110c4968 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 08 十月 2026 13:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-server/src/main/resources/application-thzy.yaml | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/yudao-server/src/main/resources/application-thzy.yaml b/yudao-server/src/main/resources/application-thzy.yaml
index 5862482..22c2a28 100644
--- a/yudao-server/src/main/resources/application-thzy.yaml
+++ b/yudao-server/src/main/resources/application-thzy.yaml
@@ -3,7 +3,7 @@
# H5 婧簮椤甸潰鍩虹鍦板潃锛堜簩缁寸爜鍐呭鍓嶇紑锛夛紝闇�涓哄叕浼楁壂鐮佸彲璁块棶鐨勫湴鍧�
mes:
- trace-base-url: http://47.97.181.254:9001/trace.html
+ trace-base-url: http://1.95.78.124:9008/prod/trace.html
--- #################### 鏁版嵁搴撶浉鍏抽厤缃� ####################
spring:
@@ -55,11 +55,12 @@
min-idle: 1 # 鏈�灏忚繛鎺ユ睜鏁伴噺
max-active: 20 # 鏈�澶ц繛鎺ユ睜鏁伴噺
max-wait: 60000 # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝鍗曚綅锛氭绉掞紙1 鍒嗛挓锛�
- time-between-eviction-runs-millis: 60000 # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶏細姣锛�1 鍒嗛挓锛�
+ time-between-eviction-runs-millis: 30000 # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶏細姣锛�30 绉掞紝鍘嬬缉绌洪棽杩炴帴鏈妫�娴嬬殑缂濋殭锛�
min-evictable-idle-time-millis: 600000 # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶏細姣锛�10 鍒嗛挓锛�
max-evictable-idle-time-millis: 1800000 # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶏細姣锛�30 鍒嗛挓锛�
validation-query: SELECT 1 FROM DUAL # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
test-while-idle: true
+ keepAlive: true # 绌洪棽杩炴帴瀹氭湡鍙戦�佹娴嬪寘淇濇椿锛岄伩鍏嶈鏈嶅姟绔� wait_timeout 鍥炴敹
test-on-borrow: false
test-on-return: false
pool-prepared-statements: true # 鏄惁寮�鍚� PreparedStatement 缂撳瓨
@@ -67,16 +68,16 @@
primary: master
datasource:
master:
- url: jdbc:mysql://172.17.0.1:9000/mom-thzy?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
+ url: jdbc:mysql://172.17.0.1:9000/mom-thzynew?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 杩炴帴鐨勭ず渚�
username: root
- password: thzy@123456..
+ password: xinjiang@123456..
# Redis 閰嶇疆銆俁edisson 榛樿鐨勯厤缃冻澶熶娇鐢紝涓�鑸笉闇�瑕佽繘琛岃皟浼�
data:
redis:
host: 172.17.0.1 # 鍦板潃
port: 6379 # 绔彛
- database: 1 # 鏁版嵁搴撶储寮�
+ database: 3 # 鏁版嵁搴撶储寮�
# password: dev # 瀵嗙爜锛屽缓璁敓浜х幆澧冨紑鍚�
--- #################### 瀹氭椂浠诲姟鐩稿叧閰嶇疆 ####################
@@ -191,7 +192,7 @@
storage: # 鏂囦欢涓婁紶閰嶇疆
path: /home/mom/javaWork/file # 鏂囦欢瀛樺偍鏍圭洰褰�
url-prefix: /admin-api/system/storage-blob # URL璺緞鍓嶇紑
- domain: http://47.97.181.254:9001 # 鍩熷悕鍓嶇紑锛堟寜瀹為檯鍩熷悕閰嶇疆锛夛紝鍓嶇閰嶇疆濂藉儚涓嶅お瀵圭幇鍦ㄦ槸鐩磋繛鍚庣锛屾墍鏈夎鍚庣绔彛
+ domain: http://1.95.78.124:9008 # 鍩熷悕鍓嶇紑锛堟寜瀹為檯鍩熷悕閰嶇疆锛夛紝鍓嶇閰嶇疆濂藉儚涓嶅お瀵圭幇鍦ㄦ槸鐩磋繛鍚庣锛屾墍鏈夎鍚庣绔彛
expired: 120 # token杩囨湡鏃堕棿锛堝垎閽燂級
use-limit: 10 # token浣跨敤娆℃暟涓婇檺
jwt-secret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG # JWT瀵嗛挜
--
Gitblit v1.9.3