修复一段时间后无法连接到数据库的问题、增加‘备注’字段

ForteScarlet · ForteScarlet · commit 3b2a7f14849d · 2024-03-31T19:39:41.000+08:00
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
@@ -58,77 +58,79 @@ val FontLXGWNeoXiHeiScreenFamily = FontFamily(FontLXGWNeoXiHeiScreen())
 
 private val logger = LoggerFactory.getLogger("MAIN")
 
-fun main() = application {
+fun main() {
     Thread.setDefaultUncaughtExceptionHandler { t, e ->
         logger.error("UncaughtExceptionHandler on Thread[{}]", t, e)
     }
 
-    val scope = rememberCoroutineScope { Dispatchers.Default }
-    val materialThemeState = rememberMaterialThemeState()
+    val databaseOp = connectDatabaseOperator(dataDir = storeAppPath(), schemaName = "bonus")
 
-    val winSize = kotlin.runCatching {
-        with(Toolkit.getDefaultToolkit().screenSize) {
-            DpSize((width * 0.8f).dp, (height * 0.8f).dp)
-        }
-    }.getOrElse {
-        DpSize(1024.dp, 768.dp)
-    }
+    application {
+        val scope = rememberCoroutineScope { Dispatchers.Default }
+        val materialThemeState = rememberMaterialThemeState()
 
-    val winState = rememberWindowState(size = winSize)
-    val databaseOp = remember { connectDatabaseOperator(dataDir = storeAppPath(), schemaName = "bonus") }
+        val winSize = kotlin.runCatching {
+            with(Toolkit.getDefaultToolkit().screenSize) {
+                DpSize((width * 0.8f).dp, (height * 0.8f).dp)
+            }
+        }.getOrElse {
+            DpSize(1024.dp, 768.dp)
+        }
 
-    val trayState = rememberTrayState()
+        val winState = rememberWindowState(size = winSize)
+        val trayState = rememberTrayState()
 
-    if (winState.isMinimized) {
-        Tray(
-            icon = Logo(),
-            tooltip = "别奖励了😡",
-            state = trayState,
-            onAction = {
-                winState.isMinimized = false
-                winState.position = WindowPosition.PlatformDefault
-            },
-            menu = {
-                Item("Open") {
+        if (winState.isMinimized) {
+            Tray(
+                icon = Logo(),
+                tooltip = "别奖励了😡",
+                state = trayState,
+                onAction = {
                     winState.isMinimized = false
                     winState.position = WindowPosition.PlatformDefault
+                },
+                menu = {
+                    Item("Open") {
+                        winState.isMinimized = false
+                        winState.position = WindowPosition.PlatformDefault
+                    }
+                    Separator()
+                    Item("Exit") {
+                        exitApplication()
+                    }
                 }
-                Separator()
-                Item("Exit") {
-                    exitApplication()
-                }
-            }
-        )
-    }
-
-    Window(
-        icon = Logo(),
-        state = winState,
-        title = "别奖励了!",
-        visible = !winState.isMinimized,
-        enabled = !winState.isMinimized,
-        onCloseRequest = {
-            exitApplication()
+            )
         }
-    ) {
-        MaterialTheme(
-            colors = materialThemeState.colors,
-            typography = materialThemeState.typography,
-            shapes = materialThemeState.shapes
+
+        Window(
+            icon = Logo(),
+            state = winState,
+            title = "别奖励了!",
+            visible = !winState.isMinimized,
+            enabled = !winState.isMinimized,
+            onCloseRequest = {
+                exitApplication()
+            }
         ) {
-            App(
-                remember {
-                    AppState(
-                        winState,
-                        materialThemeState,
-                        scope,
-                        databaseOp
-                    )
-                }
-            )
+            MaterialTheme(
+                colors = materialThemeState.colors,
+                typography = materialThemeState.typography,
+                shapes = materialThemeState.shapes
+            ) {
+                App(
+                    remember {
+                        AppState(
+                            winState,
+                            materialThemeState,
+                            scope,
+                            databaseOp
+                        )
+                    }
+                )
+            }
         }
-    }
 
+    }
 }
 
 @Suppress("MemberVisibilityCanBePrivate", "unused")
diff --git a/src/main/kotlin/database/DatabaseConnector.kt b/src/main/kotlin/database/DatabaseConnector.kt
@@ -12,7 +12,6 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.io.path.Path
 import kotlin.io.path.div
 import kotlin.io.path.pathString
-import kotlin.math.max
 
 class DatabaseOperator(
     val schema: Schema,
@@ -52,11 +51,30 @@ private const val DATA_FILE_NAME = "bonus.d"
 fun connectDatabaseOperator(dataDir: Path = DEFAULT_DATA_DIR, schemaName: String): DatabaseOperator {
     val schema = Schema(schemaName)
 
+    val jdbcUrl = "jdbc:h2:file:${(dataDir / DATA_FILE_NAME).pathString};" +
+            "DB_CLOSE_DELAY=-1;" +
+            "DB_CLOSE_ON_EXIT=FALSE;" +
+            "TRACE_LEVEL_FILE=3;" +
+            "AUTO_RECONNECT=TRUE;"
+
+    // val database = Database.connect(
+    //     url = jdbcUrl,
+    //     driver = "org.h2.Driver",
+    //     databaseConfig = DatabaseConfig {
+    //         // set other parameters here
+    //         defaultFetchSize = 100
+    //         keepLoadedReferencesOutOfTransaction = true
+    //         defaultMaxRepetitionDelay = 6000
+    //     }
+    // )
+
     val config = hikariConfig {
-        jdbcUrl = "jdbc:h2:file:${(dataDir / DATA_FILE_NAME).pathString}"
+        this.jdbcUrl = jdbcUrl
         driverClassName = "org.h2.Driver"
         poolName = "BonusDBPool"
-        minimumIdle = max(1, Runtime.getRuntime().availableProcessors() / 2)
+        minimumIdle = 1
+        maximumPoolSize = 1
+
     }
 
     val dataSource = HikariDataSource(config)
diff --git a/src/main/kotlin/database/entity/BonusRecord.kt b/src/main/kotlin/database/entity/BonusRecord.kt
@@ -33,6 +33,11 @@ object BonusRecords : BaseIntIdTable() {
      * 给本次打分。0~10分。
      */
     val score = uinteger("score").default(0u)
+
+    /**
+     * 备注
+     */
+    val remark = varchar("remark", 500).clientDefault { "" }
 }
 
 class BonusRecord(id: EntityID<Int>) : BaseIntEntity(id, BonusRecords) {
@@ -43,6 +48,7 @@ class BonusRecord(id: EntityID<Int>) : BaseIntEntity(id, BonusRecords) {
     var endTime by BonusRecords.endTime
     var duration by BonusRecords.duration
     var score by BonusRecords.score
+    var remark by BonusRecords.remark
 
     var weapons by Weapon via BonusRecordWeapons
 }
@@ -72,6 +78,7 @@ data class BonusRecordView(
     val endTime: Instant,
     val duration: Duration,
     val score: UInt,
+    val remark: String,
     val weapons: List<WeaponView>
 ) : BaseIntEntityView
 
@@ -80,12 +87,14 @@ fun BonusRecord.toView(
     endTime: Instant = this.endTime,
     duration: Duration = this.duration,
     score: UInt = this.score,
+    remark: String = this.remark,
     weapons: List<WeaponView> = this.weapons.map { it.toView() }
 ): BonusRecordView = BonusRecordView(
     entityID = id,
     startTime = startTime,
     endTime = endTime,
     duration = duration,
     score = score,
+    remark = remark,
     weapons = weapons,
 )
diff --git a/src/main/kotlin/view/account/home/AccountHomeView.kt b/src/main/kotlin/view/account/home/AccountHomeView.kt
@@ -259,14 +259,18 @@ private fun AccountHome(state: PageViewState) {
             ScoreSelector(score)
         }
 
-        // AnimatedVisibility(duration != null) {
-        //     Text(
-        //         text = duration?.toString() ?: "",
-        //         fontFamily = FontLXGWNeoXiHeiScreenFamily,
-        //         modifier = Modifier
-        //             .align(Alignment.CenterHorizontally)
-        //     )
-        // }
+        var remarkValue by remember { mutableStateOf("") }
+
+        AnimatedVisibility(duration != null) {
+            // 备注
+            OutlinedTextField(
+                value = remarkValue,
+                onValueChange = { remarkValue = if (it.length <= 500) it else it.substring(0, 500) },
+                label = { Text("备注") },
+                placeholder = { Text("备注") },
+                supportingText = { Text("500字内") },
+            )
+        }
 
         var recording by remember { mutableStateOf(false) }
 
@@ -291,9 +295,11 @@ private fun AccountHome(state: PageViewState) {
                                         this.endTime =
                                             ZonedDateTime.of(selectedEndDateTime, ZoneId.systemDefault()).toInstant()
                                         this.score = score.value.toUInt()
+                                        this.remark = remarkValue
                                         weapon?.also { w ->
-                                            this.weapons = SizedCollection(listOf(Weapon.findById(w.id)!!))
-                                            // TODO null?
+                                            Weapon.findById(w.id)?.also {
+                                                this.weapons = SizedCollection(listOf(it))
+                                            }
                                         }
                                     }
                                 }
@@ -361,12 +367,12 @@ private inline fun WeaponSelector(
 ) {
     val weapons = remember { mutableStateListOf<WeaponView>() }
     LaunchedEffect(state) {
-        state.accountState.inAccountTransaction { account ->
-            val all = Weapon.find { Weapons.account eq account.id }
+        val all = state.accountState.inAccountTransaction { account ->
+            Weapon.find { Weapons.account eq account.id }
                 .notForUpdate().map { it.toView() }
-
-            weapons.addAll(all)
         }
+
+        weapons.addAll(all)
     }
 
     var expanded by remember { mutableStateOf(false) }
diff --git a/src/main/kotlin/view/account/record/AccountBonusRecordView.kt b/src/main/kotlin/view/account/record/AccountBonusRecordView.kt
@@ -1,12 +1,14 @@
 package view.account.record
 
 import FontBTTFamily
+import FontLXGWNeoXiHeiScreenFamily
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.hoverable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsHoveredAsState
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -21,6 +23,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import database.entity.BonusRecord
 import database.entity.BonusRecordView
@@ -170,10 +173,10 @@ private fun ListItemRecord(
         modifier = Modifier.hoverable(interactionSource),
         headlineContent = {
             if (record.weapons.isEmpty()) {
-                Text("手艺活")
+                Text("手艺活", fontFamily = FontLXGWNeoXiHeiScreenFamily)
             } else {
                 val weaponsString = record.weapons.joinToString("、", prefix = "「", postfix = "」") { it.name }
-                Text("使用 $weaponsString")
+                Text("使用 $weaponsString", fontFamily = FontLXGWNeoXiHeiScreenFamily)
             }
         },
         supportingContent = {
@@ -183,12 +186,31 @@ private fun ListItemRecord(
             val endDate = end.toLocalDate()
             val startTime = start.toLocalTime()
             val endTime = end.toLocalTime()
+            val remark = record.remark
+            val score = record.score
+
+            Column {
+                if (startDate == endDate) {
+                    Text("从 $startDate 的 $startTime 开始, 直到 $endTime", fontFamily = FontLXGWNeoXiHeiScreenFamily)
+                } else {
+                    Text(
+                        "从 $startDate 的 $startTime 开始, 直到 $endDate 的 $endTime",
+                        fontFamily = FontLXGWNeoXiHeiScreenFamily
+                    )
+                }
+                // 评分
+                Row {
+                    Text("评分: ", fontWeight = FontWeight.Bold, fontFamily = FontLXGWNeoXiHeiScreenFamily)
+                    Text(score.toString(), fontFamily = FontLXGWNeoXiHeiScreenFamily)
+                }
 
-            if (startDate == endDate) {
-                Text("从 $startDate 的 $startTime 开始, 直到 $endTime")
-            } else {
-                Text("从 $startDate 的 $startTime 开始, 直到 $endDate 的 $endTime")
+                // 备注
+                Row {
+                    Text("备注: ", fontWeight = FontWeight.Bold, fontFamily = FontLXGWNeoXiHeiScreenFamily)
+                    Text(remark.ifBlank { "无" }, fontFamily = FontLXGWNeoXiHeiScreenFamily)
+                }
             }
+
         },
         trailingContent = {
             Row(
@@ -206,7 +228,7 @@ private fun ListItemRecord(
                             }
                     )
                 }
-                Text("持续:" + record.duration.format())
+                Text("持续:" + record.duration.format(), fontFamily = FontLXGWNeoXiHeiScreenFamily)
             }
         }
     )
