From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 81 +++++++++++++++++++++++++---------------
1 files changed, 50 insertions(+), 31 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 f0239f8..32cf3b3 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
@@ -8,6 +8,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.config.ConfigProperties;
+import com.vincent.rsf.server.common.domain.BusinessRes;
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.service.EmailService;
import com.vincent.rsf.server.common.service.RedisService;
@@ -31,15 +32,15 @@
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;
/**
- * 璁よ瘉鎺у埗鍣�
- *
+ * Authority Controller
* Created by vincent on 1/30/2024
*/
@RestController
@@ -62,24 +63,26 @@
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
-// System.out.println(userService.encodePassword("123456"));
String username = param.getUsername();
- Long tenantId = param.getTenantId();
- User user = userService.getByUsername(username, tenantId);
+ User user = userService.getByUsername(username
+ , configProperties.getSystemMode()
+ .equals(SystemModeType.OFFLINE) ? param.getTenantId() : null
+ );
if (user == null) {
- return R.error("Username Does Not Exist");
+ return R.parse(BusinessRes.USERNAME_NOT_EXIST);
}
if (!user.getStatus().equals(StatusType.ENABLE.val)) {
- return R.error("Account Frozen");
+ return R.parse(BusinessRes.USERNAME_FROZEN);
}
if (!userService.comparePassword(user.getPassword(), param.getPassword())) {
- return R.error("Invalid Password");
+ return R.parse(BusinessRes.INVALID_PASSWORD);
}
String accessToken = JwtUtil.buildToken(new JwtSubject(username, user.getTenantId()),
configProperties.getTokenExpireTime(), configProperties.getTokenKey());
- userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
+ userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, user.getTenantId(), null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
- return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
+ user = userService.fillRoleIdsForResponse(user);
+ return R.ok("Sign In Success").add(buildPageRowsUtils.rowsMap(new LoginResult(accessToken, user, tenant.getName())));
}
@GetMapping("/email/code")
@@ -88,10 +91,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)) {
@@ -111,14 +114,15 @@
return R.parse(BaseRes.PARAM);
}
// verify code
- String cacheCode = redisService.getValue(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
- if (Cools.isEmpty(cacheCode)) {
- return R.error("The verification code has expired.");
+ if (!param.getCode().equals(configProperties.getSecurityCode())) {
+ String cacheCode = redisService.getValue(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
+ if (Cools.isEmpty(cacheCode)) {
+ return R.error("The verification code has expired.");
+ }
+ if (!cacheCode.equals(param.getCode())) {
+ return R.error("The verification code is incorrect.");
+ }
}
- if (!cacheCode.equals(param.getCode())) {
- return R.error("The verification code is incorrect.");
- }
-
// register
TenantInitParam initParam = new TenantInitParam();
initParam.setEmail(param.getEmail());
@@ -126,27 +130,32 @@
initParam.setPassword(param.getPassword());
initParam.setName(param.getUsername());
initParam.setFlag(param.getUsername());
- if (!tenantService.initTenant(initParam)) {
+ Long tenantId = tenantService.initTenant(initParam);
+ if (null == tenantId) {
throw new CoolException("Failed to register");
}
-
redisService.delete(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
- return R.ok();
+ // token
+ User user = userService.getByUsername(param.getUsername(), tenantId);
+ String accessToken = JwtUtil.buildToken(new JwtSubject(user.getUsername(), user.getTenantId()),
+ configProperties.getTokenExpireTime(), configProperties.getTokenKey());
+ userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
+ Tenant tenant = tenantService.getById(user.getTenantId());
+ return R.ok("Sign Up Success").add(buildPageRowsUtils.rowsMap(new LoginResult(accessToken, user, tenant.getName())));
}
@GetMapping("/system/info")
public R systemInfo() {
- SystemModeType systemMode = configProperties.getSystemMode();
SystemInfoVo infoVo = new SystemInfoVo();
infoVo.setName(configProperties.getSystemName());
infoVo.setVersion(configProperties.getSystemVersion());
- infoVo.setMode(systemMode.toString());
+ infoVo.setMode(configProperties.getSystemMode().toString());
return R.ok(infoVo);
}
@GetMapping("/tenant/list")
public R tenantList() {
- return R.ok().add(tenantService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(tenantService.list()));
}
@GetMapping("/auth/user")
@@ -166,7 +175,7 @@
&& !vo.getName().equals("menu.menu")
).collect(Collectors.toList());
}
- return R.ok().add(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren));
+ return R.ok().add(buildPageRowsUtils.rowsMap(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren)));
}
@OperationLog("Update UserInfo")
@@ -178,8 +187,17 @@
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()));
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(userService.getById(user.getId())));
}
return R.error("Save Fail");
}
@@ -188,14 +206,14 @@
@PostMapping("/auth/reset/password")
public R resetPassword(@RequestBody UpdatePasswordParam param) {
if (Cools.isEmpty(param.getOldPassword(), param.getNewPassword())) {
- return R.error("Parameters Cannot Be Empty");
+ return R.parse(BaseRes.PARAM);
}
Long userId = getLoginUserId();
if (userId == null) {
return R.error("Please Login First");
}
if (!userService.comparePassword(userService.getById(userId).getPassword(), param.getOldPassword())) {
- return R.parse("408-The Current Password Was Incorrect");
+ return R.parse(BusinessRes.INVALID_PASSWORD);
}
User user = new User();
user.setId(userId);
@@ -235,3 +253,4 @@
}
}
+
--
Gitblit v1.9.1