From 278c5eb810dc779fced9e1ed378c5b7094e9966b Mon Sep 17 00:00:00 2001 From: AiKrai Date: Tue, 11 Mar 2025 15:04:35 +0800 Subject: [PATCH] =?UTF-8?q?style(gradle):=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vertx-demo/src/main/kotlin/app/Application.kt | 10 +++++----- vertx-demo/src/main/kotlin/app/config/InjectConfig.kt | 2 -- vertx-demo/src/main/kotlin/app/config/RespBean.kt | 2 -- .../src/main/kotlin/app/config/auth/ResponseHandler.kt | 4 ++-- .../src/main/kotlin/app/controller/HelloController.kt | 8 ++++---- .../kotlin/app/domain/account/AccountRepositoryImpl.kt | 1 - .../main/kotlin/app/service/account/AccountService.kt | 2 +- vertx-demo/src/main/kotlin/app/verticle/WebVerticle.kt | 3 +-- .../test/kotlin/app/controller/AuthControllerTest.kt | 8 +++++--- 9 files changed, 18 insertions(+), 22 deletions(-) diff --git a/vertx-demo/src/main/kotlin/app/Application.kt b/vertx-demo/src/main/kotlin/app/Application.kt index d879838..7110ec3 100644 --- a/vertx-demo/src/main/kotlin/app/Application.kt +++ b/vertx-demo/src/main/kotlin/app/Application.kt @@ -18,12 +18,12 @@ object Application { val getIt = InjectConfig.configure(vertx) val mainVerticle = getIt.getInstance(MainVerticle::class.java) vertx.deployVerticle(mainVerticle).onComplete { - if (it.failed()) { - logger.error { "MainVerticle startup failed: ${it.cause()?.stackTraceToString()}" } - } else { - logger.info { "MainVerticle startup successfully" } - } + if (it.failed()) { + logger.error { "MainVerticle startup failed: ${it.cause()?.stackTraceToString()}" } + } else { + logger.info { "MainVerticle startup successfully" } } + } } } } diff --git a/vertx-demo/src/main/kotlin/app/config/InjectConfig.kt b/vertx-demo/src/main/kotlin/app/config/InjectConfig.kt index cb26408..690be67 100644 --- a/vertx-demo/src/main/kotlin/app/config/InjectConfig.kt +++ b/vertx-demo/src/main/kotlin/app/config/InjectConfig.kt @@ -6,8 +6,6 @@ import cn.hutool.core.util.IdUtil import com.google.inject.* import com.google.inject.name.Names import io.vertx.core.Vertx -import io.vertx.core.http.HttpServer -import io.vertx.core.http.HttpServerOptions import io.vertx.ext.auth.jwt.JWTAuth import io.vertx.pgclient.PgBuilder import io.vertx.pgclient.PgConnectOptions diff --git a/vertx-demo/src/main/kotlin/app/config/RespBean.kt b/vertx-demo/src/main/kotlin/app/config/RespBean.kt index 955e20e..1923141 100644 --- a/vertx-demo/src/main/kotlin/app/config/RespBean.kt +++ b/vertx-demo/src/main/kotlin/app/config/RespBean.kt @@ -2,7 +2,6 @@ package app.config import org.aikrai.vertx.constant.HttpStatus - data class RespBean( val code: Int, val message: String, @@ -40,7 +39,6 @@ data class RespBean( return RespBean(code, message, data) } - // 访问受限，授权过期 fun forbidden(message: String?): RespBean { return failure(HttpStatus.FORBIDDEN, message ?: "Restricted access, expired authorizations") diff --git a/vertx-demo/src/main/kotlin/app/config/auth/ResponseHandler.kt b/vertx-demo/src/main/kotlin/app/config/auth/ResponseHandler.kt index 6941b88..e93f406 100644 --- a/vertx-demo/src/main/kotlin/app/config/auth/ResponseHandler.kt +++ b/vertx-demo/src/main/kotlin/app/config/auth/ResponseHandler.kt @@ -10,7 +10,7 @@ import org.aikrai.vertx.jackson.JsonUtil import org.aikrai.vertx.utlis.Meta @Singleton -class ResponseHandler: ResponseHandlerInterface { +class ResponseHandler : ResponseHandlerInterface { private val logger = KotlinLogging.logger { } override suspend fun normal( @@ -62,4 +62,4 @@ class ResponseHandler: ResponseHandlerInterface { .putHeader("Content-Type", "application/json") .end(resStr) } -} \ No newline at end of file +} diff --git a/vertx-demo/src/main/kotlin/app/controller/HelloController.kt b/vertx-demo/src/main/kotlin/app/controller/HelloController.kt index cc0bcf4..4b41280 100644 --- a/vertx-demo/src/main/kotlin/app/controller/HelloController.kt +++ b/vertx-demo/src/main/kotlin/app/controller/HelloController.kt @@ -8,7 +8,7 @@ import org.aikrai.vertx.context.D @D("Hello") @Controller("/") class HelloController { - suspend fun hello(): String { - return "Hello" - } -} \ No newline at end of file + suspend fun hello(): String { + return "Hello" + } +} diff --git a/vertx-demo/src/main/kotlin/app/domain/account/AccountRepositoryImpl.kt b/vertx-demo/src/main/kotlin/app/domain/account/AccountRepositoryImpl.kt index b9840ce..7bb7c61 100644 --- a/vertx-demo/src/main/kotlin/app/domain/account/AccountRepositoryImpl.kt +++ b/vertx-demo/src/main/kotlin/app/domain/account/AccountRepositoryImpl.kt @@ -5,7 +5,6 @@ import app.domain.account.modle.AccountRoleAccessDTO import com.google.inject.Inject import io.vertx.sqlclient.SqlClient import org.aikrai.vertx.db.RepositoryImpl -import org.aikrai.vertx.db.tx.withTransaction class AccountRepositoryImpl @Inject constructor( sqlClient: SqlClient diff --git a/vertx-demo/src/main/kotlin/app/service/account/AccountService.kt b/vertx-demo/src/main/kotlin/app/service/account/AccountService.kt index 88a6189..ee5ca20 100644 --- a/vertx-demo/src/main/kotlin/app/service/account/AccountService.kt +++ b/vertx-demo/src/main/kotlin/app/service/account/AccountService.kt @@ -19,7 +19,7 @@ class AccountService @Inject constructor( private val accountRepository: AccountRepository, private val tokenService: TokenService, ) { - private val logger = KotlinLogging.logger { } + private val logger = KotlinLogging.logger { } suspend fun testTransaction() { withTransaction { diff --git a/vertx-demo/src/main/kotlin/app/verticle/WebVerticle.kt b/vertx-demo/src/main/kotlin/app/verticle/WebVerticle.kt index ea8ea68..3619d9b 100644 --- a/vertx-demo/src/main/kotlin/app/verticle/WebVerticle.kt +++ b/vertx-demo/src/main/kotlin/app/verticle/WebVerticle.kt @@ -41,7 +41,6 @@ class WebVerticle @Inject constructor( ) : CoroutineVerticle() { private val logger = KotlinLogging.logger { } - override suspend fun start() { val rootRouter = Router.router(vertx) val router = Router.router(vertx) @@ -92,7 +91,7 @@ class WebVerticle @Inject constructor( if (failure != null) { logger.error { "${ctx.request().uri()}: ${failure.stackTraceToString()}" } val resObj = when (failure) { - is Meta -> RespBean.failure(ctx.statusCode(),"${failure.name}:${failure.message}", failure.data) + is Meta -> RespBean.failure(ctx.statusCode(), "${failure.name}:${failure.message}", failure.data) else -> RespBean.failure("${failure.javaClass.simpleName}${if (failure.message != null) ":${failure.message}" else ""}") } val resStr = JsonUtil.toJsonStr(resObj) diff --git a/vertx-demo/src/test/kotlin/app/controller/AuthControllerTest.kt b/vertx-demo/src/test/kotlin/app/controller/AuthControllerTest.kt index a7db055..5b638c5 100644 --- a/vertx-demo/src/test/kotlin/app/controller/AuthControllerTest.kt +++ b/vertx-demo/src/test/kotlin/app/controller/AuthControllerTest.kt @@ -19,7 +19,7 @@ import org.junit.jupiter.api.extension.ExtendWith * AuthControllerTest */ @ExtendWith(VertxExtension::class) -class AuthControllerTest{ +class AuthControllerTest { private var port = 8080 private var basePath = "/api" @@ -75,7 +75,9 @@ class AuthControllerTest{ basePath = "/$it".replace("//", "/") } vertx.setTimer(5000) { testContext.completeNow() } - } else testContext.failNow(ar.cause()) + } else { + testContext.failNow(ar.cause()) + } } } -} \ No newline at end of file +}