src/main/kotlin/top/fatweb/oxygen/api/config/DateFormatConfig.kt

@@ -6,7 +6,6 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer
 import org.springframework.boot.jackson.JsonComponent
 import org.springframework.context.annotation.Bean
-import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
@@ -41,11 +40,10 @@ class DateFormatConfig {
 
     @Bean
     fun jackson2ObjectMapperBuilder() = Jackson2ObjectMapperBuilderCustomizer {
-        val tz = timeZone
+        val dateFormat = SimpleDateFormat(dateFormat)
-        val df: DateFormat = SimpleDateFormat(dateFormat)
+        dateFormat.timeZone = timeZone
-        df.timeZone = tz
         it.failOnEmptyBeans(false).failOnUnknownProperties(false)
-            .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).dateFormat(df)
+            .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).dateFormat(dateFormat)
     }
 
     @Bean
@@ -55,5 +53,4 @@ class DateFormatConfig {
                 LocalDateTime::class.java, LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dateFormat))
             )
         }
-
 }

src/main/kotlin/top/fatweb/oxygen/api/config/FilterConfig.kt

@@ -14,11 +14,9 @@ import top.fatweb.oxygen.api.filter.ExceptionFilter
 @Configuration
 class FilterConfig {
     @Bean
-    fun exceptionFilterRegistrationBean(exceptionFilter: ExceptionFilter): FilterRegistrationBean<ExceptionFilter> {
+    fun exceptionFilterRegistrationBean(exceptionFilter: ExceptionFilter): FilterRegistrationBean<ExceptionFilter> =
-        val registrationBean = FilterRegistrationBean(exceptionFilter)
+        FilterRegistrationBean(exceptionFilter).apply {
-        registrationBean.setBeanName("exceptionFilter")
+            setBeanName("exceptionFilter")
-        registrationBean.order = -100
+            order = -100
-
+        }
-        return registrationBean
-    }
 }

src/main/kotlin/top/fatweb/oxygen/api/config/JacksonConfig.kt

@@ -16,13 +16,12 @@ import retrofit2.converter.jackson.JacksonConverterFactory
 @Configuration
 class JacksonConfig {
     @Bean
-    fun jacksonConverterFactory(): JacksonConverterFactory {
+    fun jacksonConverterFactory(): JacksonConverterFactory =
-        val mapper = JsonMapper.builder()
+        JacksonConverterFactory.create(
-            .findAndAddModules()
+            JsonMapper.builder()
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+                .findAndAddModules()
-            .serializationInclusion(JsonInclude.Include.NON_NULL)
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-            .build()
+                .serializationInclusion(JsonInclude.Include.NON_NULL)
-
+                .build()
-        return JacksonConverterFactory.create(mapper)
+        )
-    }
 }

src/main/kotlin/top/fatweb/oxygen/api/config/MybatisPlusConfig.kt

@@ -15,11 +15,9 @@ import org.springframework.context.annotation.Configuration
 @Configuration
 class MybatisPlusConfig {
     @Bean
-    fun mybatisPlusInterceptor(): MybatisPlusInterceptor {
+    fun mybatisPlusInterceptor(): MybatisPlusInterceptor =
-        val mybatisPlusInterceptor = MybatisPlusInterceptor()
+        MybatisPlusInterceptor().apply {
-        mybatisPlusInterceptor.addInnerInterceptor(OptimisticLockerInnerInterceptor())
+            addInnerInterceptor(OptimisticLockerInnerInterceptor())
-        mybatisPlusInterceptor.addInnerInterceptor(PaginationInnerInterceptor())
+            addInnerInterceptor(PaginationInnerInterceptor())
-
+        }
-        return mybatisPlusInterceptor
-    }
 }

src/main/kotlin/top/fatweb/oxygen/api/config/RedisConfig.kt

@@ -33,11 +33,11 @@ class RedisConfig {
         }
         val anyJackson2JsonRedisSerializer = Jackson2JsonRedisSerializer(objectMapper, Any::class.java)
 
-        // 使用StringRedisSerializer来序列化和反序列化redis的key值
+        // Use String Redis Serializer to serialize and deserialize redis key values
         redisTemplate.keySerializer = stringRedisSerializer
         redisTemplate.valueSerializer = anyJackson2JsonRedisSerializer
 
-        // Hash的key也采用StringRedisSerializer的序列化方式
+        // The Hash key also uses the String Redis Serializer serialization method.
         redisTemplate.hashKeySerializer = stringRedisSerializer
         redisTemplate.hashValueSerializer = anyJackson2JsonRedisSerializer
 

src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/impl/AvatarServiceImpl.kt

@@ -56,12 +56,12 @@ class AvatarServiceImpl : IAvatarService {
 
     override fun triangle(avatarBaseParam: AvatarBaseParam?): ByteArray {
         val avatar = (
-            if (avatarBaseParam == null || avatarBaseParam.colors.isNullOrEmpty())
+                if (avatarBaseParam == null || avatarBaseParam.colors.isNullOrEmpty())
-                TriangleAvatar.newAvatarBuilder()
+                    TriangleAvatar.newAvatarBuilder()
-            else TriangleAvatar.newAvatarBuilder(
+                else TriangleAvatar.newAvatarBuilder(
-                *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray()
+                    *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray()
-            )
+                )
-            ).apply {
+                ).apply {
                 avatarBaseParam?.size?.let(::size)
                 avatarBaseParam?.margin?.let(::margin)
                 avatarBaseParam?.padding?.let(::padding)
@@ -76,12 +76,12 @@ class AvatarServiceImpl : IAvatarService {
 
     override fun square(avatarBaseParam: AvatarBaseParam?): ByteArray {
         val avatar = (
-            if (avatarBaseParam == null || avatarBaseParam.colors.isNullOrEmpty())
+                if (avatarBaseParam == null || avatarBaseParam.colors.isNullOrEmpty())
-                SquareAvatar.newAvatarBuilder()
+                    SquareAvatar.newAvatarBuilder()
-            else SquareAvatar.newAvatarBuilder(
+                else SquareAvatar.newAvatarBuilder(
-                *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray()
+                    *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray()
-            )
+                )
-            ).apply {
+                ).apply {
                 avatarBaseParam?.size?.let(::size)
                 avatarBaseParam?.margin?.let(::margin)
                 avatarBaseParam?.padding?.let(::padding)

src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SettingsServiceImpl.kt

@@ -35,7 +35,7 @@ class SettingsServiceImpl : ISettingsService {
         ),
         retrieveUrl = SettingsOperator.getAppValue(
             BaseSettings::retrieveUrl,
-            "http://localhost/retrieve?code=\${retrieveCode}"
+            "http://localhost/forget?code=\${retrieveCode}"
         )
     )
 

src/main/kotlin/top/fatweb/oxygen/api/util/ApiResponseMappingHandlerMapping.kt

@@ -13,12 +13,8 @@ import java.lang.reflect.Method
  */
 class ApiResponseMappingHandlerMapping : RequestMappingHandlerMapping() {
 
-    private fun createCondition(clazz: Class<*>): RequestCondition<ApiVersionCondition>? {
+    private fun createCondition(clazz: Class<*>): RequestCondition<ApiVersionCondition>? =
-        val apiController = clazz.getAnnotation(ApiController::class.java)
+        clazz.getAnnotation(ApiController::class.java)?.version?.let { ApiVersionCondition(it) }
-        apiController ?: return null
-
-        return ApiVersionCondition(apiController.version)
-    }
 
     override fun getCustomMethodCondition(method: Method): RequestCondition<*>? = createCondition(method.javaClass)
 

src/main/kotlin/top/fatweb/oxygen/api/util/WebUtil.kt

@@ -20,8 +20,9 @@ object WebUtil {
      * @since 1.0.0
      * @see LoginUser
      */
-    fun getLoginUser(): LoginUser? = if (SecurityContextHolder.getContext().authentication.principal is String) null
+    fun getLoginUser(): LoginUser? =
-    else SecurityContextHolder.getContext().authentication.principal as LoginUser
+        if (SecurityContextHolder.getContext().authentication.principal is String) null
+        else SecurityContextHolder.getContext().authentication.principal as LoginUser
 
     /**
      * Get ID of the user currently calling api