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

Optimize code

Browse Source
This commit is contained in:
Fat Snake
2023-12-14 18:28:59 +08:00
parent 9ede33e005
commit c2e5248aa0
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/kotlin/top/fatweb/api/entity/system/SysLog.kt
View File

@@ -1,9 +1,11 @@
package top.fatweb.api.entity.system package top.fatweb.api.entity.system
import com.baomidou.mybatisplus.annotation.EnumValue
import com.baomidou.mybatisplus.annotation.TableField import com.baomidou.mybatisplus.annotation.TableField
import com.baomidou.mybatisplus.annotation.TableId import com.baomidou.mybatisplus.annotation.TableId
import com.baomidou.mybatisplus.annotation.TableName import com.baomidou.mybatisplus.annotation.TableName
import com.fasterxml.jackson.annotation.JsonFormat import com.fasterxml.jackson.annotation.JsonFormat
import com.fasterxml.jackson.annotation.JsonValue
import java.io.Serializable import java.io.Serializable
import java.time.LocalDateTime import java.time.LocalDateTime
@@ -15,6 +17,18 @@ import java.time.LocalDateTime
*/ */
@TableName("t_sys_log") @TableName("t_sys_log")
class SysLog : Serializable { class SysLog : Serializable {
/**
* Log type enum
*
* @author FatttSnake, fatttsnake@gmail.com
* @since 1.0.0
*/
enum class LogType(@field:EnumValue @field:JsonValue val code: String) {
INFO("INFO"), ERROR("ERROR"), LOGIN("LOGIN"), LOGOUT("LOGOUT"), REGISTER("REGISTER"), STATISTIC("STATISTIC"), API(
"API"
)
}
/** /**
* ID * ID
* *
@@ -29,9 +43,10 @@ class SysLog : Serializable {
* *
* @author FatttSnake, fatttsnake@gmail.com * @author FatttSnake, fatttsnake@gmail.com
* @since 1.0.0 * @since 1.0.0
* @see LogType
*/ */
@TableField("log_type") @TableField("log_type")
var logType: String? = null var logType: LogType? = null
/** /**
* Operate user ID * Operate user ID

19
src/main/kotlin/top/fatweb/api/interceptor/SysLogInterceptor.kt
View File

@@ -2,6 +2,7 @@ package top.fatweb.api.interceptor
import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletRequest
import jakarta.servlet.http.HttpServletResponse import jakarta.servlet.http.HttpServletResponse
import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.core.MethodParameter import org.springframework.core.MethodParameter
import org.springframework.http.MediaType import org.springframework.http.MediaType
import org.springframework.http.converter.HttpMessageConverter import org.springframework.http.converter.HttpMessageConverter
@@ -32,7 +33,7 @@ import java.util.concurrent.Executor
*/ */
@ControllerAdvice @ControllerAdvice
class SysLogInterceptor( class SysLogInterceptor(
private val customThreadPoolTaskExecutor: Executor, private val sysLogService: ISysLogService @Qualifier("applicationTaskExecutor") private val customThreadPoolTaskExecutor: Executor, private val sysLogService: ISysLogService
) : HandlerInterceptor, ResponseBodyAdvice<Any> { ) : HandlerInterceptor, ResponseBodyAdvice<Any> {
private val sysLogThreadLocal = ThreadLocal<SysLog>() private val sysLogThreadLocal = ThreadLocal<SysLog>()
private val resultThreadLocal = ThreadLocal<Any>() private val resultThreadLocal = ThreadLocal<Any>()
@@ -66,19 +67,19 @@ class SysLogInterceptor(
sysLog.apply { sysLog.apply {
logType = requestUri?.let { logType = requestUri?.let {
when { when {
it.startsWith("/login") -> "LOGIN" it.startsWith("/login") -> SysLog.LogType.LOGIN
it.startsWith("/logout") -> "LOGOUT" it.startsWith("/logout") -> SysLog.LogType.LOGOUT
it.startsWith("/register") -> "REGISTER" it.startsWith("/register") -> SysLog.LogType.REGISTER
it.startsWith("/system/statistic/") -> "STATISTIC" it.startsWith("/system/statistic/") -> SysLog.LogType.STATISTIC
it.startsWith("/api/") -> "API" it.startsWith("/api/") -> SysLog.LogType.API
else -> "INFO" else -> SysLog.LogType.INFO
} }
} ?: "INFO" } ?: SysLog.LogType.INFO
exception = 0 exception = 0
} }
} else { } else {
sysLog.apply { sysLog.apply {
logType = "ERROR" logType = SysLog.LogType.ERROR
exception = 1 exception = 1
exceptionInfo = result.msg exceptionInfo = result.msg
} }

2
src/main/kotlin/top/fatweb/api/settings/MailSecurityType.kt
View File

@@ -10,7 +10,7 @@ enum class MailSecurityType(val code: String) {
@JsonCreator @JsonCreator
fun fromCode(code: String): MailSecurityType? { fun fromCode(code: String): MailSecurityType? {
values().forEach { entries.forEach {
if (it.code == code) { if (it.code == code) {
return it return it
} }

3
src/main/kotlin/top/fatweb/api/vo/system/SysLogVo.kt
View File

@@ -3,6 +3,7 @@ package top.fatweb.api.vo.system
import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.annotation.JsonSerialize
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import com.fasterxml.jackson.databind.ser.std.ToStringSerializer
import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.media.Schema
import top.fatweb.api.entity.system.SysLog
import java.time.LocalDateTime import java.time.LocalDateTime
/** /**
@@ -29,7 +30,7 @@ data class SysLogVo(
* @since 1.0.0 * @since 1.0.0
*/ */
@Schema(description = "日志类型") @Schema(description = "日志类型")
val logType: String?, val logType: SysLog.LogType?,
/** /**
* Operate user ID * Operate user ID