From b051c20595c8563df49a50092a11468c8a99de46 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 20 三月 2025 14:20:58 +0800
Subject: [PATCH] # 优化
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index 8941f46..adc1257 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -88,10 +88,10 @@
return R.parse(BaseRes.PARAM);
}
if (!emailService.isValid(email)) {
- return R.error("Please enter a valid email address.");
+ return R.parse(BusinessRes.INVALID_EMAIL);
}
if (null != userService.getByEmail(email, null)) {
- return R.error("Email Already Exist");
+ return R.parse(BusinessRes.EMAIL_EXIT);
}
Long expire = redisService.getExpire(EmailType.REGISTER_VERIFY.toString(), email);
if (expire > (configProperties.getCodeTime() - 60)) {
@@ -138,7 +138,7 @@
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
- return R.ok().add(new LoginResult(accessToken, user, tenant.getName()));
+ return R.ok("Sign Up Success").add(new LoginResult(accessToken, user, tenant.getName()));
}
@GetMapping("/system/info")
@@ -184,6 +184,15 @@
user.setEmailVerified(null);
user.setTenantId(null);
user.setStatus(null);
+ if (!Cools.isEmpty(user.getEmail())) {
+ if (!emailService.isValid(user.getEmail())) {
+ return R.parse(BusinessRes.INVALID_EMAIL);
+ }
+ User one = userService.getByEmail(user.getEmail(), null);
+ if (null != one && !one.getId().equals(user.getId())) {
+ return R.parse(BusinessRes.EMAIL_EXIT);
+ }
+ }
if (userService.updateById(user)) {
return R.ok("Save Success").add(userService.getById(user.getId()));
}
--
Gitblit v1.9.1