From 7a7dbbd34179b79caf3b74dedf2d5b84f30d0c05 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 26 四月 2024 11:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/application.yml | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/ycl-server/src/main/resources/application.yml b/ycl-server/src/main/resources/application.yml
index 6cb55a0..a3822bf 100644
--- a/ycl-server/src/main/resources/application.yml
+++ b/ycl-server/src/main/resources/application.yml
@@ -1,17 +1,4 @@
-# 椤圭洰鐩稿叧閰嶇疆
-platform:
- # 鍚嶇О
- name: zgyw
- # 鐗堟湰
- version: 1.0.0
- # 鐗堟潈骞翠唤
- copyrightYear: 2024
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/zgyw/uploadPath锛孡inux閰嶇疆 /home/zgyw/uploadPath锛�
- profile: D:/zgyw/uploadPath
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
+
spring:
# 璧勬簮淇℃伅
@@ -59,11 +46,14 @@
mapper-locations: classpath*:mapper/**/*.xml
# 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
typeAliasesPackage: com.ycl.**.domain
+ configuration:
+ default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler # 閫氱敤鏋氫妇澶勭悊鍣�
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 鏃ュ織鎵撳嵃
global-config:
db-config:
id-type: auto
#閫昏緫鍒犻櫎閰嶇疆瀛楁
- logic-delete-field:
+ logic-delete-field: deleted
#閫昏緫鍒犻櫎閰嶇疆瀛楁 1 鍒犻櫎
logic-delete-value: 1
#閫昏緫鍒犻櫎閰嶇疆瀛楁 0 涓嶅垹闄�
@@ -79,7 +69,6 @@
level:
org.springframework: warn
com.ycl : debug
- config: classpath:logback-plus.xml
# security閰嶇疆
security:
@@ -106,7 +95,7 @@
user:
password:
# 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
+ maxRetryCount: 20
# 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
lockTime: 10
@@ -117,4 +106,10 @@
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
excludes: /system/notice
# 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
\ No newline at end of file
+ urlPatterns: /system/*,/monitor/*,/tool/*
+
+# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
+request:
+ retry: 4 # 鏈�澶ч噸璇曟鏁�
+ youYunDomain: 123.123.123.5 # 浼樹簯鍦板潃
+ haiKangDomain: 123.123.123.1 # 娴峰悍鍦板潃
--
Gitblit v1.8.0