接口入参去除token的非空判断

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@@ -35,14 +35,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
      **/
     @Override
     public Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO) {
-        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
-        }
-        /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
-                || StringUtils.isBlank(formDTO.getGridId())
-                || StringUtils.isBlank(formDTO.getVisitFrom())) {
-            return new Result<ResiRegisterResultDTO>().error(ModuleErrorCode.PARTICIPATION_EXCEPTION);
-        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.init(formDTO);
     }
@@ -54,14 +46,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
      **/
     @Override
     public Result submit(TokenDto tokenDTO, ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) {
-        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result().error(ModuleConstant.USER_NOT_NULL);
-        }
-        /*if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId())
-                || StringUtils.isBlank(resiInfoSubmitFormDTO.getGridId())
-                || StringUtils.isBlank(resiInfoSubmitFormDTO.getResiVisitId())) {
-            return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
-        }*/
         UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo();
         userResiInfoDTO.setUserId(tokenDTO.getUserId());
         userResiInfoDTO.setApp(tokenDTO.getApp());
@@ -78,14 +62,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
      **/
     @Override
     public Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO) {
-        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result().error(ModuleConstant.USER_NOT_NULL);
-        }
-        /*if (null == formDTO || StringUtils.isBlank(formDTO.getMobile())
-                || StringUtils.isBlank(formDTO.getResiVisitId())
-                || !validateMobile(formDTO.getMobile())) {
-            return new Result<ResiRegisterResultDTO>().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
-        }*/
         if (!validateMobile(formDTO.getMobile())) {
             return new Result<ResiRegisterResultDTO>().error(ModuleErrorCode.MOBILE_EXCEPTION);
         }
@@ -101,7 +77,6 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
      * @Author sun
      */
     private static boolean validateMobile(String mobile) {
-        //Pattern pattern = Pattern.compile("^[1]\\d{10}$");
         Pattern pattern = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$");
         return pattern.matcher(mobile).matches();
     }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java

@@ -31,14 +31,6 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
      **/
     @Override
     public Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO) {
-        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
-        }
-       /* if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
-                || StringUtils.isBlank(formDTO.getGridId())
-                || StringUtils.isBlank(formDTO.getVisitFrom())) {
-            return new Result<ResiWarmheartedResultDTO>().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.init(formDTO);
     }
@@ -50,15 +42,6 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
      **/
     @Override
     public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) {
-        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result().error(ModuleConstant.USER_NOT_NULL);
-        }
-        /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
-                || StringUtils.isBlank(formDTO.getGridId())
-                || StringUtils.isBlank(formDTO.getResiWarmVisitId())
-                || StringUtils.isBlank(formDTO.getReason())) {
-            return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.submit(formDTO);
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @dscription
  * @date 2020/3/30 14:51
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url="http://localhost:8087")
 public interface EpmetUserFeignClient {
 
 	/**