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 +3 -3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fe6333aeb - Show all commits

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

@@ -59,7 +59,7 @@ fun main(args: Array<String>) {
OxygenApiApplication::class.java.getResource("/application-config-template.yml")?.readText()?.let { OxygenApiApplication::class.java.getResource("/application-config-template.yml")?.readText()?.let {
File("data/application-config.example.yml").writeText( File("data/application-config.example.yml").writeText(
it.replace( it.replace(
"\$uuid\$", UUID.randomUUID().toString().replace("-", "") "\$uuid\$", UUID.randomUUID().toString()
) )
) )
} }

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

@@ -25,7 +25,7 @@ object JwtUtil {
* @since 1.0.0 * @since 1.0.0
*/ */
private fun generalKey(): SecretKeySpec { private fun generalKey(): SecretKeySpec {
val encodeKey = Base64.getDecoder().decode(SecurityProperties.jwtKey) val encodeKey = Base64.getEncoder().encode(SecurityProperties.jwtKey.toByteArray())
return SecretKeySpec(encodeKey, 0, encodeKey.size, "AES") return SecretKeySpec(encodeKey, 0, encodeKey.size, "AES")
} }

2
src/main/resources/application-config-template.yml
View File

@@ -11,7 +11,7 @@ app:
# token-prefix: "Bearer " # Token prefix # token-prefix: "Bearer " # Token prefix
# jwt-ttl: 2 # The life of token # jwt-ttl: 2 # The life of token
# jwt-ttl-unit: hours # Unit of life of token [nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days] # jwt-ttl-unit: hours # Unit of life of token [nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days]
jwt-key: $uuid$ # Key to generate token (Only numbers and letters allow) jwt-key: $uuid$ # Key to generate token
# jwt-issuer: Oxygen # Token issuer # jwt-issuer: Oxygen # Token issuer
# redis-ttl: 20 # The life of token in redis # redis-ttl: 20 # The life of token in redis
# redis-ttl-unit: minutes # Unit of life of token in redis [nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days] # redis-ttl-unit: minutes # Unit of life of token in redis [nanoseconds, microseconds, milliseconds, seconds, minutes, hours, days]