7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

5.0

Browse Source
This commit is contained in:
六如
2024-12-26 09:37:50 +08:00
parent 054560ae64
commit 150379c5f9
44 changed files with 26 additions and 1482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/context/UserContext.java
View File

@@ -1,14 +1,14 @@
package com.gitee.sop.admin.common.context;
import com.auth0.jwt.interfaces.Claim;
import com.gitee.sop.admin.common.manager.UserCacheManager;
import com.gitee.sop.admin.common.user.User;
import com.gitee.sop.admin.common.config.Configs;
import com.gitee.sop.admin.common.enums.ConfigKeyEnum;
import com.gitee.sop.admin.common.exception.ErrorTokenException;
import com.gitee.sop.admin.common.exception.JwtErrorException;
import com.gitee.sop.admin.common.exception.JwtExpiredException;
import com.gitee.sop.admin.common.exception.LoginFailureException;
import com.gitee.sop.admin.common.manager.UserCacheManager;
import com.gitee.sop.admin.common.user.User;
import com.gitee.sop.admin.common.util.JwtUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.math.NumberUtils;
@@ -33,7 +33,11 @@ public class UserContext {
private static Supplier<String> tokenGetter = () -> {
HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) (RequestContextHolder.getRequestAttributes());
if (requestAttributes == null) {
return null;
}
HttpServletRequest request = requestAttributes.getRequest();
return getToken(request);
};
@@ -43,7 +47,8 @@ public class UserContext {
/**
* 获取当前登录用户id
* @return 返回id,没有返回null
*
* @return 返回id, 没有返回null
*/
public static Long getUserId() {
return Optional.ofNullable(getUser()).map(User::getUserId).orElse(null);
@@ -78,6 +83,9 @@ public class UserContext {
}
public static String getToken(HttpServletRequest request) {
if (request == null) {
return null;
}
String token = request.getHeader(HEADER_AUTHORIZATION);
if (StringUtils.hasText(token) && token.startsWith(JWT_PREFIX)) {
return token.substring(JWT_PREFIX.length());

1
sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/enums/ConfigKeyEnum.java
View File

@@ -10,7 +10,6 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
public enum ConfigKeyEnum {
PASSWORD_SALT("admin.password-salt", ""),
JWT_TIMEOUT_DAYS("admin.jwt-timeout-days", "365"),
JWT_SECRET("admin.jwt.secret", ""),
TORNA_SERVER_ADDR("admin.torna-server-addr", ""),

5
sop-admin/sop-admin-backend/admin-common/src/main/java/com/gitee/sop/admin/common/fill/AddByFill.java
View File

@@ -24,8 +24,11 @@ public class AddByFill extends BaseFill<Long> {
@Override
protected Object getFillValue(Long defaultValue) {
if (defaultValue != null) {
return defaultValue;
}
User user = UserContext.getUser();
return user != null ? user.getUserId() : defaultValue;
return user != null ? user.getUserId() : 0L;
}
@Override