[O] Use logger alias

pull/108/head
Azalea 2025-01-11 19:16:46 -05:00
parent 3878103eaa
commit 401d182fc6
9 changed files with 17 additions and 21 deletions

View File

@ -2,14 +2,13 @@ package icu.samnyan.aqua.net.components
import ext.Bool import ext.Bool
import ext.Str import ext.Str
import ext.logger
import icu.samnyan.aqua.net.db.AquaNetUser import icu.samnyan.aqua.net.db.AquaNetUser
import icu.samnyan.aqua.net.db.EmailConfirmation import icu.samnyan.aqua.net.db.EmailConfirmation
import icu.samnyan.aqua.net.db.EmailConfirmationRepo import icu.samnyan.aqua.net.db.EmailConfirmationRepo
import org.simplejavamail.api.mailer.Mailer import org.simplejavamail.api.mailer.Mailer
import org.simplejavamail.email.EmailBuilder import org.simplejavamail.email.EmailBuilder
import org.simplejavamail.springsupport.SimpleJavaMailSpringSupport import org.simplejavamail.springsupport.SimpleJavaMailSpringSupport
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.boot.context.event.ApplicationStartedEvent import org.springframework.boot.context.event.ApplicationStartedEvent
import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Configuration
@ -40,7 +39,7 @@ class EmailService(
val props: EmailProperties, val props: EmailProperties,
val confirmationRepo: EmailConfirmationRepo, val confirmationRepo: EmailConfirmationRepo,
) { ) {
val log: Logger = LoggerFactory.getLogger(EmailService::class.java) val log = logger()
val confirmTemplate: Str = this::class.java.getResource("/email/confirm.html")?.readText() val confirmTemplate: Str = this::class.java.getResource("/email/confirm.html")?.readText()
?: throw Exception("Email Template Not Found") ?: throw Exception("Email Template Not Found")

View File

@ -1,5 +1,6 @@
package icu.samnyan.aqua.sega.aimedb package icu.samnyan.aqua.sega.aimedb
import ext.logger
import ext.toHex import ext.toHex
import icu.samnyan.aqua.net.db.AquaUserServices import icu.samnyan.aqua.net.db.AquaUserServices
import icu.samnyan.aqua.sega.allnet.AllNetProps import icu.samnyan.aqua.sega.allnet.AllNetProps
@ -28,7 +29,7 @@ class AimeDB(
val us: AquaUserServices, val us: AquaUserServices,
val allNetProps: AllNetProps, val allNetProps: AllNetProps,
): ChannelInboundHandlerAdapter() { ): ChannelInboundHandlerAdapter() {
val logger: Logger = LoggerFactory.getLogger(AimeDB::class.java) val logger = logger()
data class AimeBaseInfo(val gameId: String, val keychipId: String) data class AimeBaseInfo(val gameId: String, val keychipId: String)

View File

@ -1,5 +1,6 @@
package icu.samnyan.aqua.sega.aimedb package icu.samnyan.aqua.sega.aimedb
import ext.logger
import io.netty.bootstrap.ServerBootstrap import io.netty.bootstrap.ServerBootstrap
import io.netty.channel.ChannelInitializer import io.netty.channel.ChannelInitializer
import io.netty.channel.ChannelOption import io.netty.channel.ChannelOption
@ -33,7 +34,7 @@ class AimeDbServer(
val initializer: AimeDbServerInitializer, val initializer: AimeDbServerInitializer,
val props: AimeDbProps val props: AimeDbProps
) { ) {
val logger: Logger = LoggerFactory.getLogger(AimeDbServer::class.java) val logger = logger()
fun start() { fun start() {
if (!props.enable) return logger.info("Aime DB is disabled.") if (!props.enable) return logger.info("Aime DB is disabled.")

View File

@ -6,8 +6,6 @@ import icu.samnyan.aqua.sega.util.AllNetBillingDecoder.decodeAllNet
import icu.samnyan.aqua.sega.util.AquaConst import icu.samnyan.aqua.sega.util.AquaConst
import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletRequest
import jakarta.servlet.http.HttpServletResponse import jakarta.servlet.http.HttpServletResponse
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Configuration
import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PostMapping
@ -197,7 +195,7 @@ class AllNet(
} }
companion object { companion object {
val logger: Logger = LoggerFactory.getLogger(AllNet::class.java) val logger = logger()
} }
} }

View File

@ -1,5 +1,6 @@
package icu.samnyan.aqua.sega.billing package icu.samnyan.aqua.sega.billing
import ext.logger
import ext.toUrl import ext.toUrl
import icu.samnyan.aqua.sega.util.AllNetBillingDecoder.decodeBilling import icu.samnyan.aqua.sega.util.AllNetBillingDecoder.decodeBilling
import jakarta.annotation.PostConstruct import jakarta.annotation.PostConstruct
@ -8,8 +9,6 @@ import org.eclipse.jetty.http.HttpVersion
import org.eclipse.jetty.server.* import org.eclipse.jetty.server.*
import org.eclipse.jetty.util.resource.URLResourceFactory import org.eclipse.jetty.util.resource.URLResourceFactory
import org.eclipse.jetty.util.ssl.SslContextFactory import org.eclipse.jetty.util.ssl.SslContextFactory
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Value import org.springframework.beans.factory.annotation.Value
import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer
@ -44,7 +43,7 @@ class Billing(
) { ) {
lateinit var billingKey: PrivateKey lateinit var billingKey: PrivateKey
val logger: Logger = LoggerFactory.getLogger(Billing::class.java) val logger = logger()
@PostConstruct @PostConstruct
fun init() { fun init() {

View File

@ -1,12 +1,11 @@
package icu.samnyan.aqua.sega.maimai2.handler package icu.samnyan.aqua.sega.maimai2.handler
import ext.logger
import icu.samnyan.aqua.net.games.mai2.Maimai2 import icu.samnyan.aqua.net.games.mai2.Maimai2
import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.BaseHandler
import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.general.dao.CardRepository
import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Component import org.springframework.stereotype.Component
import kotlin.jvm.optionals.getOrNull import kotlin.jvm.optionals.getOrNull
@ -48,6 +47,6 @@ class GetUserCharacterHandler(
} }
companion object { companion object {
val logger: Logger = LoggerFactory.getLogger(GetUserCharacterHandler::class.java) val logger = logger()
} }
} }

View File

@ -1,12 +1,11 @@
package icu.samnyan.aqua.sega.maimai2.handler package icu.samnyan.aqua.sega.maimai2.handler
import ext.logger
import icu.samnyan.aqua.net.games.mai2.Maimai2 import icu.samnyan.aqua.net.games.mai2.Maimai2
import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.BaseHandler
import icu.samnyan.aqua.sega.general.dao.CardRepository import icu.samnyan.aqua.sega.general.dao.CardRepository
import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2ItemKind
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.stereotype.Component import org.springframework.stereotype.Component
import kotlin.jvm.optionals.getOrNull import kotlin.jvm.optionals.getOrNull
@ -81,7 +80,7 @@ class GetUserItemHandler(
} }
companion object { companion object {
val logger: Logger = LoggerFactory.getLogger(GetUserItemHandler::class.java) val logger = logger()
const val MULT = 10000000000L const val MULT = 10000000000L
} }
} }

View File

@ -2,6 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler
import ext.div import ext.div
import ext.isoDateTime import ext.isoDateTime
import ext.logger
import ext.path import ext.path
import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.BaseHandler
import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPhoto import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPhoto
@ -47,6 +48,6 @@ class UploadUserPhotoHandler(private val mapper: BasicMapper) :
} }
companion object { companion object {
private val logger: Logger = LoggerFactory.getLogger(UploadUserPhotoHandler::class.java) private val logger = logger()
} }
} }

View File

@ -1,13 +1,12 @@
package icu.samnyan.aqua.sega.maimai2.handler package icu.samnyan.aqua.sega.maimai2.handler
import ext.div import ext.div
import ext.logger
import ext.path import ext.path
import icu.samnyan.aqua.net.utils.PathProps import icu.samnyan.aqua.net.utils.PathProps
import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.general.BaseHandler
import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPortrait import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPortrait
import icu.samnyan.aqua.sega.util.jackson.BasicMapper import icu.samnyan.aqua.sega.util.jackson.BasicMapper
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.annotation.Value import org.springframework.beans.factory.annotation.Value
import org.springframework.stereotype.Component import org.springframework.stereotype.Component
import java.io.IOException import java.io.IOException
@ -70,6 +69,6 @@ class UploadUserPortraitHandler(
} }
companion object { companion object {
private val logger: Logger = LoggerFactory.getLogger(UploadUserPortraitHandler::class.java) private val logger = logger()
} }
} }