将配置文件移动到外部

Author: HoshinoTented

README.md

@@ -11,8 +11,8 @@
 /paintBoard/board | GET                                  | 获取绘板内容
 /paintBoard/paint | POST(x: Int, y: Int, color: Int)     | 进行绘画
 /paintBoard/ws    | WebSocket                            | 监听绘板变化的 WebSocket
-/paintBoard/save  | POST(password: String, path: String) | 保存绘板到本地
-/paintBoard/load  | POST(password: String, path: String) | 从本地加载绘板（不会发送 WebSocket 信息）
+/paintBoard/save  | POST(password: String, path: String) | 保存绘板到数据库
+/paintBoard/load  | POST(password: String, path: String) | 从数据库加载绘板（不会发送 WebSocket 信息）
 
 ## How to RUN it
 

…main/resources/config.example.properties config.example.propertiessrc/main/resources/config.example.properties renamed to config.example.properties src/main/resources/config.example.properties renamed to config.example.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
 kotlinVersion=1.3.61
-ktorVersion=1.2.4
+ktorVersion=1.3.0

gradle.properties

@@ -17,6 +17,7 @@ import io.ktor.websocket.webSocket
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import redis.clients.jedis.Jedis
+import java.io.File
 import java.util.*
 
 data class PaintRequest(val x: Int, val y: Int, val color: String)
@@ -30,7 +31,7 @@ val sessions: MutableList<WebSocketSession> = Collections.synchronizedList(Linke
 
 fun loadConfig() {
     config = Properties().apply {
-        load(Unknown::class.java.getResourceAsStream("/config.properties"))
+        load(File("config.properties").inputStream())
     }
 }
 
@@ -42,7 +43,6 @@ fun connectRedis() {
     println("Connected redis server: $host:$port")
 }
 
-
 suspend fun onPaint(req: PaintRequest) {
     sessions.forEach {
         try {
@@ -59,13 +59,13 @@ fun main() {
     loadConfig()
     connectRedis()
 
-    embeddedServer(Netty, 8080) {
-        try {
-            load()
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
+    try {
+        load()
+    } catch (e: Exception) {
+        e.printStackTrace()
+    }
 
+    embeddedServer(Netty, 8080) {
         launch {
             while (true) {
                 println("Saving board...")
@@ -86,10 +86,7 @@ fun main() {
                     html = html.replace("\${wsurl}", config.getProperty("wsurl"))
                 }
 
-                call.respondText(
-                    html,
-                    ContentType.Text.Html
-                )
+                call.respondText(html, ContentType.Text.Html)
             }
 
             webSocket("/paintBoard/ws") {

src/main/kotlin/org/hoshino9/luogu/paintboard/server/Application.kt

@@ -10,12 +10,21 @@ import io.ktor.routing.Routing
 import io.ktor.routing.get
 import io.ktor.routing.post
 import kotlinx.coroutines.launch
+import java.util.*
 
-val board: Array<IntArray> = Array(800) {
-    IntArray(400) {
-        0x000000
+val board: MutableList<MutableList<Int>> = Collections.synchronizedList(
+    ArrayList<MutableList<Int>>().apply {
+        repeat(800) {
+            ArrayList<Int>().apply {
+                repeat(400) {
+                    add(0x000000)
+                }
+            }.let {
+                Collections.synchronizedList(it).run(::add)
+            }
+        }
     }
-}
+)
 
 var boardText: String
     get() {