diff --git a/src/main/kotlin/net/taehui/twilight/QwilightLogging.kt b/src/main/kotlin/net/taehui/twilight/QwilightLogging.kt index ac202d7..15569f3 100644 --- a/src/main/kotlin/net/taehui/twilight/QwilightLogging.kt +++ b/src/main/kotlin/net/taehui/twilight/QwilightLogging.kt @@ -12,16 +12,19 @@ LoggerFactory.getLogger(javaClass).info("[{}] {}", loggerID, toNotify) logFuture { Transport.send(MimeMessage(Session.getDefaultInstance(Properties().apply { - put("mail.smtp.host", "localhost") + put("mail.smtp.host", "smtp.naver.com") + put("mail.smtp.port", "587") + put("mail.smtp.auth", "true") + put("mail.smtp.starttls.enable", "true") }, object : Authenticator() { override fun getPasswordAuthentication(): PasswordAuthentication { - return PasswordAuthentication(Configure.fax.avatar, Configure.fax.auth) + return PasswordAuthentication(Configure.nhn.smtpID, Configure.nhn.smtpPw) } })).apply { - setFrom(InternetAddress("Qwilight")) + setFrom(InternetAddress("${Configure.nhn.smtpID}@naver.com")) addRecipient( Message.RecipientType.TO, - InternetAddress(Configure.fax.remote) + InternetAddress("${Configure.nhn.smtpID}@naver.com") ) subject = loggerID setText(toNotify) diff --git a/src/main/kotlin/net/taehui/twilight/Twilight.kt b/src/main/kotlin/net/taehui/twilight/Twilight.kt index 9967dac..71b96ca 100644 --- a/src/main/kotlin/net/taehui/twilight/Twilight.kt +++ b/src/main/kotlin/net/taehui/twilight/Twilight.kt @@ -11,6 +11,7 @@ import java.net.BindException import java.net.InetSocketAddress import java.nio.channels.DatagramChannel +import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Paths import kotlin.io.path.absolute @@ -47,6 +48,7 @@ NioEventLoopGroup().use { eventLoopGroup -> Configure.loadConfigure() + DB.loadDB() AvatarIPSystem.loadAvatarIP() diff --git a/src/main/kotlin/net/taehui/twilight/system/Configure.kt b/src/main/kotlin/net/taehui/twilight/system/Configure.kt index 3586e92..95665a6 100644 --- a/src/main/kotlin/net/taehui/twilight/system/Configure.kt +++ b/src/main/kotlin/net/taehui/twilight/system/Configure.kt @@ -1,6 +1,5 @@ package net.taehui.twilight.system -import com.fasterxml.jackson.annotation.JsonGetter import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.databind.ObjectMapper @@ -35,12 +34,6 @@ var format = "" } - class FaxItem { - var auth = "" - var remote = "" - var avatar = "" - } - class Mode { var platform = false var tv = false @@ -55,13 +48,14 @@ } class NHN { - var nhnID = "" - var nhnPw = "" + var translationID = "" + var translationPw = "" + var smtpID = "" + var smtpPw = "" } lateinit var path: PathItem lateinit var db: DBItem - lateinit var fax: FaxItem var hash = mutableSetOf() lateinit var mode: Mode lateinit var www: Www diff --git a/src/main/kotlin/net/taehui/twilight/system/Translator.kt b/src/main/kotlin/net/taehui/twilight/system/Translator.kt index 0852830..490b0bd 100644 --- a/src/main/kotlin/net/taehui/twilight/system/Translator.kt +++ b/src/main/kotlin/net/taehui/twilight/system/Translator.kt @@ -43,8 +43,8 @@ loadedTranslatedText.ifEmpty { HttpClients.createDefault().use { val dataPost = HttpPost("https://naveropenapi.apigw.ntruss.com/nmt/v1/translation") - dataPost.setHeader("X-NCP-APIGW-API-KEY-ID", Configure.nhn.nhnID) - dataPost.setHeader("X-NCP-APIGW-API-KEY", Configure.nhn.nhnPw) + dataPost.setHeader("X-NCP-APIGW-API-KEY-ID", Configure.nhn.translationID) + dataPost.setHeader("X-NCP-APIGW-API-KEY", Configure.nhn.translationPw) dataPost.entity = UrlEncodedFormEntity( listOf( BasicNameValuePair("source", textLanguage),