From c098cec233a4c616040c9dd863f78b30b51b27ab Mon Sep 17 00:00:00 2001 From: BBIT-Kai <2911862937@qq.com> Date: Mon, 10 Nov 2025 18:07:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B1=80=E5=9F=9F=E7=BD=91IP?= =?UTF-8?q?=EF=BC=9B=E5=88=A0=E9=99=A4=E8=9A=95=E8=8C=A7=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E2=80=98=E5=A4=84=E7=90=86=E6=97=B6=E9=95=BF?= =?UTF-8?q?=E2=80=99=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ktor/src/main/kotlin/ink/snowflake/server/Application.kt | 6 ++++++ .../src/main/kotlin/ink/snowflake/server/controller/User.kt | 3 ++- .../ink/snowflake/server/model/database/ScaImagesTable.kt | 2 +- .../snowflake/server/model/request/ImageAnalyticsRequest.kt | 1 - .../main/kotlin/ink/snowflake/server/utils/dao/ImageDao.kt | 3 --- ktor/src/main/resources/application.yaml | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ktor/src/main/kotlin/ink/snowflake/server/Application.kt b/ktor/src/main/kotlin/ink/snowflake/server/Application.kt index c31a0d2..3e21a84 100644 --- a/ktor/src/main/kotlin/ink/snowflake/server/Application.kt +++ b/ktor/src/main/kotlin/ink/snowflake/server/Application.kt @@ -28,6 +28,12 @@ const val VIDEO_INPUT_PATH = "C:/tmp/" * ADB 秦朗FRP地址 */ const val SERVER_PATH_FRP = "s3.ronsunny.cn" // 171.212.101.201 + +/** + * 局域网IP 用于连接PostgreSQL和Radis + */ +const val LOCAL_IP = "10.10.12.101" + val gson = Gson() fun main(args: Array): Unit = EngineMain.main(args) diff --git a/ktor/src/main/kotlin/ink/snowflake/server/controller/User.kt b/ktor/src/main/kotlin/ink/snowflake/server/controller/User.kt index d741353..f3765b3 100644 --- a/ktor/src/main/kotlin/ink/snowflake/server/controller/User.kt +++ b/ktor/src/main/kotlin/ink/snowflake/server/controller/User.kt @@ -2,6 +2,7 @@ package ink.snowflake.server.controller import com.auth0.jwt.JWT import com.auth0.jwt.algorithms.Algorithm +import ink.snowflake.server.LOCAL_IP import ink.snowflake.server.model.request.CommonRequest import ink.snowflake.server.model.request.LoginRequest import ink.snowflake.server.model.request.RefreshTokenRequest @@ -38,7 +39,7 @@ import kotlin.text.Charsets.UTF_8 // 配置和初始化 Redis 客户端 fun setupRedis(): RedissonClient { val config = Config() - config.useSingleServer().setAddress("redis://localhost:6379") + config.useSingleServer().setAddress("redis://"+LOCAL_IP+":6379") return Redisson.create(config) } diff --git a/ktor/src/main/kotlin/ink/snowflake/server/model/database/ScaImagesTable.kt b/ktor/src/main/kotlin/ink/snowflake/server/model/database/ScaImagesTable.kt index c0b4da0..a28d53d 100644 --- a/ktor/src/main/kotlin/ink/snowflake/server/model/database/ScaImagesTable.kt +++ b/ktor/src/main/kotlin/ink/snowflake/server/model/database/ScaImagesTable.kt @@ -21,5 +21,5 @@ object ScaImagesTable : UUIDTable("sca_images") { val other_info = json("other_info", serialize = { gson.toJson(it) }, deserialize = { gson.fromJson(it, object : TypeToken>() {}.type) }) - val processing_time = datetime("processing_time") + val processing_time = float("inference_time_ms") } \ No newline at end of file diff --git a/ktor/src/main/kotlin/ink/snowflake/server/model/request/ImageAnalyticsRequest.kt b/ktor/src/main/kotlin/ink/snowflake/server/model/request/ImageAnalyticsRequest.kt index 5e2dfc0..ac97fca 100644 --- a/ktor/src/main/kotlin/ink/snowflake/server/model/request/ImageAnalyticsRequest.kt +++ b/ktor/src/main/kotlin/ink/snowflake/server/model/request/ImageAnalyticsRequest.kt @@ -20,5 +20,4 @@ data class ImageAnalyticsRequest( val min_confidence: Float, // 最小置信度 val average_confidence: Float, // 平均置信度 val other_info: Map, // 额外信息 - val processing_time: String // 处理时间 ) \ No newline at end of file diff --git a/ktor/src/main/kotlin/ink/snowflake/server/utils/dao/ImageDao.kt b/ktor/src/main/kotlin/ink/snowflake/server/utils/dao/ImageDao.kt index 7a1b12f..060cb8c 100644 --- a/ktor/src/main/kotlin/ink/snowflake/server/utils/dao/ImageDao.kt +++ b/ktor/src/main/kotlin/ink/snowflake/server/utils/dao/ImageDao.kt @@ -26,8 +26,6 @@ object ImageDao { it[min_confidence] = request.min_confidence it[average_confidence] = request.average_confidence it[other_info] = request.other_info // 直接存储 JSON - it[processing_time] = Timestamp.valueOf(request.processing_time) - .toLocalDateTime().toKotlinLocalDateTime() } } } @@ -52,7 +50,6 @@ object ImageDao { min_confidence = it[ScaImagesTable.min_confidence], average_confidence = it[ScaImagesTable.average_confidence], other_info = it[ScaImagesTable.other_info] as Map, - processing_time = formatLocalDateTimeToString(it[ScaImagesTable.processing_time]) ) } } diff --git a/ktor/src/main/resources/application.yaml b/ktor/src/main/resources/application.yaml index 4bcb2b7..5d0bc8e 100644 --- a/ktor/src/main/resources/application.yaml +++ b/ktor/src/main/resources/application.yaml @@ -17,7 +17,7 @@ ktor: secret: "secret_jwt" database: # url: "jdbc:postgresql://10.10.10.9:5432/ktor2" - url: "jdbc:postgresql://localhost:5432/ktor2" + url: "jdbc:postgresql://10.10.12.101:5432/ktor2" driver: "org.postgresql.Driver" user: "postgres" password: "123456"