diff --git a/src/main/java/net/mingsoft/MSApplication.java b/src/main/java/net/mingsoft/MSApplication.java
index 4fec5f94..0ba946b6 100644
--- a/src/main/java/net/mingsoft/MSApplication.java
+++ b/src/main/java/net/mingsoft/MSApplication.java
@@ -13,7 +13,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @ComponentScan(basePackages = {"net.mingsoft"})
 @MapperScan(basePackages={"**.dao"})
 @ServletComponentScan(basePackages = {"net.mingsoft"})
-@EnableSwagger2
 public class MSApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(MSApplication.class, args);
diff --git a/src/main/java/net/mingsoft/config/SwaggerConfig.java b/src/main/java/net/mingsoft/config/SwaggerConfig.java
index fc856b46..f8d842aa 100644
--- a/src/main/java/net/mingsoft/config/SwaggerConfig.java
+++ b/src/main/java/net/mingsoft/config/SwaggerConfig.java
@@ -14,6 +14,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @Configuration
+@EnableSwagger2
 @ConditionalOnProperty(prefix="ms",name = "swagger.enable", havingValue = "true")
 public class SwaggerConfig {
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 89ab1c67..d9d9c0c8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,8 +6,9 @@ server:
 logging:
   level:
     net.mingsoft: trace
-  file: mcms.log #日志文件存放位置
-  path: log #日志压缩文件存放位置
+  file:
+    name: mcms.log
+    path: log
 ms:
   swagger:
     enable: true #启用swagger文档