From 9e4bbb16728826ed949647ebc453538a30d9c048 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 30 Jul 2020 16:10:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0-thirdOpenFeign=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/EpmetThirdFeignClient.java | 116 ------------------ .../EpmetThirdFeignClientFallback.java | 71 ----------- 2 files changed, 187 deletions(-) delete mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java delete mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java deleted file mode 100644 index ff62e37885..0000000000 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.epmet.feign; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserWechatDTO; -import com.epmet.dto.form.RegisterFormDTO; -import com.epmet.dto.form.SaveUserVisitedFormDTO; -import com.epmet.dto.form.WxLoginFormDTO; -import com.epmet.dto.result.*; -import com.epmet.feign.fallback.EpmetThirdFeignClientFallback; -import me.chanjar.weixin.mp.bean.result.WxMpUser; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 本服务对外开放的API,其他服务通过引用此client调用该服务 - * - * @Author zxc - * @CreateTime 2020/7/5 14:45 - * ,url="localhost:8110" - */ -@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdFeignClientFallback.class) - -public interface EpmetThirdFeignClient { - - /** - * @param wxMpUser - * @return - * @Author sun - * @Description 根据openId新增或更新用户信息 - **/ - @PostMapping(value = "third/pauser/saveuser", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result saveUser(@RequestBody WxMpUser wxMpUser); - - /** - * @param phone - * @return - * @Author sun - * @Description 根据手机号查询公众号用户基本信息，校验用户是否存在 - **/ - @PostMapping(value = "third/pauser/checkpauser/{phone}") - Result checkPaUser(@PathVariable("phone") String phone); - - /** - * @param visited - * @return - * @Author sun - * @Description 用户登陆，新增访问记录数据 - **/ - @PostMapping(value = "third/pauservisited/saveuservisited") - Result saveUserVisited(@RequestBody SaveUserVisitedFormDTO visited); - - /** - * @param customerId - * @return - * @Author sun - * @Description 根据客户Id查询各项注册信息 - **/ - @PostMapping(value = "third/pacustomer/getcustomeragencyuser/{customerId}") - Result getCustomerAgencyUser(@PathVariable("customerId") String customerId); - - /** - * @param customerId - * @return - * @Author sun - * @Description 修改客户数据状态为已完成初始化 - **/ - @PostMapping(value = "third/pacustomer/updatecustomer/{customerId}") - Result updateCustomer(@PathVariable("customerId") String customerId); - - /** - * @Description 获取【component_access_token】的定时任务 10min/次 - * @param - * @author zxc - */ - @PostMapping(value = "third/wechatthird/componentaccesstoken") - Result getComponentAccessTokenJob(); - - /** - * @Description 获取/刷新接口调用令牌 10min/次 - * @param - * @author zxc - */ - @PostMapping(value = "third/wechatthird/refreshtoken") - Result refreshAuthorizerAccessTokenJob(); - - /** - * @param formDTO - * @return - * @Author sun - * @Description 校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息 - **/ - @PostMapping(value = "third/customermp/resiandworklogin") - Result resiAndWorkLogin(@RequestBody WxLoginFormDTO formDTO); - - /** - * @param appId - * @return - * @Author sun - * @Description 根据appId查询公众号注册的客户信息 - **/ - @PostMapping(value = "third/customermp/getcustomermsg/{appId}") - Result getCustomerMsg(@PathVariable("appId") String appId); - - /** - * @param formDTO - * @return - * @Author sun - * @Description 用户登陆，新增访问记录数据 - **/ - @PostMapping(value = "third/pacustomer/register") - Result register(@RequestBody RegisterFormDTO formDTO); -} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java deleted file mode 100644 index d3d97faa1a..0000000000 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.epmet.feign.fallback; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserWechatDTO; -import com.epmet.dto.form.RegisterFormDTO; -import com.epmet.dto.form.SaveUserVisitedFormDTO; -import com.epmet.dto.form.WxLoginFormDTO; -import com.epmet.dto.result.*; -import com.epmet.feign.EpmetThirdFeignClient; -import me.chanjar.weixin.mp.bean.result.WxMpUser; -import org.springframework.stereotype.Component; - -/** - * @Author zxc - * @CreateTime 2020/7/5 14:46 - */ -@Component -public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient { - - @Override - public Result saveUser(WxMpUser wxMpUser) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveUser", wxMpUser); - } - - @Override - public Result checkPaUser(String phone) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "checkPaUser", phone); - } - - @Override - public Result saveUserVisited(SaveUserVisitedFormDTO visited) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "saveUserVisited", visited); - } - - @Override - public Result getCustomerAgencyUser(String customerId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getCustomerAgencyUser", customerId); - } - - @Override - public Result updateCustomer(String customerId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "updateCustomer", customerId); - } - - @Override - public Result getComponentAccessTokenJob() { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getComponentAccessTokenJob"); - } - - @Override - public Result refreshAuthorizerAccessTokenJob() { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "refreshAuthorizerAccessTokenJob"); - } - - @Override - public Result resiAndWorkLogin(WxLoginFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "resiAndWorkLogin", formDTO); - } - - @Override - public Result getCustomerMsg(String appId) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getCustomerMsg", appId); - } - - @Override - public Result register(RegisterFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "register", formDTO); - } -} From 7c90842153283dd30b114fb6c1d318b894214286 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 16:35:23 +0800 Subject: [PATCH 2/3] =?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/service/impl/PublicUserLoginServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 3c04b206be..2415e9de19 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -75,12 +75,15 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { dto.setSource(formDTO.getSource()); //2.将获取的用户基本信息初始化到数据库 - String url = ThirdApiConstant.THIRD_PAUSER_SAVEUSER; - Result result = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto)); + String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_SAVEUSER, JSON.toJSONString(dto)).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); if (!result.success()) { throw new RenException(PublicUserLoginConstant.SAVE_USER_EXCEPTION); } - SaveUserResultDTO resultDTO = JSONObject.parseObject(result.getData(), SaveUserResultDTO.class); + Object RegisterResult = result.getData(); + JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); + SaveUserResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, SaveUserResultDTO.class); //3.获取用户token String token = this.generateGovWxmpToken(resultDTO.getUserId()); From 0a5d0213cd22fb07b3e5ebadf855423daa95dd56 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 16:56:11 +0800 Subject: [PATCH 3/3] =?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 --- .../java/com/epmet/service/impl/GovLoginServiceImpl.java | 7 ++++--- .../com/epmet/service/impl/PublicUserLoginServiceImpl.java | 7 ------- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 3 --- .../service/impl/ComponentAccessTokenServiceImpl.java | 2 -- .../service/impl/RefreshAuthAccessTokenServiceImpl.java | 2 -- .../java/com/epmet/service/impl/CustomerServiceImpl.java | 7 ++++--- .../service/impl/StrangerAccessRecordServiceImpl.java | 3 --- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index d9134aabec..ee60b3c22f 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -21,7 +21,10 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.GovStaffRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.*; +import com.epmet.feign.EpmetMessageOpenFeignClient; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.redis.CaptchaRedis; @@ -64,8 +67,6 @@ public class GovLoginServiceImpl implements GovLoginService { private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Autowired private EpmetUserOpenFeignClient userOpenFeignClient; - @Autowired - private EpmetThirdFeignClient epmetThirdFeignClient; /** * @param formDTO diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 2415e9de19..73c3390b0d 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -7,10 +7,6 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; -import com.epmet.commons.tools.utils.CpUserDetailRedis; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.HttpClientManager; -import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.PhoneValidatorUtils; import com.epmet.constant.AuthHttpUrlConstant; import com.epmet.constant.PublicUserLoginConstant; @@ -22,7 +18,6 @@ import com.epmet.dto.PaUserWechatDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.EpmetMessageOpenFeignClient; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.redis.CaptchaRedis; @@ -53,8 +48,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { @Autowired private WxMpService wxMpService; @Autowired - private EpmetThirdFeignClient epmetThirdFeignClient; - @Autowired private JwtTokenUtils jwtTokenUtils; @Autowired private JwtTokenProperties jwtTokenProperties; diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 9b3c2fc0a7..9ac10784bc 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -16,7 +16,6 @@ import com.epmet.constant.AuthHttpUrlConstant; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.jwt.JwtTokenProperties; @@ -52,8 +51,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { @Autowired private CpUserDetailRedis cpUserDetailRedis; @Autowired - private EpmetThirdFeignClient epmetThirdFeignClient; - @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Autowired private GovOrgOpenFeignClient govOrgOpenFeignClient; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java index c5f112e056..651af393cf 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/ComponentAccessTokenServiceImpl.java @@ -6,10 +6,8 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.HttpUrlConstant; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.service.ComponentAccessTokenService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java index 8961d7db14..c66352b628 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/RefreshAuthAccessTokenServiceImpl.java @@ -6,9 +6,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.HttpUrlConstant; -import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.service.RefreshAuthAccessTokenService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 77a9f6bad9..9f2d59c47b 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -37,7 +37,10 @@ import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerEntity; -import com.epmet.feign.*; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.GovOrgFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; +import com.epmet.feign.OperCustomizeFeignClient; import com.epmet.redis.CustomerRedis; import com.epmet.service.CustomerService; import com.github.pagehelper.PageHelper; @@ -71,8 +74,6 @@ public class CustomerServiceImpl extends BaseServiceImpl