From d4ae32d96edd9450f3f79739b6f9606da0bddd59 Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 25 Sep 2019 17:29:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=E5=B0=86openId=E8=BF=94=E5=9B=9E=E5=89=8D?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/EpdcRegisterResultDTO.java | 22 ++++++++++++++++ .../epdc/controller/ApiAppUserController.java | 5 ++-- .../esua/epdc/service/AppUserService.java | 5 ++-- .../epdc/service/impl/AppUserServiceImpl.java | 25 ++++++++++++++++--- 4 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcRegisterResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcRegisterResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcRegisterResultDTO.java new file mode 100644 index 000000000..029643390 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcRegisterResultDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 用户注册后返回前端的数据 + * + * @author work@yujt.net.cn + * @date 19/9/25 17:21 + */ +@Data +public class EpdcRegisterResultDTO implements Serializable { + + private static final long serialVersionUID = 3032347110979742552L; + + /** + * 微信openId + */ + private String openId; +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 2d93063ee..0fcfeadb4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -11,6 +11,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; +import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO; import com.elink.esua.epdc.service.AppUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,7 +39,7 @@ public class ApiAppUserController { * @date 2019/9/9 10:41 */ @PostMapping("user/mp/regist") - public Result mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) { + public Result mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return appUserService.mpUserRegist(formDto); } @@ -52,7 +53,7 @@ public class ApiAppUserController { * @date 2019/9/9 10:41 */ @PostMapping("user/ma/regist") - public Result maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) { + public Result maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return appUserService.maUserRegist(formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 5ab194522..00d71847d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -9,6 +9,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; +import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO; /** * @author yujintao @@ -25,7 +26,7 @@ public interface AppUserService { * @author yujintao * @date 2019/9/7 09:54 */ - Result mpUserRegist(EpdcUserRegistFormDTO formDto); + Result mpUserRegist(EpdcUserRegistFormDTO formDto); /** * 公众号用户登录，获取token @@ -89,5 +90,5 @@ public interface AppUserService { * @author yujintao * @date 2019/9/10 20:48 */ - Result maUserRegist(EpdcUserRegistFormDTO formDto); + Result maUserRegist(EpdcUserRegistFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index ef6e8cd49..e14993856 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -19,6 +19,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; +import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO; import com.elink.esua.epdc.enums.AppUserAuditStateEnum; import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum; import com.elink.esua.epdc.enums.AppUserRegisterWayEnum; @@ -187,7 +188,7 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result maUserRegist(EpdcUserRegistFormDTO formDto) { + public Result maUserRegist(EpdcUserRegistFormDTO formDto) { this.verifyUserRegisterData(formDto); @@ -197,12 +198,12 @@ public class AppUserServiceImpl implements AppUserService { HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); userDto.setLastLoginIp(IpUtils.getIpAddr(request)); - return userFeignClient.userRegist(userDto); + return getRegisterResult(userDto); } @Override - public Result mpUserRegist(EpdcUserRegistFormDTO formDto) { + public Result mpUserRegist(EpdcUserRegistFormDTO formDto) { this.verifyUserRegisterData(formDto); @@ -212,7 +213,23 @@ public class AppUserServiceImpl implements AppUserService { HttpServletRequest request = HttpContextUtils.getHttpServletRequest(); userDto.setLastLoginIp(IpUtils.getIpAddr(request)); - return userFeignClient.userRegist(userDto); + return getRegisterResult(userDto); + } + + /** + * 用户注册并组装返回数据 + * + * @param userDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2019/9/25 17:26 + */ + private Result getRegisterResult(UserDTO userDto) { + Result result = userFeignClient.userRegist(userDto); + EpdcRegisterResultDTO dto = new EpdcRegisterResultDTO(); + dto.setOpenId(userDto.getWxOpenId()); + result.setData(dto); + return result; } /**