From 30ef12ada07cf101ab099406b7229db2b1df157f Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Fri, 3 Jan 2020 18:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=20?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mingsoft/config/SwaggerConfig.java    |  2 +
 src/main/resources/application.yml            | 55 ++++++++++---------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/main/java/net/mingsoft/config/SwaggerConfig.java b/src/main/java/net/mingsoft/config/SwaggerConfig.java
index 64926c60..fc856b46 100644
--- a/src/main/java/net/mingsoft/config/SwaggerConfig.java
+++ b/src/main/java/net/mingsoft/config/SwaggerConfig.java
@@ -1,5 +1,6 @@
 package net.mingsoft.config;
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -13,6 +14,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Configuration
+@ConditionalOnProperty(prefix="ms",name = "swagger.enable", havingValue = "true")
 public class SwaggerConfig {
 
 	@Bean
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e5b3e25f..915d8dbe 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,29 +2,32 @@ server:
   port: 8080
   servlet.context-path: /ms-mcms
   servlet.session.timeout: 60M
-  
+
 logging:
- level:
-  net.mingsoft: trace
- file: mcms.log
+  level:
+    net.mingsoft: trace
+  file: mcms.log #日志文件存放位置
+  path: log #日志压缩文件存放位置
 ms:
- manager: 
-  path: /ms
-  view-path: /WEB-INF/manager
-  
- upload: 
-   path: upload
-   mapping: /upload/**
-   denied: .exe,.jsp
-   multipart:
-     #最大上传文件大小 单位：KB
-     max-file-size: 10240
-     #文件暂存临时目录
-     upload-temp-dir: temp
-     #临时文件大小
-     max-in-memory-size: 10240
-     #总上传最大大小 单位：KB -1禁用
-     max-request-size: -1
+  swagger:
+    enable: true #启用swagger文档
+  manager:
+    path: /ms
+    view-path: /WEB-INF/manager
+
+  upload:
+    path: upload
+    mapping: /upload/**
+    denied: .exe,.jsp
+    multipart:
+      #最大上传文件大小 单位：KB
+      max-file-size: 10240
+      #文件暂存临时目录
+      upload-temp-dir: temp
+      #临时文件大小
+      max-in-memory-size: 10240
+      #总上传最大大小 单位：KB -1禁用
+      max-request-size: -1
 
 
 
@@ -32,8 +35,8 @@ spring:
   profiles:
     active: dev
   mvc:
-    pathmatch: 
-     use-suffix-pattern: true
+    pathmatch:
+      use-suffix-pattern: true
   devtools:
     restart:
       enabled: true
@@ -54,7 +57,7 @@ spring:
     expose-spring-macro-helpers: true
     prefer-file-system-access: false
     template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
-    settings: 
+    settings:
       template_update_delay: 1
       default_encoding: UTF-8
       classic_compatible: true
@@ -62,7 +65,7 @@ spring:
       time_format: HH:mm:ss
       datetime_format: yyyy-MM-dd HH:mm:ss
       number_format: 0.##
-      
+
 mybatis:
   configuration:
-   database-id: mysql
\ No newline at end of file
+    database-id: mysql
\ No newline at end of file