From f5a366b2c3b200006983f3a40872bc4976a884d7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 11 二月 2025 18:38:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 start/src/main/resources/application.yml |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/start/src/main/resources/application.yml b/start/src/main/resources/application.yml
index 161c6cd..3be20ad 100644
--- a/start/src/main/resources/application.yml
+++ b/start/src/main/resources/application.yml
@@ -5,7 +5,7 @@
   # 瀹炰綋鎵弿锛屽涓猵ackage鐢ㄩ�楀彿鎴栬�呭垎鍙峰垎闅�
   typeAliasesPackage: com.ycl.**.domain
   configuration:
-    default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler # 閫氱敤鏋氫妇澶勭悊鍣�
+    default-enum-type-handler: com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler # 閫氱敤鏋氫妇澶勭悊鍣�
   #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 鏃ュ織鎵撳嵃
   global-config:
     db-config:
@@ -64,14 +64,18 @@
   servlet:
     multipart:
       # 鍗曚釜鏂囦欢澶у皬
-      max-file-size: 10MB
+      max-file-size: 100MB
       # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
-      max-request-size: 20MB
+      max-request-size: 100MB
   # 鏈嶅姟妯″潡
   devtools:
     restart:
       # 鐑儴缃插紑鍏�
-      enabled: true
+      enabled: false
+  # 鏃ユ湡鏍煎紡
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 
 # token閰嶇疆
 token:
@@ -105,17 +109,3 @@
   urlPatterns: /system/*,/monitor/*,/tool/*
 
 
-
-# 宸ヤ綔娴� Flowable 閰嶇疆锛宖lowable瀹屾暣鐨勯厤缃紝鍙傝锛欯see https://www.flowable.com/open-source/docs/bpmn/ch05a-Spring-Boot/#flowable-application-properties
-flowable:
-  database-schema-update: true  # 鑷姩鏇存柊flowable琛ㄧ粨鏋勶紝绗竴娆¤繛鎺ユ暟鎹簱鏃跺彲浠ヨ缃负true
-#  # 鍏抽棴鍚勪釜妯″潡鐢熸垚琛紝鐩墠鍙娇鐢ㄥ伐浣滄祦鍩虹琛�
-  idm:  # idm鏄痜lowable鐨勮韩浠界鐞嗘ā鍧楋細鍗崇敤鎴枫�佽璇併�佹潈闄愮瓑
-    enabled: false
-#  cmmn: # cmmn鏄痜lowable鐨勬渚嬬鐞嗘ā鍧楋紝浣撶幇鍦╢lowable-ui涓殑锛氭祦绋嬪缓妯″櫒銆乁I锛孈see https://www.flowable.com/open-source/docs/cmmn/ch06-cmmn
-#    enabled: true
-#  dmn: # dmn鏄痜lowable鐨勫喅绛栨ā鍨嬶紝浣撶幇鍦╢lowable-ui涓殑鍐崇瓥琛�  @see https://www.flowable.com/open-source/docs/dmn/ch06-DMN-Introduction
-#    enabled: false
-#  app: # app鐨勫姛鑳芥槸涓篺lowable鍦╯pring涓珮鏁堣繍琛岃�屾彁渚涗簡寰堝bean锛屼笌flowable鏈韩鐨勫唴瀹规棤鍏�
-#    enabled: true
-#  check-process-definitions: true

--
Gitblit v1.8.0