From b74faa19bd619213d4de8772b1816c2f87c29449 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Aug 2022 15:44:50 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve

---
 src/main/resources/application-test.yml |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 02efd62..e207ce1 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -6,6 +6,9 @@
       timeout: 1
 
 spring:
+  mvc:
+    async:
+      request-timeout: 20s
   datasource:
     url: jdbc:mysql://120.27.238.55:3306/farmer_cms?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
     username: ct_test
@@ -74,8 +77,8 @@
 
   servlet:
     multipart:
-      max-file-size: 5MB
-      max-request-size: 100MB
+      max-file-size: 512MB
+      max-request-size: 512MB
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
 
@@ -93,9 +96,9 @@
     path: /home/javaweb/webresource/uploadeFile/image/
 
 cms:
-  base-url: http://localhost
-  static-url: http://localhost
-  template-path: /Users/helius/Desktop/template
-  static-path:
-  output-path: /Users/helius/Desktop/web/output
+  api-url: http://120.27.238.55:8878
+  static-url: http://120.27.238.55:8000/cms/static/
+  template-path: /home/javaweb/webresource/cms/template
+  static-path: /home/javaweb/webresource/cms/static
+  output-path: /home/javaweb/webresource/cms/output
 

--
Gitblit v1.9.1