Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve

xiaoyong931011

2022-08-09 3284eb81a736c1cf3e78d92ecb690d47e5d7e7e6

 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

@@ -92,3 +95,10 @@
    url: http://120.27.238.55:8000/uploadeFile/image/
    path: /home/javaweb/webresource/uploadeFile/image/

cms:
  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