From 52d9334daf76f9638a36dc8e1b51a6a43479b74a Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Sun, 5 Apr 2020 17:44:43 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-demo/epmet-demo-server/pom.xml | 6 ++++++ .../com/epmet/controller/DemoController.java | 4 ++++ .../java/com/epmet/service/DemoService.java | 8 ++++++++ .../epmet/service/impl/DemoServiceImpl.java | 19 +++++++++++++++++++ .../com/epmet/feign/GovOrgFeignClient.java | 4 ++-- ...ck.java => GovOrgFeignClientFallBack.java} | 2 +- 6 files changed, 40 insertions(+), 3 deletions(-) rename epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/{GovOrgFeignFallBack.java => GovOrgFeignClientFallBack.java} (93%) diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index f5069b05a8..f22330be65 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -72,6 +72,12 @@ epmet-user-server 2.0.0 + + com.epmet + epmet-message-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java index 0e6ecfe1bc..90b90b30e6 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java @@ -181,4 +181,8 @@ public class DemoController { return demoService.getSysUserInfoById(id); } + @GetMapping("sendSmsCaptcha/{mobile}") + public Result sendSmsCaptcha(@PathVariable("mobile") String mobile) { + return demoService.sendSmsCaptcha(mobile); + } } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java index 612f736267..716648e837 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java @@ -155,4 +155,12 @@ public interface DemoService extends BaseService { **/ Result getSysUserInfoById(Long id); + /** + * @return com.epmet.commons.tools.utils.Result + * @param mobile + * @Author yinzuomei + * @Description 测试发送验证码 + * @Date 2020/4/3 13:41 + **/ + Result sendSmsCaptcha(String mobile); } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java index 666bfb533b..f2237070f4 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java @@ -34,6 +34,7 @@ import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.entity.DemoEntity; import com.epmet.feign.AdminFeignClient; import com.epmet.feign.GovOrgFeignClient; +import com.epmet.feign.MessageFeignClient; import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.DemoRedis; import com.epmet.service.DemoService; @@ -65,6 +66,9 @@ public class DemoServiceImpl extends BaseServiceImpl implem private GovOrgFeignClient govOrgFeignClient; @Autowired private AdminFeignClient adminFeignClient; + @Autowired + private MessageFeignClient messageFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -168,4 +172,19 @@ public class DemoServiceImpl extends BaseServiceImpl implem public Result getSysUserInfoById(Long id) { return adminFeignClient.getById(id); } + + /** + * @param mobile + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 测试发送验证码 + * @Date 2020/4/3 13:41 + **/ + @Override + public Result sendSmsCaptcha(String mobile) { + if(StringUtils.isBlank(mobile)){ + return new Result().error("手机号不能为空"); + } + return messageFeignClient.sendSmsCaptcha(mobile); + } } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index cf5dc8344a..9295571e93 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -5,7 +5,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.ListCustomerGridFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; -import com.epmet.feign.fallback.GovOrgFeignFallBack; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,7 +20,7 @@ import java.util.List; * @Author wangc * @date 2020.03.17 14:29 */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignFallBack.class) +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) public interface GovOrgFeignClient { /** diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java similarity index 93% rename from epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java rename to epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index f616ede85c..f2370b8c32 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignFallBack.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -18,7 +18,7 @@ import java.util.List; * @date 2020.03.17 14:29 */ @Component -public class GovOrgFeignFallBack implements GovOrgFeignClient { +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { /** * 根据地区编码获取附近网格数据