From 2b79f2033d7606eb9fb449af39ae3c41145edecd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 20 一月 2025 19:49:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 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 53e7f52..95579e8 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
@@ -2,10 +2,15 @@
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.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
+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.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -23,7 +28,12 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
+
+import static com.alibaba.nacos.api.common.Constants.ACCESS_TOKEN;
/**
* token 控制
@@ -91,6 +101,7 @@
return R.ok();
}
+
/**
* 发送短信验证码
*/
@@ -100,19 +111,54 @@
// 验证码生成
String code = String.valueOf(Math.random()).substring(2, 6);
// 缓存验证码
- String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + registerUser.getPhone();
+ String verifyKey = CacheConstants.PHONE_CODE_KEY + registerUser.getPhone();
redisService.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
// 发送验证码 TODO
-
- return R.ok(code);
+ String result = SmsUtils.sendSms(registerUser.getPhone(), code);
+ if (!"OK".equals(result))
+ {
+ return R.fail("验证码发送失败");
+ }
+ return R.ok();
}
@PostMapping("companyLogin")
- public R<?> companyLogin(@RequestBody RegisterUser registerUser)
+ public R<Map<String, Object>> companyLogin(@RequestBody RegisterUser registerUser)
{
// 用户登录
- LoginUser userInfo = sysLoginService.login(registerUser.getPhone(), registerUser.getSmsCode());
- // 获取登录token
- return R.ok(tokenService.createToken(userInfo));
+ User user = sysLoginService.companyLogin(registerUser);
+
+ String token = IdUtils.fastUUID();
+ AppUser appUser = new AppUser();
+ appUser.setUserId(user.getUserId());
+ appUser.setAccountName(appUser.getAccountName());
+ appUser.setPhone(appUser.getPhone());
+ appUser.setLoginTime(LocalDateTime.now());
+ appUser.setToken(token);
+
+ // 根据uuid将loginUser缓存
+ String userKey = getTokenKey(appUser.getToken());
+ redisService.setCacheObject(userKey, appUser, CacheConstants.EXPIRATION, TimeUnit.MINUTES);
+
+ // Jwt存储信息
+ Map<String, Object> claimsMap = new HashMap<String, Object>();
+ claimsMap.put(SecurityConstants.USER_KEY, token);
+ claimsMap.put(SecurityConstants.DETAILS_USER_ID, appUser.getUserId());
+ claimsMap.put(SecurityConstants.DETAILS_USERNAME, appUser.getAccountName());
+
+ // 接口返回信息
+ Map<String, Object> rspMap = new HashMap<String, Object>();
+ rspMap.put("access_token", JwtUtils.createToken(claimsMap));
+ rspMap.put("expires_in", CacheConstants.EXPIRATION);
+
+ return R.ok(rspMap);
}
+
+
+ private String getTokenKey(String token)
+ {
+ return "login_tokens:" + token;
+ }
+
+
}
--
Gitblit v1.7.1