From fdc23e432600c4a07f449489389b73bcdf17e445 Mon Sep 17 00:00:00 2001
From: Jimgo <li@2ha.me>
Date: Wed, 26 Mar 2025 10:56:21 +0800
Subject: [PATCH] =?UTF-8?q?:ok:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hoperun/sign/scheduler/AutoDakaScheduler.kt      | 12 ++++++------
 src/main/resources/logback-spring.xml                |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

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 ad370a0..632152e 100644
--- a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt
+++ b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt
@@ -35,7 +35,7 @@ class AutoDakaScheduler {
         val logger: Logger = LoggerFactory.getLogger("DAKA-SHCEDULER")
     }
 
-    fun addAutoDakaScheduled(dakaDate: String = getNowDateyyyy_MM_dd()) {
+    private fun addAutoDakaScheduled(dakaDate: String = getNowDateyyyy_MM_dd()) {
         // 调休的工作日
         if (isNeedDaka(dakaDate)) {
             HoperunUserConfig.userConfigMap.forEach { (_, v) ->
@@ -45,8 +45,8 @@ class AutoDakaScheduler {
                     if (daka == null) {
                         daka = generateDakaInfo(v, dakaDate)
                         dakaQueue.add(daka)
+                        logger.info("${v.username},${daka.toCsv()}")
                     }
-                    logger.info("${v.username},${daka.toCsv()}")
                 }
             }
         }
@@ -89,9 +89,9 @@ class AutoDakaScheduler {
         try {
             logger.info("[EXECUTE]BEGIN:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.beginTime}")
             // 模拟重新登录打卡
-            logger.info("${daka.employeeNo}OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}")
+            logger.info("${daka.employeeNo}-OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}")
             resetJSessionId(employeeNo = daka.employeeNo)
-            logger.info("${daka.employeeNo}NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}")
+            logger.info("${daka.employeeNo}-NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}")
             val resp: DakaResponse =
                 beginTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.beginTime)
             if (resp.result != "success") {
@@ -110,9 +110,9 @@ class AutoDakaScheduler {
         try {
             logger.info("[EXECUTE]END:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.endTime}")
             // 模拟重新登录打卡
-            logger.info("${daka.employeeNo}OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}")
+            logger.info("${daka.employeeNo}-OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}")
             resetJSessionId(employeeNo = daka.employeeNo)
-            logger.info("${daka.employeeNo}NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}")
+            logger.info("${daka.employeeNo}-NEW-JSESSIONID: ${sessionMap[daka.employeeNo]}")
             val resp: DakaResponse = endTime(employeeNo = daka.employeeNo, date = daka.dakaDate, time = daka.endTime)
             if (resp.result != "success") {
                 logger.error("打下班卡失败")
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index d46ac36..3e438ee 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -89,12 +89,14 @@
     <!-- scheduler logger -->
     <logger name="DAKA-SHCEDULER" level="${logging.level}">
         <appender-ref ref="SCHEDULER-APPENDER"/>
+        <appender-ref ref="STDOUT" />
     </logger>
 
     <!-- application logger -->
     <logger name="com.pomelotea.hoperun.sign" level="${logging.level}" additivity="false">
         <appender-ref ref="ROOT-APPENDER"/>
         <appender-ref ref="ERROR-APPENDER"/>
+        <appender-ref ref="STDOUT" />
     </logger>