Merge remote-tracking branch 'origin/dev/one' into dev/one

bi-service/pom.xml

@@ -139,7 +139,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
         <!-- mybatis-plus end -->
 
@@ -154,7 +153,6 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
         <dependency>

bi-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -24,6 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
+@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**

common/src/main/java/com/diagbot/enums/IsValidEnum.java

@@ -0,0 +1,49 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 是否有效
+ * @author: gaodm
+ * @time: 2018/9/13 17:11
+ */
+public enum IsValidEnum implements KeyedNamed {
+    IVALID(0, "无效"),
+    NOT_VALID(1, "有效");
+
+    @Setter
+    private int key;
+
+    @Setter
+    private String name;
+
+    IsValidEnum(int key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static IsValidEnum getEnum(int key) {
+        for (IsValidEnum item : IsValidEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(int key) {
+        IsValidEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

common/src/main/java/com/diagbot/util/RegexValidateUtil.java

@@ -72,7 +72,7 @@ public class RegexValidateUtil {
         System.out.println(checkPassWord("12345"));
         System.out.println(checkPassWord("12345678"));
         System.out.println(checkPassWord("AAAAAAAA"));
-        System.out.println(checkPassWord("1234567890abcdefghijk"));
+        System.out.println(checkPassWord("1234567890abcdefg"));
         System.out.println(checkPassWord("123456AA33q"));
     }
 }

config-server/src/main/resources/shared/application-dev.yml

@@ -61,4 +61,7 @@ spring:
 #    devtools:
 #      restart:
 #        enabled: true #热部署生效
-#        additional-paths: src/main/java #设置重启的目录，添加那个目录的文件需要restart（监听目录）
+#        additional-paths: src/main/java #设置重启的目录，添加那个目录的文件需要restart（监听目录）
+
+swagger:
+  enable: true

config-server/src/main/resources/shared/application-local.yml

@@ -62,3 +62,6 @@ spring:
 #      restart:
 #        enabled: true #热部署生效
 #        additional-paths: src/main/java #设置重启的目录，添加那个目录的文件需要restart（监听目录）
+
+swagger:
+  enable: true

diagbotman-service/pom.xml

@@ -139,7 +139,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
         <!-- mybatis-plus end -->
 
@@ -154,7 +153,6 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
         <dependency>

diagbotman-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -24,6 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
+@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**

feedback-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -24,6 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
+@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**

knowledge-service/pom.xml

@@ -139,7 +139,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
         <!-- mybatis-plus end -->
 
@@ -154,7 +153,6 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
         <dependency>

knowledge-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -24,6 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
+@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**

log-service/pom.xml

@@ -139,7 +139,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
         <!-- mybatis-plus end -->
 
@@ -154,7 +153,6 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
         <dependency>

log-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
 
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -24,6 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
+@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**

pom.xml

@@ -96,7 +96,7 @@
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.2</version>
             </dependency>
 
             <!-- springboot整合mybatis（核心就这一个） -->

uaa-service/pom.xml

@@ -91,7 +91,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
         <!-- mybatis-plus end -->
 
@@ -106,7 +105,6 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
     </dependencies>

user-service/pom.xml

@@ -139,7 +139,6 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
         </dependency>
         <!-- mybatis-plus end -->
 
@@ -154,7 +153,6 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis-spring-boot.version}</version>
         </dependency>
 
         <dependency>

user-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -13,6 +13,7 @@ import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,6 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
+@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**
@@ -50,8 +52,8 @@ public class SwaggerConfigurer {
                 .apis(RequestHandlerSelectors.basePackage("com.diagbot.web"))
                 .paths(PathSelectors.any())
                 .build().globalOperationParameters(parameter());
-                //.securitySchemes(newArrayList(oauth()))
-               // .securityContexts(newArrayList(securityContext()));
+        //.securitySchemes(newArrayList(oauth()))
+        // .securityContexts(newArrayList(securityContext()));
     }
 
     private ApiInfo apiInfo() {

user-service/src/main/java/com/diagbot/util/SmsCodeUtil.java

@@ -14,7 +14,7 @@ public final class SmsCodeUtil {
     private static final String AUTH_CODE = "0123456789";
 
     public static String getVerCode(){
-        return getVerCode(4);
+        return getVerCode(6);
     }
     public static String getVerCode(Integer size)
     {

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.util.Map;
 
 /**
@@ -43,7 +44,7 @@ public class UserController {
     @PostMapping("/registry")
     @SysLogger("registry")
     @Transactional
-    public RespDTO<User> createUser(@RequestBody UserSaveVO userSaveVO){
+    public RespDTO<User> createUser(@RequestBody @Valid UserSaveVO userSaveVO){
         User user = userFacade.createUser(userSaveVO);
         return RespDTO.onSuc(user);
     }