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

---
 start/src/main/resources/application.yml |   47 ++++++++++++-----------------------------------
 1 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/start/src/main/resources/application.yml b/start/src/main/resources/application.yml
index 0b98304..3be20ad 100644
--- a/start/src/main/resources/application.yml
+++ b/start/src/main/resources/application.yml
@@ -1,18 +1,3 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ycl:
-  # 鍚嶇О
-  name: RuoYi
-  # 鐗堟湰
-  version: 1.0.0
-  # 鐗堟潈骞翠唤
-  copyrightYear: 2024
-  # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
-  profile: D:/ruoyi/uploadPath
-  # 鑾峰彇ip鍦板潃寮�鍏�
-  addressEnabled: false
-  # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
-  captchaType: math
-
 
 # mybatis plus閰嶇疆
 mybatis-plus:
@@ -20,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:
@@ -36,7 +21,7 @@
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 8080
+  port: 10076
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /
@@ -56,6 +41,8 @@
   level:
     com.ruoyi: debug
     org.springframework: warn
+    org.flowable.engine.impl.persistence.entity.*: debug
+    org.flowable.task.service.impl.persistence.entity.*: debug
 
 # 鐢ㄦ埛閰嶇疆
 user:
@@ -77,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:
@@ -93,7 +84,7 @@
   # 浠ょ墝瀵嗛挜
   secret: gfabcdefghijklmnopqrstuvwxyz12
   # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
-  expireTime: 30
+  expireTime: 10000
 
 # PageHelper鍒嗛〉鎻掍欢
 pagehelper:
@@ -118,17 +109,3 @@
   urlPatterns: /system/*,/monitor/*,/tool/*
 
 
-
-# 宸ヤ綔娴� Flowable 閰嶇疆
-flowable:
-  database-schema: project_management
-  database-schema-update: true  # 鑷姩鏇存柊flowable琛ㄧ粨鏋勶紝绗竴娆¤繛鎺ユ暟鎹簱鏃跺彲浠ヨ缃负true
-  # 鍏抽棴鍚勪釜妯″潡鐢熸垚琛紝鐩墠鍙娇鐢ㄥ伐浣滄祦鍩虹琛�
-  idm:
-    enabled: false
-  cmmn:
-    enabled: false
-  dmn:
-    enabled: false
-  app:
-    enabled: false

--
Gitblit v1.8.0