upgrade swagger version,add lombok plugin.

pom.xml

@@ -13,8 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <docker.plugin.version>1.0.0</docker.plugin.version>
-        <docker.host>http://www.yaoxiangedu.com:23750</docker.host>
+        <swagger.knife4j.version>2.0.8</swagger.knife4j.version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -80,22 +79,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-models</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.21</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -125,17 +108,21 @@
             <artifactId>minio</artifactId>
             <version>6.0.11</version>
         </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.6</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
             <version>1.1.21</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>${swagger.knife4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>webjars-locator-core</artifactId>
@@ -178,34 +165,6 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker.plugin.version}</version>
-                <executions>
-                    <!--执行 mvn package 时 自动 执行 mvn docker:build-->
-                    <!--<execution>-->
-                    <!--<id>build-image</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>build</goal>-->
-                    <!--</goals>-->
-                    <!--</execution>-->
-                </executions>
-                <configuration>
-                    <imageName>${project.artifactId}</imageName>
-                    <imageTags>${project.version}</imageTags>
-                    <dockerHost>${docker.host}</dockerHost>
-                    <dockerDirectory>.</dockerDirectory>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/com/yaoxiang/diagnosis/authority/AuthCheck.java

@@ -3,7 +3,7 @@ package com.yaoxiang.diagnosis.authority;
 import java.lang.annotation.*;
 
 /**
- * @author Created by yawn on 2017-11-24 15:44
+ * @author feick
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

src/main/java/com/yaoxiang/diagnosis/authority/AuthCheckAspect.java

@@ -19,7 +19,7 @@ import java.lang.reflect.Method;
 import java.util.Map;
 
 /**
- * @author Created by yawn on 2017-11-24 15:46
+ * @author Created by feick
  */
 @Aspect
 @Component
@@ -44,7 +44,7 @@ public class AuthCheckAspect {
         String role = authCheck.role();
         String authority = authCheck.authority();
         boolean access = authService.check(principal, role, authority);
-        logger.info("checking authority,class={},method={}, principal={},role={},authority={},access={},args={}",
+        logger.info("checking authority,class={},method={}, principal={},expected role={},authority={},access={},args={}",
                 joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(), principal, role, authority, access, joinPoint.getArgs());
         Object result;
         try {

src/main/java/com/yaoxiang/diagnosis/config/Swagger2Config.java

@@ -9,7 +9,7 @@ import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 /**
  * @AUTHOR: DaiFengWen
@@ -17,8 +17,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  * @DESCRIPTION:
  */
 @Configuration
-@EnableSwagger2
 //@Profile("dev")
+@EnableSwagger2WebMvc
 @ConditionalOnExpression("${swagger.enabled: true}")
 public class Swagger2Config {
 

src/main/java/com/yaoxiang/diagnosis/entity/Authority.java

@@ -13,7 +13,7 @@ public class Authority {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
-    @ApiModelProperty("权限类型 function business ")
+    @ApiModelProperty("权限类型 function business data")
     private String type;
     private String des;