FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Refactor:1; Fix:2; Feat:1 #15

Merged
FatttSnake merged 4 commits from FatttSnake into dev 2024-03-18 17:31:26 +08:00
Conversation 0 Commits 4 Files Changed 44 +5 -5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09f800c16b - Show all commits

2
src/main/kotlin/top/fatweb/oxygen/api/filter/JwtAuthenticationTokenFilter.kt
View File

@@ -38,7 +38,7 @@ class JwtAuthenticationTokenFilter(private val redisUtil: RedisUtil) : OncePerRe
val token = WebUtil.getToken(tokenWithPrefix) val token = WebUtil.getToken(tokenWithPrefix)
JwtUtil.parseJwt(token) JwtUtil.parseJwt(token)
val redisKeyPattern = "${SecurityProperties.jwtIssuer}_login_*:" + token val redisKeyPattern = "${SecurityProperties.jwtIssuer}_login_*:${token}"
val redisKeys = redisUtil.keys(redisKeyPattern) val redisKeys = redisUtil.keys(redisKeyPattern)
if (redisKeys.isEmpty()) { if (redisKeys.isEmpty()) {
throw TokenHasExpiredException() throw TokenHasExpiredException()

8
src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/AuthenticationServiceImpl.kt
View File

@@ -264,19 +264,19 @@ class AuthenticationServiceImpl(
override fun logout(token: String): Boolean { override fun logout(token: String): Boolean {
val loginUser = WebUtil.getLoginUser() ?: throw TokenHasExpiredException() val loginUser = WebUtil.getLoginUser() ?: throw TokenHasExpiredException()
return redisUtil.delObject("${SecurityProperties.jwtIssuer}_login_${loginUser.user.id}:" + token) return redisUtil.delObject("${SecurityProperties.jwtIssuer}_login_${loginUser.user.id}:${token}")
} }
override fun renewToken(token: String): TokenVo { override fun renewToken(token: String): TokenVo {
val loginUser = WebUtil.getLoginUser() ?: throw TokenHasExpiredException() val loginUser = WebUtil.getLoginUser() ?: throw TokenHasExpiredException()
val oldRedisKey = "${SecurityProperties.jwtIssuer}_login_${loginUser.user.id}:" + token val oldRedisKey = "${SecurityProperties.jwtIssuer}_login_${loginUser.user.id}:${token}"
redisUtil.delObject(oldRedisKey) redisUtil.delObject(oldRedisKey)
val jwt = JwtUtil.createJwt(WebUtil.getLoginUserId().toString()) val jwt = JwtUtil.createJwt(WebUtil.getLoginUserId().toString())
jwt ?: throw RuntimeException("Login failed") jwt ?: throw RuntimeException("Login failed")
val redisKey = "${SecurityProperties.jwtIssuer}_login_${loginUser.user.id}:" + jwt val redisKey = "${SecurityProperties.jwtIssuer}_login_${loginUser.user.id}:${jwt}"
redisUtil.setObject( redisUtil.setObject(
redisKey, loginUser, SecurityProperties.redisTtl, SecurityProperties.redisTtlUnit redisKey, loginUser, SecurityProperties.redisTtl, SecurityProperties.redisTtlUnit
) )
@@ -390,7 +390,7 @@ class AuthenticationServiceImpl(
jwt ?: throw RuntimeException("Login failed") jwt ?: throw RuntimeException("Login failed")
val redisKey = "${SecurityProperties.jwtIssuer}_login_${userId}:" + jwt val redisKey = "${SecurityProperties.jwtIssuer}_login_${userId}:${jwt}"
redisUtil.setObject(redisKey, loginUser, SecurityProperties.redisTtl, SecurityProperties.redisTtlUnit) redisUtil.setObject(redisKey, loginUser, SecurityProperties.redisTtl, SecurityProperties.redisTtlUnit)
return LoginVo(jwt, loginUser.user.id, loginUser.user.currentLoginTime, loginUser.user.currentLoginIp) return LoginVo(jwt, loginUser.user.id, loginUser.user.currentLoginTime, loginUser.user.currentLoginIp)