Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts: # web_src/config/index.js
2023-07-02 12:42:05 +08:00
parent c551164c89 27b125cf98
commit 3571ca272b
7 changed files with 59 additions and 16 deletions
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -5,6 +5,10 @@


 spring:
+    # 设置接口超时时间
+    mvc:
+        async:
+            request-timeout: 20000
    # [可选]上传文件大小限制
    servlet:
        multipart: