diff --git a/src/main/kotlin/net/taehui/twilight/etc/EtcAvatar.kt b/src/main/kotlin/net/taehui/twilight/etc/EtcAvatar.kt index c4ebf82..99d15ee 100644 --- a/src/main/kotlin/net/taehui/twilight/etc/EtcAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/etc/EtcAvatar.kt @@ -43,7 +43,7 @@ public override fun channelRead0(ctx: ChannelHandlerContext, msg: FullHttpRequest) { fun getQwilightDate(): QwilightDate { val jm = ObjectMapper() - val qwilightDateFilePath = Configure.path.wwwPath.resolve(Configure.path.datePath) + val qwilightDateFilePath = Configure.path.wwwPath.resolve("qwilight.json") return jm.readValue(Files.readString(qwilightDateFilePath), QwilightDate::class.java) } @@ -88,14 +88,14 @@ Configure.hash.add(hashARM64) Configure.saveConfigure() val jm = ObjectMapper() - val qwilightDateFilePath = Configure.path.wwwPath.resolve(Configure.path.datePath) + val dateFilePath = Configure.path.wwwPath.resolve("qwilight.json") val qwilightDate = - jm.readValue(Files.readString(qwilightDateFilePath), QwilightDate::class.java) + jm.readValue(Files.readString(dateFilePath), QwilightDate::class.java) qwilightDate.date = date qwilightDate.hashAMD64 = hashAMD64 qwilightDate.hashARM64 = hashARM64 qwilightDate.hashX64 = hashAMD64 - Files.newBufferedWriter(qwilightDateFilePath).use { + Files.newBufferedWriter(dateFilePath).use { jm.writerWithDefaultPrettyPrinter().writeValue(it, qwilightDate) } send204(ctx) diff --git a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt index 2bf5319..14248a5 100644 --- a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt @@ -1139,13 +1139,13 @@ EventOuterClass.Event.EventID.POST_FILE -> wantEstablished { logFuture { - val tmpPath = Configure.path.tmpPath.resolve( + val filesPath = Path.of("files").resolve( RandomStringUtils.randomAlphanumeric(8) + "." + eventText ) - Files.write(Configure.path.wwwPath.resolve(tmpPath), eventData[0].toByteArray()) + Files.write(Configure.path.wwwPath.resolve(filesPath), eventData[0].toByteArray()) send( - EventOuterClass.Event.EventID.POST_FILE, "${Configure.www.remote}/${ - tmpPath.toString().replace(" ".toRegex(), "%20") + EventOuterClass.Event.EventID.POST_FILE, "https://taehui.ddns.net/qwilight${ + filesPath.toString().replace(" ".toRegex(), "%20") }" ) } diff --git a/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt b/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt index c968022..60f3132 100644 --- a/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt @@ -26,6 +26,7 @@ import java.net.InetSocketAddress import java.net.UnknownHostException import java.nio.file.Files +import java.nio.file.Path import java.time.LocalDateTime import java.util.* @@ -201,13 +202,13 @@ EventOuterClass.Event.EventID.POST_FILE -> wantEstablished { logFuture { val data = event.getData(0).toByteArray() - val tmpPath = Configure.path.tmpPath.resolve( + val filesPath = Path.of("files").resolve( "${RandomStringUtils.randomAlphanumeric(8)}.$eventText" ) - Files.write(Configure.path.wwwPath.resolve(tmpPath), data) + Files.write(Configure.path.wwwPath.resolve(filesPath), data) send( - EventOuterClass.Event.EventID.POST_FILE, "${Configure.www.remote}/${ - tmpPath.toString().replace(" ".toRegex(), "%20") + EventOuterClass.Event.EventID.POST_FILE, "https://taehui.ddns.net/qwilight${ + filesPath.toString().replace(" ".toRegex(), "%20") }" ) } diff --git a/src/main/kotlin/net/taehui/twilight/system/Configure.kt b/src/main/kotlin/net/taehui/twilight/system/Configure.kt index 546be5a..3586e92 100644 --- a/src/main/kotlin/net/taehui/twilight/system/Configure.kt +++ b/src/main/kotlin/net/taehui/twilight/system/Configure.kt @@ -6,7 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper import net.taehui.twilight.Logger import net.taehui.twilight.TwilightComponent -import java.io.IOException import java.lang.reflect.Modifier import java.nio.file.Files import java.nio.file.Path @@ -18,38 +17,14 @@ @JvmField var www = "" - @JvmField - var tmp = "" - - @JvmField - var date = "" - @JsonIgnore lateinit var wwwPath: Path - @JsonIgnore - lateinit var tmpPath: Path - - @JsonIgnore - lateinit var datePath: Path - @JsonSetter fun setWww(www: String) { this.www = www wwwPath = Paths.get(www) } - - @JsonSetter - fun setTmp(tmp: String) { - this.tmp = tmp - tmpPath = Paths.get(tmp) - } - - @JsonSetter - fun setDate(date: String) { - this.date = date - datePath = Paths.get(date) - } } class DBItem { @@ -66,24 +41,6 @@ var avatar = "" } - class JavaCipherStore { - @get:JsonGetter - lateinit var pw0: CharArray - - @get:JsonGetter - lateinit var pw1: CharArray - - @JsonSetter - fun setPw0(pw0: String) { - this.pw0 = pw0.toCharArray() - } - - @JsonSetter - fun setPw1(pw1: String) { - this.pw1 = pw1.toCharArray() - } - } - class Mode { var platform = false var tv = false @@ -95,7 +52,6 @@ class Www { var qwilight = "" var taehui = "" - var remote = "" } class NHN { @@ -106,7 +62,6 @@ lateinit var path: PathItem lateinit var db: DBItem lateinit var fax: FaxItem - lateinit var javaCipherStore: JavaCipherStore var hash = mutableSetOf() lateinit var mode: Mode lateinit var www: Www