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 @@
+
+