From 581a72879416a33cef2ebc6538ad7a8e7afac399 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 8 Apr 2020 17:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E5=8E=BB?= =?UTF-8?q?=E9=99=A4token=E7=9A=84=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiRegisterServiceImpl.java | 25 ------------------- .../impl/ResiWarmheartedServiceImpl.java | 17 ------------- .../modules/feign/EpmetUserFeignClient.java | 2 +- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java index 1def10010d..7b48c66926 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java +++ b/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 init(TokenDto tokenDTO, ResiRegisterFormDTO 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.getVisitFrom())) { - return new Result().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().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName()); - }*/ if (!validateMobile(formDTO.getMobile())) { return new Result().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(); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java index 0448f99547..c9e4847fa6 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java +++ b/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 init(TokenDto tokenDTO, ResiWarmheartedFormDTO 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.getVisitFrom())) { - return new Result().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); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 30cb07eb4b..211ae18ba8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/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 { /**