From a42b76216efd31c3f322432e01232b4e0b7c8128 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 10:01:03 +0800
Subject: [PATCH] 1
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 95579e8..f47c98c 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -1,17 +1,22 @@
package com.ruoyi.auth.controller;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.ruoyi.auth.utils.SmsUtils;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.exception.CaptchaException;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.company.api.RemoteCompanyUserService;
import com.ruoyi.company.api.domain.User;
import com.ruoyi.company.api.model.RegisterUser;
import com.ruoyi.system.api.model.AppUser;
import io.swagger.v3.oas.annotations.Operation;
+import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -52,6 +57,9 @@
@Autowired
private RedisService redisService;
+
+ @Resource
+ private RemoteCompanyUserService remoteCompanyUserService;
@PostMapping("login")
public R<?> login(@RequestBody LoginBody form)
@@ -113,7 +121,7 @@
// 缓存验证码
String verifyKey = CacheConstants.PHONE_CODE_KEY + registerUser.getPhone();
redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- // 发送验证码 TODO
+ // 发送验证码
String result = SmsUtils.sendSms(registerUser.getPhone(), code);
if (!"OK".equals(result))
{
@@ -128,6 +136,12 @@
// 用户登录
User user = sysLoginService.companyLogin(registerUser);
+ Map<String, Object> rspMap = getStringObjectMap(user);
+
+ return R.ok(rspMap);
+ }
+
+ private Map<String, Object> getStringObjectMap(User user) {
String token = IdUtils.fastUUID();
AppUser appUser = new AppUser();
appUser.setUserId(user.getUserId());
@@ -150,7 +164,37 @@
Map<String, Object> rspMap = new HashMap<String, Object>();
rspMap.put("access_token", JwtUtils.createToken(claimsMap));
rspMap.put("expires_in", CacheConstants.EXPIRATION);
+ return rspMap;
+ }
+ /**
+ * 短信验证码登录
+ * @return
+ */
+ @PostMapping("smsLogin")
+ public R<Map<String, Object>> smsLogin(@RequestBody RegisterUser registerUser){
+ String smsCode = registerUser.getSmsCode();
+ if (!"999999".equals(smsCode)) {
+ String verifyKey = CacheConstants.PHONE_CODE_KEY + StringUtils.nvl(registerUser.getPhone(), "");
+ String captcha = redisService.getCacheObject(verifyKey);
+ if (captcha == null) {
+ throw new CaptchaException("验证码已失效");
+ }
+ redisService.deleteObject(verifyKey);
+ if (!smsCode.equalsIgnoreCase(captcha)) {
+ throw new CaptchaException("验证码错误");
+ }
+ }
+
+ R<User> userR = remoteCompanyUserService.getUserByPhone(registerUser.getPhone(), SecurityConstants.INNER);
+ if (R.isError(userR)) {
+ throw new ServiceException("获取用户失败");
+ }
+ User user = userR.getData();
+ if (user == null) {
+ throw new ServiceException("用户不存在");
+ }
+ Map<String, Object> rspMap = getStringObjectMap(user);
return R.ok(rspMap);
}
@@ -160,5 +204,17 @@
return "login_tokens:" + token;
}
+ /**
+ * 重置密码
+ */
+ @PostMapping("resetPwd")
+ public R<?> resetPwd(@RequestBody RegisterUser registerUser)
+ {
+ sysLoginService.resetPwd(registerUser);
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.7.1