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

Optimize code

Browse Source
This commit is contained in:
Fat Snake
2023-10-31 15:38:48 +08:00
parent 7b2ee34917
commit a8ba913ee2
32 changed files with 156 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/top/fatweb/api/util/JwtUtil.kt
View File

@@ -3,7 +3,7 @@ package top.fatweb.api.util
import com.auth0.jwt.JWT
import com.auth0.jwt.algorithms.Algorithm
import com.auth0.jwt.interfaces.DecodedJWT
import top.fatweb.api.constant.SecurityConstants
import top.fatweb.api.properties.SecurityProperties
import java.util.*
import java.util.concurrent.TimeUnit
import javax.crypto.spec.SecretKeySpec
@@ -17,7 +17,7 @@ object JwtUtil {
* @return 密钥
*/
private fun generalKey(): SecretKeySpec {
val encodeKey = Base64.getDecoder().decode(SecurityConstants.jwtKey)
val encodeKey = Base64.getDecoder().decode(SecurityProperties.jwtKey)
return SecretKeySpec(encodeKey, 0, encodeKey.size, "AES")
}
@@ -34,8 +34,8 @@ object JwtUtil {
*/
fun createJwt(
subject: String,
ttl: Long = SecurityConstants.jwtTtl,
timeUnit: TimeUnit = SecurityConstants.jwtTtlUnit,
ttl: Long = SecurityProperties.jwtTtl,
timeUnit: TimeUnit = SecurityProperties.jwtTtlUnit,
uuid: String = getUUID()
): String? {
val nowMillis = System.currentTimeMillis()
@@ -52,7 +52,7 @@ object JwtUtil {
val expMillis = nowMillis + unitTtl
val expDate = Date(expMillis)
return JWT.create().withJWTId(uuid).withSubject(subject).withIssuer(SecurityConstants.jwtIssuer)
return JWT.create().withJWTId(uuid).withSubject(subject).withIssuer(SecurityProperties.jwtIssuer)
.withIssuedAt(nowDate).withExpiresAt(expDate).sign(algorithm())
}

6
src/main/kotlin/top/fatweb/api/util/WebUtil.kt
View File

@@ -2,8 +2,8 @@ package top.fatweb.api.util
import jakarta.servlet.http.HttpServletRequest
import org.springframework.security.core.context.SecurityContextHolder
import top.fatweb.api.constant.SecurityConstants
import top.fatweb.api.entity.permission.LoginUser
import top.fatweb.api.properties.SecurityProperties
object WebUtil {
fun getLoginUser() = if (SecurityContextHolder.getContext().authentication.principal is String) null
@@ -13,7 +13,7 @@ object WebUtil {
fun getLoginUsername() = getLoginUser()?.user?.username
fun getToken(tokenWithPrefix: String) = tokenWithPrefix.removePrefix(SecurityConstants.tokenPrefix)
fun getToken(tokenWithPrefix: String) = tokenWithPrefix.removePrefix(SecurityProperties.tokenPrefix)
fun getToken(request: HttpServletRequest) = getToken(request.getHeader(SecurityConstants.headerString))
fun getToken(request: HttpServletRequest) = getToken(request.getHeader(SecurityProperties.headerString))
}