diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAfterRegisterResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppRegisterCallbackDTO.java similarity index 84% rename from esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAfterRegisterResultDTO.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppRegisterCallbackDTO.java index ef45fb701..e8b13774d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAfterRegisterResultDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppRegisterCallbackDTO.java @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 19/9/25 17:21 */ @Data -public class EpdcAfterRegisterResultDTO implements Serializable { +public class EpdcAppRegisterCallbackDTO implements Serializable { private static final long serialVersionUID = 3032347110979742552L; 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 72a8acc9f..80a09e9ed 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 @@ -12,7 +12,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppSaveWxFormIdFormDTO; import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.service.AppUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +55,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); } @@ -69,7 +69,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 3184465e9..ec7cc9d9f 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 @@ -10,7 +10,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppSaveWxFormIdFormDTO; import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; /** @@ -28,7 +28,7 @@ public interface AppUserService { * @author yujintao * @date 2019/9/7 09:54 */ - Result mpUserRegist(EpdcUserRegistFormDTO formDto); + Result mpUserRegist(EpdcUserRegistFormDTO formDto); /** * 公众号用户登录,获取token @@ -92,7 +92,7 @@ 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 4f1a8bf7e..84c67a8ef 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 @@ -21,7 +21,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppSaveWxFormIdFormDTO; import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO; +import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.enums.AppUserAuditStateEnum; import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum; @@ -206,7 +206,7 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result maUserRegist(EpdcUserRegistFormDTO formDto) { + public Result maUserRegist(EpdcUserRegistFormDTO formDto) { this.verifyUserRegisterData(formDto); @@ -221,7 +221,7 @@ public class AppUserServiceImpl implements AppUserService { @Override - public Result mpUserRegist(EpdcUserRegistFormDTO formDto) { + public Result mpUserRegist(EpdcUserRegistFormDTO formDto) { this.verifyUserRegisterData(formDto); @@ -238,13 +238,13 @@ public class AppUserServiceImpl implements AppUserService { * 用户注册并组装返回数据 * * @param userDto - * @return com.elink.esua.epdc.commons.tools.utils.Result + * @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) { + private Result getRegisterResult(UserDTO userDto) { Result result = userFeignClient.userRegist(userDto); - EpdcAfterRegisterResultDTO dto = new EpdcAfterRegisterResultDTO(); + EpdcAppRegisterCallbackDTO dto = new EpdcAppRegisterCallbackDTO(); dto.setOpenId(userDto.getWxOpenId()); result.setData(dto); return result;