From 9af56f878cc3e22d3bce6ab53d67f3753470a7ac Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 14 二月 2025 08:59:22 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 8 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 7149435..efef6cd 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
@@ -2,14 +2,20 @@
import com.vincent.rsf.common.enums.SystemModeType;
import com.vincent.rsf.common.utils.Utils;
+import com.vincent.rsf.framework.common.BaseRes;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+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;
import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.system.controller.param.LoginParam;
+import com.vincent.rsf.server.system.controller.param.RegisterParam;
+import com.vincent.rsf.server.system.controller.param.TenantInitParam;
import com.vincent.rsf.server.system.controller.param.UpdatePasswordParam;
import com.vincent.rsf.server.system.controller.result.LoginResult;
import com.vincent.rsf.server.system.controller.result.MenuVo;
@@ -18,16 +24,14 @@
import com.vincent.rsf.server.system.entity.Tenant;
import com.vincent.rsf.server.system.entity.User;
import com.vincent.rsf.server.system.entity.UserLogin;
+import com.vincent.rsf.server.system.enums.EmailType;
import com.vincent.rsf.server.system.enums.StatusType;
import com.vincent.rsf.server.system.service.RoleMenuService;
import com.vincent.rsf.server.system.service.TenantService;
import com.vincent.rsf.server.system.service.UserLoginService;
import com.vincent.rsf.server.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -54,12 +58,12 @@
private TenantService tenantService;
@Autowired
private EmailService emailService;
+ @Autowired
+ private RedisService redisService;
@PostMapping("/login")
public R login(@RequestBody LoginParam param, HttpServletRequest request) {
// System.out.println(userService.encodePassword("123456"));
- emailService.sendEmail("t1341870251@gmail.com", "Email Verification Code", Cools.add("code", "666"));
-
String username = param.getUsername();
Long tenantId = param.getTenantId();
User user = userService.getByUsername(username, tenantId);
@@ -77,6 +81,60 @@
userLoginService.saveAsync(user.getId(), accessToken, UserLogin.TYPE_LOGIN, tenantId, null, request);
Tenant tenant = tenantService.getById(user.getTenantId());
return R.ok("Sign In Success").add(new LoginResult(accessToken, user, tenant.getName()));
+ }
+
+ @GetMapping("/email/code")
+ public R emailCode(@RequestParam(value = "email", required = false) String email) {
+ if (Cools.isEmpty(email)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (!emailService.isValid(email)) {
+ return R.error("Please enter a valid email address.");
+ }
+ if (null != userService.getByEmail(email, null)) {
+ return R.error("Email Already Exist");
+ }
+ Long expire = redisService.getExpire(EmailType.REGISTER_VERIFY.toString(), email);
+ if (expire > (configProperties.getCodeTime() - 60)) {
+ return R.error("Please don't request code too frequently.");
+ }
+ String code = Utils.randomNumbers(configProperties.getCodeLength());
+ if (emailService.sendEmail(email, EmailType.REGISTER_VERIFY, Cools.add("code", code))) {
+ redisService.setValue(EmailType.REGISTER_VERIFY.toString(), email, code, configProperties.getCodeTime());
+ }
+ return R.ok();
+ }
+
+ @OperationLog("Register")
+ @PostMapping("/register")
+ public R register(@RequestBody RegisterParam param, HttpServletRequest request) {
+ if (Cools.isEmpty(param.getUsername(), param.getPassword(), param.getEmail(), param.getCode())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ // verify code
+ 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.");
+ }
+ }
+
+ // register
+ TenantInitParam initParam = new TenantInitParam();
+ initParam.setEmail(param.getEmail());
+ initParam.setUsername(param.getUsername());
+ initParam.setPassword(param.getPassword());
+ initParam.setName(param.getUsername());
+ initParam.setFlag(param.getUsername());
+ if (!tenantService.initTenant(initParam)) {
+ throw new CoolException("Failed to register");
+ }
+
+ redisService.delete(EmailType.REGISTER_VERIFY.toString(), param.getEmail());
+ return R.ok();
}
@GetMapping("/system/info")
@@ -118,7 +176,6 @@
@PostMapping("/auth/user")
public R updateInfo(@RequestBody User user) {
user.setId(getLoginUserId());
- // 涓嶈兘淇敼鐨勫瓧娈�
user.setUsername(null);
user.setPassword(null);
user.setEmailVerified(null);
@@ -141,7 +198,7 @@
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);
--
Gitblit v1.9.1