From d70a80b04a5d865fadc71a966f6d28b7bc37ac1f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 12 十一月 2024 16:21:09 +0800
Subject: [PATCH] Merge branch '互联网' of http://42.193.1.25:9521/r/~qirong/qyspzw into 互联网

---
 ruoyi-admin/src/main/resources/application.yml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 2b508e2..1a323d9 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -71,9 +71,9 @@
   servlet:
     multipart:
       # 鍗曚釜鏂囦欢澶у皬
-      max-file-size: 10MB
+      max-file-size: 500MB
       # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
-      max-request-size: 20MB
+      max-request-size: 500MB
   mvc:
     format:
       date-time: yyyy-MM-dd HH:mm:ss
@@ -97,7 +97,7 @@
   timeout: 604800
   # 澶氱涓嶅悓 token 鏈夋晥鏈� 鍙煡鐪� LoginHelper.loginByDevice 鏂规硶鑷畾涔�
   # token鏈�浣庢椿璺冩椂闂� (鎸囧畾鏃堕棿鏃犳搷浣滃氨杩囨湡) 鍗曚綅: 绉�
-  active-timeout: 1800
+  active-timeout: 86400
   # 鏄惁鍏佽鍚屼竴璐﹀彿骞跺彂鐧诲綍 (涓簍rue鏃跺厑璁镐竴璧风櫥褰�, 涓篺alse鏃舵柊鐧诲綍鎸ゆ帀鏃х櫥褰�)
   is-concurrent: true
   # 鍦ㄥ浜虹櫥褰曞悓涓�璐﹀彿鏃讹紝鏄惁鍏辩敤涓�涓猼oken (涓簍rue鏃舵墍鏈夌櫥褰曞叡鐢ㄤ竴涓猼oken, 涓篺alse鏃舵瘡娆＄櫥褰曟柊寤轰竴涓猼oken)
@@ -151,6 +151,9 @@
   typeAliasesPackage: org.dromara.**.domain
   global-config:
     dbConfig:
+      logic-delete-field: deleted # 鍏ㄥ眬鎸囧畾閫昏緫鍒犻櫎瀛楁
+      logic-delete-value: 1 # 閫昏緫鍒犻櫎鍚庣殑鍊�
+      logic-not-delete-value: 0 # 娌℃湁鍒犻櫎鐨勫��
       # 涓婚敭绫诲瀷
       # AUTO 鑷 NONE 绌� INPUT 鐢ㄦ埛杈撳叆 ASSIGN_ID 闆姳 ASSIGN_UUID 鍞竴 UUID
       # 濡傞渶鏀逛负鑷 闇�瑕佸皢鏁版嵁搴撹〃鍏ㄩ儴璁剧疆涓鸿嚜澧�
@@ -256,7 +259,7 @@
 
 --- # websocket
 websocket:
-  enabled: true
+  enabled: false
   # 璺緞
   path: /resource/websocket
   # 璁剧疆璁块棶婧愬湴鍧�

--
Gitblit v1.8.0