wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-02-01 22:41:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

完成序列号生成功能

Browse Source
This commit is contained in:
AlanScipio
2024-02-19 13:50:33 +08:00
parent 7a257eb264
commit a327ff26ba
46 changed files with 2163 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
View File

@@ -1,15 +1,13 @@
package com.ruoyi.common.security.utils;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.model.LoginUser;
import java.util.Objects;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* 权限获取工具类
@@ -54,13 +52,16 @@ public class SecurityUtils {
* 获取请求token
*/
public static String getToken() {
return getToken(Objects.requireNonNull(ServletUtils.getRequest()));
return getToken(ServletUtils.getRequest());
}
/**
* 根据request获取请求token
*/
public static String getToken(HttpServletRequest request) {
if (request == null) {
return null;
}
// 从header获取token标识
String token = request.getHeader(TokenConstants.AUTHENTICATION);
return replaceTokenPrefix(token);

9
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtilsExt.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.common.security.utils;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.context.SecurityContextHolder;
import com.ruoyi.common.core.exception.auth.LoginExpiredException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.system.api.model.LoginUser;
@@ -18,10 +17,7 @@ public class SecurityUtilsExt {
*/
public static Long getUserIdFromRedis() {
LoginUser loginUser = getLoginUserFromRedis();
if (loginUser == null) {
throw new LoginExpiredException("用户登录已过期，请重新登录");
}
return loginUser.getUserid();
return loginUser == null ? null : loginUser.getUserid();
}
public static String getUserIdStr() {
@@ -34,8 +30,7 @@ public class SecurityUtilsExt {
*/
public static String getUsernameFromRedis() {
LoginUser loginUser = getLoginUserFromRedis();
assert loginUser != null;
return loginUser.getUsername();
return loginUser == null ? "UNKNOWN" : loginUser.getUsername();
}
/**