diff --git a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java index b27d4e2..fe14434 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java +++ b/wfc-auth/src/main/java/org/wfc/auth/controller/TokenController.java @@ -117,8 +117,7 @@ public class TokenController { @PostMapping("checkRepeat") public R checkRepeat(@RequestBody RegisterBody form) { if ("u".equals(form.getAuthType())) { - uLoginService.checkRepeat(form); - return R.ok(); + return R.ok(uLoginService.checkRepeat(form)); } if ("sys".equals(form.getAuthType())) { } diff --git a/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java index 7899642..a3d0d89 100644 --- a/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java +++ b/wfc-auth/src/main/java/org/wfc/auth/service/ULoginService.java @@ -160,19 +160,17 @@ public class ULoginService { /** * 检查重复 */ - public void checkRepeat(RegisterBody registerBody) { + public boolean checkRepeat(RegisterBody registerBody) { UUser user = new UUser(); user.setUserName(registerBody.getUsername()); user.setPhonenumber(registerBody.getPhonenumber()); user.setEmail(registerBody.getEmail()); R result = remoteUserService.checkRepeat(user, SecurityConstants.INNER ); + if (R.FAIL == result.getCode()) { - throw new ServiceException(result.getMsg()); - } - Boolean isRepeat = result.getData(); - if (isRepeat) { - throw new ServiceException("auth.user.registered"); + return true; } + return result.getData(); } }