diff --git a/src/main/kotlin/top/fatweb/oxygen/api/config/DateFormatConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/DateFormatConfig.kt index 2e908a8..a2ff193 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/config/DateFormatConfig.kt +++ b/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 df: DateFormat = SimpleDateFormat(dateFormat) - df.timeZone = tz + val dateFormat = SimpleDateFormat(dateFormat) + dateFormat.timeZone = timeZone 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)) ) } - } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/oxygen/api/config/FilterConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/FilterConfig.kt index 7b1883b..54d659e 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/config/FilterConfig.kt +++ b/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 { - val registrationBean = FilterRegistrationBean(exceptionFilter) - registrationBean.setBeanName("exceptionFilter") - registrationBean.order = -100 - - return registrationBean - } + fun exceptionFilterRegistrationBean(exceptionFilter: ExceptionFilter): FilterRegistrationBean = + FilterRegistrationBean(exceptionFilter).apply { + setBeanName("exceptionFilter") + order = -100 + } } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/oxygen/api/config/JacksonConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/JacksonConfig.kt index b3518e0..795435d 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/config/JacksonConfig.kt +++ b/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 { - val mapper = JsonMapper.builder() - .findAndAddModules() - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .serializationInclusion(JsonInclude.Include.NON_NULL) - .build() - - return JacksonConverterFactory.create(mapper) - } + fun jacksonConverterFactory(): JacksonConverterFactory = + JacksonConverterFactory.create( + JsonMapper.builder() + .findAndAddModules() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .serializationInclusion(JsonInclude.Include.NON_NULL) + .build() + ) } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/oxygen/api/config/MybatisPlusConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/MybatisPlusConfig.kt index 9d36fe0..0d163bd 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/config/MybatisPlusConfig.kt +++ b/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 { - val mybatisPlusInterceptor = MybatisPlusInterceptor() - mybatisPlusInterceptor.addInnerInterceptor(OptimisticLockerInnerInterceptor()) - mybatisPlusInterceptor.addInnerInterceptor(PaginationInnerInterceptor()) - - return mybatisPlusInterceptor - } + fun mybatisPlusInterceptor(): MybatisPlusInterceptor = + MybatisPlusInterceptor().apply { + addInnerInterceptor(OptimisticLockerInnerInterceptor()) + addInnerInterceptor(PaginationInnerInterceptor()) + } } \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/oxygen/api/config/RedisConfig.kt b/src/main/kotlin/top/fatweb/oxygen/api/config/RedisConfig.kt index b22b12f..a28eacb 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/config/RedisConfig.kt +++ b/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 diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/impl/AvatarServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/impl/AvatarServiceImpl.kt index 630d46b..ddb2de5 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/api/v1/impl/AvatarServiceImpl.kt +++ b/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()) - TriangleAvatar.newAvatarBuilder() - else TriangleAvatar.newAvatarBuilder( - *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray() - ) - ).apply { + if (avatarBaseParam == null || avatarBaseParam.colors.isNullOrEmpty()) + TriangleAvatar.newAvatarBuilder() + else TriangleAvatar.newAvatarBuilder( + *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray() + ) + ).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()) - SquareAvatar.newAvatarBuilder() - else SquareAvatar.newAvatarBuilder( - *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray() - ) - ).apply { + if (avatarBaseParam == null || avatarBaseParam.colors.isNullOrEmpty()) + SquareAvatar.newAvatarBuilder() + else SquareAvatar.newAvatarBuilder( + *avatarBaseParam.colors!!.map(::decodeColor).toTypedArray() + ) + ).apply { avatarBaseParam?.size?.let(::size) avatarBaseParam?.margin?.let(::margin) avatarBaseParam?.padding?.let(::padding) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SettingsServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SettingsServiceImpl.kt index 556cc2a..46b02d0 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SettingsServiceImpl.kt +++ b/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}" ) ) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/util/ApiResponseMappingHandlerMapping.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/ApiResponseMappingHandlerMapping.kt index 7d10d7e..62afabf 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/util/ApiResponseMappingHandlerMapping.kt +++ b/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? { - val apiController = clazz.getAnnotation(ApiController::class.java) - apiController ?: return null - - return ApiVersionCondition(apiController.version) - } + private fun createCondition(clazz: Class<*>): RequestCondition? = + clazz.getAnnotation(ApiController::class.java)?.version?.let { ApiVersionCondition(it) } override fun getCustomMethodCondition(method: Method): RequestCondition<*>? = createCondition(method.javaClass) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/util/WebUtil.kt b/src/main/kotlin/top/fatweb/oxygen/api/util/WebUtil.kt index 6e3ad46..103e536 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/util/WebUtil.kt +++ b/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 - else SecurityContextHolder.getContext().authentication.principal as LoginUser + fun getLoginUser(): LoginUser? = + if (SecurityContextHolder.getContext().authentication.principal is String) null + else SecurityContextHolder.getContext().authentication.principal as LoginUser /** * Get ID of the user currently calling api