支持配置服务目录

BalloonUpdate · Nov 16, 2022 · 6d52a5b · 6d52a5b
1 parent f2c9e6e
commit 6d52a5b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,5 +37,10 @@ tasks.withType<ShadowJar> {
         attributes("Main-Class" to "MiniHttpServer")
     }
 
+    // 打包源代码
+    sourceSets.main.get().allSource.sourceDirectories.map {
+        from(it) {into("sources/"+it.name) }
+    }
+
     archiveClassifier.set("")
 }
diff --git a/src/main/kotlin/AppConfig.kt b/src/main/kotlin/AppConfig.kt
@@ -1,5 +1,7 @@
 data class AppConfig(
     val port: Int,
+    val serve: String,
+    val home: String,
     val certificateFile: String,
     val certificatePass: String,
 )
diff --git a/src/main/kotlin/MiniHttpServer.kt b/src/main/kotlin/MiniHttpServer.kt
@@ -44,17 +44,16 @@ class MiniHttpServer
 
             config = AppConfig(
                 port = configYaml["port"]?.run { this as Int } ?: 8850,
+                serve = configYaml["serve"]?.run { this as String } ?: "public",
+                home = configYaml["home"]?.run { this as String } ?: "404.html",
                 certificateFile = configYaml["jks-certificate-file"]?.run { this as String } ?: "",
                 certificatePass = configYaml["jks-certificate-pass"]?.run { this as String } ?: "",
             )
         } catch (e: YAMLException) {
             exitWithError("配置文件读取出错(格式不正确)，可能的位置和原因: ${e.cause?.message}")
         }
 
-        val publidDir = File(workdir, "public")
-
-        if (!(File(publidDir, "current-version.txt")).exists())
-            exitWithError("找不到public/current-version.txt，启动失败，请检查此文件是否存在")
+        val publidDir = File(workdir, config.serve)
 
         try {
             server = Server(publidDir, config.port)
@@ -68,7 +67,7 @@ class MiniHttpServer
             server.start(NanoHTTPD.SOCKET_READ_TIMEOUT, false)
 
             println("Listening on: ${config.port}")
-            println("API地址: http://localhost:${config.port}/current-version.txt")
+            println("API地址: http://localhost:${config.port}")
 
             println()
             println("使用提示1：显示的所有报错信息都不用管，直接忽略就好！")

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -1,5 +1,8 @@
 # 修改监听端口
-port: 1800
+port: 6600
+
+# 服务目录
+serve: public
 
 # 加载jks格式证书文件，默认请留空
 jks-certificate-file: