From 944afa5cb99b7d0ea3d60a8953bf7224516a9b99 Mon Sep 17 00:00:00 2001
From: handaolin <handaolin0325@gmail.com>
Date: Mon, 8 Jun 2020 22:23:41 +0800
Subject: [PATCH] auth0.3.19

---
 epmet-auth/deploy/docker-compose-dev.yml              |  2 +-
 epmet-auth/pom.xml                                    |  2 +-
 .../java/com/epmet/controller/GovLoginController.java |  4 ++--
 .../java/com/epmet/dto/form/SendSmsCodeFormDTO.java   | 11 +++++++++--
 .../java/com/epmet/dto/form/StaffOrgsFormDTO.java     | 11 +++++++++--
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml
index 1d8897b203..b0ffb56cab 100644
--- a/epmet-auth/deploy/docker-compose-dev.yml
+++ b/epmet-auth/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.18
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.19
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 30baa8434b..7624f2089f 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.18</version>
+    <version>0.3.19</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
index 477195041b..61386ac6c9 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java
@@ -53,7 +53,7 @@ public class GovLoginController {
      **/
     @PostMapping(value = "/loginwxmp/sendsmscode")
     public Result sendSmsCode(@RequestBody SendSmsCodeFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,SendSmsCodeFormDTO.AddUserShowGroup.class);
         govLoginService.sendSmsCode(formDTO);
         return new Result();
     }
@@ -67,7 +67,7 @@ public class GovLoginController {
      **/
     @PostMapping(value = "/loginwxmp/getmyorg")
     public Result<List<StaffOrgsResultDTO>> getmyorg(@RequestBody StaffOrgsFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO,StaffOrgsFormDTO.AddUserShowGroup.class);
         List<StaffOrgsResultDTO> staffOrgs=govLoginService.getMyOrg(formDTO);
         return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
     }
diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java
index 8d82624aee..fe21b303d4 100644
--- a/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/SendSmsCodeFormDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -13,7 +14,13 @@ import java.io.Serializable;
 @Data
 public class SendSmsCodeFormDTO implements Serializable {
     private static final long serialVersionUID = -1852541457359282018L;
-
-    @NotBlank(message = "手机号不能为空")
+    /**
+     * 添加用户操作的用户可见异常分组
+     * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
+     * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
+     */
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+    @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
     private String mobile;
 }
diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java
index e36c100809..e2f32fd286 100644
--- a/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsFormDTO.java
@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -13,11 +14,17 @@ import java.io.Serializable;
 @Data
 public class StaffOrgsFormDTO implements Serializable {
     private static final long serialVersionUID = 4193133227120225342L;
-
+    /**
+     * 添加用户操作的用户可见异常分组
+     * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
+     * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
+     */
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
     /**
      * 手机号
      */
-    @NotBlank(message = "手机号不能为空")
+    @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class})
     private String mobile;
 
     /**