促销员注册参数验证修改验证方式

pom.xml

@@ -25,6 +25,12 @@
             <groupId>com.wangxiaolu</groupId>
             <artifactId>wangxiaolu-promotion-common</artifactId>
             <version>0.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-cloud-gateway-server</artifactId>
+                    <groupId>org.springframework.cloud</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -216,6 +222,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+            <version>${spring-cloud-gateway.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/wangxiaolu/promotion/controller/wechat/WeChatUserCoreController.java

@@ -41,6 +41,7 @@ public class WeChatUserCoreController {
     @PostMapping("/temporary/enroll")
     public R enrollUserInfo(@RequestBody @Validated WxTemporaryEnrollVo wxTemporaryEnrollVo) {
         log.info("微信-促销员注册：{}", JSONObject.toJSONString(wxTemporaryEnrollVo));
+        wxTemporaryEnrollVo.validate();
         // 人员信息校验
         boolean isIden = DataUtils.idenCardPattern(wxTemporaryEnrollVo.getIdenNumber());
         boolean isPhone = DataUtils.phonePattern(wxTemporaryEnrollVo.getPhone());

src/main/java/com/wangxiaolu/promotion/pojo/user/vo/WxTemporaryEnrollVo.java

 package com.wangxiaolu.promotion.pojo.user.vo;
 
+import com.wangxiaolu.promotion.exception.ParamException;
+import com.wangxiaolu.promotion.result.basedata.RCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
 
@@ -20,44 +23,44 @@ public class WxTemporaryEnrollVo {
     /**
      * openId
      */
-    @NotBlank(message = "微信登录错误")
+//    @NotBlank(message = "微信登录错误")
     String openId;
 
 
     /**
      * 头像
      */
-    @NotBlank(message = "请上传头像")
+//    @NotBlank(message = "请上传头像")
     String avatarUrl;
 
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不可为空")
+//    @NotBlank(message = "姓名不可为空")
     String name;
 
     /**
      * 手机号
      */
-    @NotBlank(message = "手机号不可为空")
+//    @NotBlank(message = "手机号不可为空")
     String phone;
 
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不可为空")
+//    @NotBlank(message = "身份证号不可为空")
     String idenNumber;
 
     /**
      * 身份证正面照
      */
-    @NotBlank(message = "请上传身份证正面照")
+//    @NotBlank(message = "请上传身份证正面照")
     String idenFrontPhotoUrl;
 
     /**
      * 身份证反面照
      */
-    @NotBlank(message = "请上传身份证反面照")
+//    @NotBlank(message = "请上传身份证反面照")
     String idenReversePhotoUrl;
 
     /**
@@ -68,7 +71,6 @@ public class WxTemporaryEnrollVo {
     /**
      * 手机验证码
      */
-    @NotBlank(message = "验证码无效")
     String phoneCode;
 
 
@@ -77,4 +79,19 @@ public class WxTemporaryEnrollVo {
      */
     String chargerQcId;
 
+    public void validate() {
+        if (
+                StringUtils.isBlank(openId) ||
+                        StringUtils.isBlank(avatarUrl) ||
+                        StringUtils.isBlank(name) ||
+                        StringUtils.isBlank(phone) ||
+                        StringUtils.isBlank(phoneCode) ||
+                        StringUtils.isBlank(idenNumber) ||
+                        StringUtils.isBlank(openId) ||
+                        StringUtils.isBlank(idenFrontPhotoUrl)
+        ) {
+            throw new ParamException(RCode.ENROLL_PARAM_ERROR, null);
+        }
+    }
+
 }

src/main/java/com/wangxiaolu/promotion/pojo/user/vo/WxTemporaryLoginVo.java

@@ -17,9 +17,7 @@ import javax.validation.constraints.NotBlank;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class WxTemporaryLoginVo {
-    @NotBlank(message = "微信登录错误")
     String openId;
 
-    @NotBlank(message = "手机号不可为空")
     String phone;
 }

src/test/java/com/wangxiaolu/promotion/controller/wechat/WeChatUserCoreControllerTest.java

@@ -35,7 +35,7 @@ class WeChatUserCoreControllerTest {
                 .setPhoneCode("手机验证码")
                 ;
         System.out.println(JSONObject.toJSONString(vo));
-        weChatUserCoreController.enrollUserInfo(vo);
+//        weChatUserCoreController.enrollUserInfo(vo);
     }
 
     @Test