zheng/blog-backEnd
1
0
Fork 0
Code Issues 5 Pull Requests 12 Actions Packages Projects Releases Wiki Activity

记录项目配置，修改配置项的获取方式

Browse Source 
- new class ` CommonEnvPostProcessor `
- remove ` @value `
- make JwtUtil's method static
This commit is contained in:
禾几海
2021-10-01 17:48:42 +08:00
parent 07e84ab875
commit 5a00e6c62f
17 changed files with 175 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
blog-user/src/main/java/cn/celess/user/filter/AuthenticationFilter.java
View File

@@ -28,8 +28,6 @@ public class AuthenticationFilter implements HandlerInterceptor {
private static final String ROLE_ADMIN = "admin";
private static final String ROLE_USER = "user";
@Autowired
JwtUtil jwtUtil;
@Autowired
RedisUtil redisUtil;
@Autowired
UserService userService;
@@ -41,9 +39,9 @@ public class AuthenticationFilter implements HandlerInterceptor {
int indexOf = path.indexOf("/", 1);
String rootPath = indexOf == -1 ? path : path.substring(0, indexOf);
String jwtStr = request.getHeader("Authorization");
if (jwtStr != null && !jwtStr.isEmpty() && !jwtUtil.isTokenExpired(jwtStr)) {
if (jwtStr != null && !jwtStr.isEmpty() && !JwtUtil.isTokenExpired(jwtStr)) {
// 已登录 记录当前email
request.getSession().setAttribute("email", jwtUtil.getUsernameFromToken(jwtStr));
request.getSession().setAttribute("email", JwtUtil.getUsernameFromToken(jwtStr));
}
// 不需要鉴权的路径
if (!USER_PREFIX.equalsIgnoreCase(rootPath) && !ADMIN_PREFIX.equalsIgnoreCase(rootPath)) {
@@ -53,11 +51,11 @@ public class AuthenticationFilter implements HandlerInterceptor {
if (jwtStr == null || jwtStr.isEmpty()) {
return writeResponse(ResponseEnum.HAVE_NOT_LOG_IN, response, request);
}
if (jwtUtil.isTokenExpired(jwtStr)) {
if (JwtUtil.isTokenExpired(jwtStr)) {
return writeResponse(ResponseEnum.LOGIN_EXPIRED, response, request);
}
String email = jwtUtil.getUsernameFromToken(jwtStr);
if (jwtUtil.isTokenExpired(jwtStr)) {
String email = JwtUtil.getUsernameFromToken(jwtStr);
if (JwtUtil.isTokenExpired(jwtStr)) {
// 登陆过期
return writeResponse(ResponseEnum.LOGIN_EXPIRED, response, request);
}
@@ -67,7 +65,7 @@ public class AuthenticationFilter implements HandlerInterceptor {
String role = userService.getUserRoleByEmail(email);
if (role.equals(ROLE_USER) || role.equals(ROLE_ADMIN)) {
// 更新token
String token = jwtUtil.updateTokenDate(jwtStr);
String token = JwtUtil.updateTokenDate(jwtStr);
response.setHeader("Authorization", token);
}
if (role.equals(ROLE_ADMIN)) {

6
blog-user/src/main/java/cn/celess/user/serviceimpl/UserServiceImpl.java
View File

@@ -55,8 +55,6 @@ public class UserServiceImpl implements UserService {
@Autowired
RedisUtil redisUtil;
@Autowired
JwtUtil jwtUtil;
@Autowired
RedisUserUtil redisUserUtil;
@Override
@@ -131,7 +129,7 @@ public class UserServiceImpl implements UserService {
redisUtil.delete(loginReq.getEmail() + "-passwordWrongTime");
// redis 标记
redisUserUtil.set(user, loginReq.getIsRememberMe());
token = jwtUtil.generateToken(user, loginReq.getIsRememberMe());
token = JwtUtil.generateToken(user, loginReq.getIsRememberMe());
} else {
logger.info("====> {} 进行权限认证 状态：登录失败 <====", loginReq.getEmail());
request.getSession().removeAttribute("code");
@@ -160,7 +158,7 @@ public class UserServiceImpl implements UserService {
if (token == null || token.isEmpty()) {
return "注销登录成功";
}
String email = jwtUtil.getUsernameFromToken(token);
String email = JwtUtil.getUsernameFromToken(token);
if (redisUtil.hasKey(email + "-login")) {
redisUtil.delete(email + "-login");
}

31
blog-user/src/main/java/cn/celess/user/util/JwtUtil.java
View File

@@ -3,10 +3,9 @@ package cn.celess.user.util;
import cn.celess.common.constant.ResponseEnum;
import cn.celess.common.entity.User;
import cn.celess.common.exception.BlogResponseException;
import cn.celess.common.util.EnvironmentUtil;
import io.jsonwebtoken.*;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.time.Instant;
import java.util.Date;
@@ -18,7 +17,6 @@ import java.util.Map;
* @Date: 2019/11/16 11:26
* @Description: JWT工具类
*/
@Component
@Log4j2
public class JwtUtil {
/**
@@ -32,36 +30,31 @@ public class JwtUtil {
private static final String CLAIM_KEY_USERNAME = "sub";
private static final String BEARER_PREFIX_UPPER = "Bearer";
private static final String BEARER_PREFIX_LOWER = "bearer";
/**
* JWT 秘钥需自行设置不可泄露
*/
@Value("${jwt.secret}")
private String SECRET;
public String generateToken(User user, boolean isRemember) {
public static String generateToken(User user, boolean isRemember) {
Map<String, Object> claims = new HashMap<>(16);
claims.put(CLAIM_KEY_USERNAME, user.getEmail());
return Jwts.builder()
.setClaims(claims)
.setExpiration(new Date(Instant.now().toEpochMilli() + (isRemember ? EXPIRATION_LONG_TIME : EXPIRATION_SHORT_TIME)))
.signWith(SignatureAlgorithm.HS512, SECRET)
.signWith(SignatureAlgorithm.HS512, EnvironmentUtil.getProperties("jwt.secret"))
.compact();
}
public String updateTokenDate(String token) {
Claims claims = Jwts.parser().setSigningKey(SECRET).parseClaimsJws(getJwtString(token)).getBody();
public static String updateTokenDate(String token) {
Claims claims = Jwts.parser().setSigningKey(EnvironmentUtil.getProperties("jwt.secret")).parseClaimsJws(getJwtString(token)).getBody();
return Jwts.builder()
.setClaims(claims)
.setExpiration(new Date(claims.getExpiration().getTime() + EXPIRATION_SHORT_TIME))
.signWith(SignatureAlgorithm.HS512, SECRET)
.signWith(SignatureAlgorithm.HS512, EnvironmentUtil.getProperties("jwt.secret"))
.compact();
}
/**
* 获取token是否过期
*/
public Boolean isTokenExpired(String token) {
public static Boolean isTokenExpired(String token) {
Date expiration = getExpirationDateFromToken(getJwtString(token));
return expiration == null || expiration.before(new Date());
}
@@ -69,7 +62,7 @@ public class JwtUtil {
/**
* 根据token获取username
*/
public String getUsernameFromToken(String token) {
public static String getUsernameFromToken(String token) {
Claims claims = getClaimsFromToken(getJwtString(token));
return claims == null ? null : claims.getSubject();
}
@@ -77,7 +70,7 @@ public class JwtUtil {
/**
* 获取token的过期时间
*/
public Date getExpirationDateFromToken(String token) {
public static Date getExpirationDateFromToken(String token) {
Claims claims = getClaimsFromToken(getJwtString(token));
return claims == null ? null : claims.getExpiration();
}
@@ -85,11 +78,11 @@ public class JwtUtil {
/**
* 解析JWT
*/
private Claims getClaimsFromToken(String token) {
private static Claims getClaimsFromToken(String token) {
Claims claims = null;
try {
claims = Jwts.parser()
.setSigningKey(SECRET)
.setSigningKey(EnvironmentUtil.getProperties("jwt.secret"))
.parseClaimsJws(getJwtString(token))
.getBody();
} catch (ExpiredJwtException e) {
@@ -106,7 +99,7 @@ public class JwtUtil {
return claims;
}
private String getJwtString(String token) {
private static String getJwtString(String token) {
if (token == null) return token;
return token.replaceFirst(BEARER_PREFIX_UPPER, "").replace(BEARER_PREFIX_LOWER, "");
}

4
blog-user/src/main/java/cn/celess/user/util/RedisUserUtil.java
View File

@@ -21,8 +21,6 @@ public class RedisUserUtil {
@Autowired
RedisUtil redisUtil;
@Autowired
JwtUtil jwtUtil;
@Autowired
HttpServletRequest request;
public User get() {
@@ -39,7 +37,7 @@ public class RedisUserUtil {
if (token == null || token.isEmpty()) {
return null;
}
String email = jwtUtil.getUsernameFromToken(token);
String email = JwtUtil.getUsernameFromToken(token);
return new ObjectMapper().readValue(redisUtil.get(email + "-login"), User.class);
}

36
blog-user/src/test/java/cn/celess/user/util/JwtUtilTest.java
View File

@@ -1,15 +1,14 @@
package cn.celess.user.util;
import cn.celess.common.entity.User;
import cn.celess.common.util.EnvironmentUtil;
import cn.celess.user.UserBaseTest;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.springframework.beans.factory.annotation.Value;
import javax.annotation.Resource;
import java.time.Instant;
import java.util.Date;
@@ -18,20 +17,15 @@ import static org.junit.Assert.*;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class JwtUtilTest extends UserBaseTest {
@Resource
JwtUtil jwtUtil;
@Value("${jwt.secret}")
private String secret;
@Test
public void testGenerateToken() {
User user = new User();
user.setEmail("a@celess.cn");
String s = jwtUtil.generateToken(user, false);
String s = JwtUtil.generateToken(user, false);
assertNotNull(s);
String str = null;
try {
str = jwtUtil.generateToken(null, false);
str = JwtUtil.generateToken(null, false);
} catch (Exception e) {
// ignore
}
@@ -43,38 +37,38 @@ public class JwtUtilTest extends UserBaseTest {
String s = Jwts.builder()
.setClaims(null)
.setExpiration(new Date(Instant.now().toEpochMilli() + 1000))
.signWith(SignatureAlgorithm.HS512, secret)
.signWith(SignatureAlgorithm.HS512, EnvironmentUtil.getProperties("jwt.secret"))
.compact();
Thread.sleep(1010);
assertTrue(jwtUtil.isTokenExpired(s));
assertFalse(jwtUtil.isTokenExpired(jwtUtil.generateToken(new User(), false)));
assertTrue(JwtUtil.isTokenExpired(s));
assertFalse(JwtUtil.isTokenExpired(JwtUtil.generateToken(new User(), false)));
}
@Test
public void testGetUsernameFromToken() {
User user = new User();
user.setEmail("a@celess.cn");
String s = jwtUtil.generateToken(user, false);
assertEquals(user.getEmail(), jwtUtil.getUsernameFromToken(s));
String s = JwtUtil.generateToken(user, false);
assertEquals(user.getEmail(), JwtUtil.getUsernameFromToken(s));
user.setEmail("example@celess.cn");
assertNotEquals(user.getEmail(), jwtUtil.getUsernameFromToken(s));
assertNotEquals(user.getEmail(), JwtUtil.getUsernameFromToken(s));
}
@Test
public void testGetExpirationDateFromToken() {
User user = new User();
user.setEmail("a@celess.cn");
String s = jwtUtil.generateToken(user, false);
assertNotNull(jwtUtil.getExpirationDateFromToken(s));
String s = JwtUtil.generateToken(user, false);
assertNotNull(JwtUtil.getExpirationDateFromToken(s));
}
@Test
public void updateTokenDate() {
User user = new User();
user.setEmail("a@celess.cn");
String s = jwtUtil.generateToken(user, false);
Date before = jwtUtil.getExpirationDateFromToken(s);
String s1 = jwtUtil.updateTokenDate(s);
assertTrue(jwtUtil.getExpirationDateFromToken(s1).getTime() - jwtUtil.getExpirationDateFromToken(s).getTime() > 0);
String s = JwtUtil.generateToken(user, false);
Date before = JwtUtil.getExpirationDateFromToken(s);
String s1 = JwtUtil.updateTokenDate(s);
assertTrue(JwtUtil.getExpirationDateFromToken(s1).getTime() - JwtUtil.getExpirationDateFromToken(s).getTime() > 0);
}
}