Optimize code

This commit is contained in:
2024-01-03 18:48:33 +08:00
parent af134f04e0
commit f3b63ce17d
5 changed files with 30 additions and 29 deletions

View File

@@ -14,13 +14,13 @@ import java.time.format.DateTimeFormatter
import java.util.*
/**
* Data format configuration
* Date format configuration
*
* @author FatttSnake, fatttsnake@gmail.com
* @since 1.0.0
*/
@JsonComponent
class DataFormatConfig {
class DateFormatConfig {
/**
* The format of the time in response when request APIs
*
@@ -28,7 +28,7 @@ class DataFormatConfig {
* @since 1.0.0
*/
@set:Value("\${spring.jackson.date-format}")
lateinit var dataFormat: String
lateinit var dateFormat: String
/**
* The timezone of the time in response when request APIs
@@ -43,7 +43,7 @@ class DataFormatConfig {
@Bean
fun jackson2ObjectMapperBuilder() = Jackson2ObjectMapperBuilderCustomizer { builder: Jackson2ObjectMapperBuilder ->
val tz = timeZone
val df: DateFormat = SimpleDateFormat(dataFormat)
val df: DateFormat = SimpleDateFormat(dateFormat)
df.timeZone = tz
builder.failOnEmptyBeans(false).failOnUnknownProperties(false)
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).dateFormat(df)
@@ -53,7 +53,7 @@ class DataFormatConfig {
fun jackson2ObjectMapperBuilderCustomizer() =
Jackson2ObjectMapperBuilderCustomizer { builder: Jackson2ObjectMapperBuilder ->
builder.serializerByType(
LocalDateTime::class.java, LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dataFormat))
LocalDateTime::class.java, LocalDateTimeSerializer(DateTimeFormatter.ofPattern(dateFormat))
)
}

View File

@@ -14,6 +14,7 @@ import org.springframework.web.HttpRequestMethodNotSupportedException
import org.springframework.web.bind.MethodArgumentNotValidException
import org.springframework.web.bind.annotation.ExceptionHandler
import org.springframework.web.bind.annotation.RestControllerAdvice
import org.springframework.web.servlet.resource.NoResourceFoundException
import top.fatweb.avatargenerator.AvatarException
import top.fatweb.oxygen.api.entity.common.ResponseCode
import top.fatweb.oxygen.api.entity.common.ResponseResult
@@ -42,7 +43,7 @@ class ExceptionHandler {
@ExceptionHandler(value = [Exception::class])
fun exceptionHandler(e: Exception): ResponseResult<*> {
return when (e) {
is HttpRequestMethodNotSupportedException -> {
is HttpRequestMethodNotSupportedException, is NoResourceFoundException -> {
logger.debug(e.localizedMessage, e)
ResponseResult.fail(ResponseCode.SYSTEM_REQUEST_ILLEGAL, e.localizedMessage, null)
}