diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt index 1a7533f..f970fc2 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/DakaApplication.kt @@ -1,5 +1,6 @@ package com.pomelotea.hoperun.sign +import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.boot.SpringApplication import org.springframework.boot.autoconfigure.SpringBootApplication @@ -17,6 +18,9 @@ import java.util.* open class DakaApplication { } +val T.logger: Logger + get() = LoggerFactory.getLogger(this::class.java) + val holidays: List = listOf( "2023-04-05", "2023-04-29", "2023-04-30", "2023-05-01", "2023-05-01", "2023-05-03", diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt index 501987a..de49e4e 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt @@ -364,7 +364,13 @@ data class DakaResponse( var result: String? = null, var comment: String? = null, var data: String? = null -) + + +) { + override fun toString(): String { + return "DakaResponse(result=$result, comment=$comment, data=$data)" + } +} class WebResult protected constructor() : java.io.Serializable { var data: T? = null diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt index aca48e4..9a186e5 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt @@ -1,11 +1,10 @@ package com.pomelotea.hoperun.sign.scheduler +import com.pomelotea.hoperun.sign.api.DakaResponse import com.pomelotea.hoperun.sign.common.* import com.pomelotea.hoperun.sign.config.HoperunUserConfig import com.pomelotea.hoperun.sign.config.UserConfig -import java.io.BufferedWriter -import java.io.File -import java.io.OutputStreamWriter +import com.pomelotea.hoperun.sign.logger import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.* @@ -22,13 +21,6 @@ import java.util.concurrent.TimeUnit **/ class AutoDakaScheduler { - val outFile = File("./daka.log") - val bw: BufferedWriter = BufferedWriter(OutputStreamWriter(outFile.outputStream())) - - val logFile = File("./scheduler.log") - val logBw: BufferedWriter = BufferedWriter(OutputStreamWriter(logFile.outputStream())) - - val timeThreadPool: ScheduledExecutorService = Executors.newScheduledThreadPool(1) val schedulerThreadPool: ScheduledExecutorService = Executors.newScheduledThreadPool(10) @@ -51,9 +43,7 @@ class AutoDakaScheduler { daka = generateDakaInfo(v, dakaDate) dakaQueue.add(daka) } - bw.write("${v.username},${daka.toCsv()}") - bw.newLine() - bw.flush() + logger.info("${v.username},${daka.toCsv()}") } } } @@ -65,15 +55,11 @@ class AutoDakaScheduler { val beginSeconds = beginDate.toEpochSecond(DEFAULT_ZONE) - (System.currentTimeMillis() / 1000) val endSeconds = endDate.toEpochSecond(DEFAULT_ZONE) - (System.currentTimeMillis() / 1000) if (beginSeconds > 0) { - logBw.write("[ADD-SCHEDULE]BEGIN:${it.employeeNo}:DATE:${it.dakaDate}TIME:${it.beginTime}") - logBw.newLine() - logBw.flush() + logger.info("[ADD-SCHEDULE]BEGIN:${it.employeeNo}:DATE:${it.dakaDate}TIME:${it.beginTime}") schedulerThreadPool.schedule({beginDaka(it)}, beginSeconds, TimeUnit.SECONDS) } if (endSeconds > 0) { - logBw.write("[ADD-SCHEDULE]END:${it.employeeNo}:DATE:${it.dakaDate}TIME:${it.endTime}") - logBw.newLine() - logBw.flush() + logger.info("[ADD-SCHEDULE]END:${it.employeeNo}:DATE:${it.dakaDate}TIME:${it.endTime}") schedulerThreadPool.schedule({endDaka(it)}, endSeconds, TimeUnit.SECONDS) } // schedulerThreadPool.schedule({beginDaka(it)}, 5, TimeUnit.SECONDS) @@ -85,18 +71,16 @@ class AutoDakaScheduler { private fun beginDaka(daka: Daka) { // println("begin:${daka.toCsv()}") - logBw.write("[EXECUTE]BEGIN:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.beginTime}") - logBw.newLine() - logBw.flush() - beginTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.beginTime) + logger.info("[EXECUTE]BEGIN:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.beginTime}") + val resp: DakaResponse = beginTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.beginTime) + logger.info(resp.toString()) } private fun endDaka(daka: Daka) { // println("end:${daka.toCsv()}") - logBw.write("[EXECUTE]END:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.endTime}") - logBw.newLine() - logBw.flush() - endTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.endTime) + logger.info("[EXECUTE]END:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.endTime}") + val resp: DakaResponse = endTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.endTime) + logger.info(resp.toString()) } private fun generateDakaInfo(userConfig: UserConfig, dakaDate: String): Daka { diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoRenewSessionScheduler.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoRenewSessionScheduler.kt index 2074581..03cdc35 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoRenewSessionScheduler.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoRenewSessionScheduler.kt @@ -2,11 +2,9 @@ package com.pomelotea.hoperun.sign.scheduler import com.pomelotea.hoperun.sign.common.client import com.pomelotea.hoperun.sign.common.sessionMap +import com.pomelotea.hoperun.sign.logger import okhttp3.Request import org.jsoup.Jsoup -import java.io.BufferedWriter -import java.io.File -import java.io.OutputStreamWriter import java.util.* import java.util.concurrent.Executors import java.util.concurrent.ScheduledExecutorService @@ -21,9 +19,6 @@ import java.util.concurrent.TimeUnit **/ class AutoRenewSessionScheduler { - val outFile = File("./renewsession.log") - val bw: BufferedWriter = BufferedWriter(OutputStreamWriter(outFile.outputStream())) - val schedulerThreadPool: ScheduledExecutorService = Executors.newScheduledThreadPool(1) init { @@ -37,13 +32,9 @@ class AutoRenewSessionScheduler { item.value?.let { val result = index(it) if (result != null) { - bw.write("[RENEW-SESSION]:SUCCESS:USER:$result") - bw.newLine() - bw.flush() + logger.info("[RENEW-SESSION]:SUCCESS:USER:$result") } else { - bw.write("[REMOVE-SESSION]:USER:$result") - bw.newLine() - bw.flush() + logger.info("[REMOVE-SESSION]:USER:$result") iterator.remove() } } diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 16fc349..92ed7c9 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8082 hoperun: address: "浙江省杭州市西湖区转塘街道凌家桥路飞天园区120" diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 353d123..677f0b8 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8082 error: path: /error