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 de49e4e..bf7a7dc 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/api/HoperunDakaController.kt @@ -3,10 +3,7 @@ package com.pomelotea.hoperun.sign.api import com.alibaba.fastjson.JSON import com.alibaba.fastjson.JSONObject import com.alibaba.fastjson.TypeReference -import com.pomelotea.hoperun.sign.api.model.AttendancesDetail -import com.pomelotea.hoperun.sign.api.model.AttendancesDetailResponse import com.pomelotea.hoperun.sign.common.* -import com.pomelotea.hoperun.sign.config.HoperunUserConfig import com.pomelotea.hoperun.sign.config.HoperunUserConfig.deviceMap import com.pomelotea.hoperun.sign.config.HoperunUserConfig.getUserConfig import com.pomelotea.hoperun.sign.config.HoperunUserConfig.userConfigMap @@ -17,7 +14,6 @@ import okhttp3.FormBody import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody -import org.jsoup.Jsoup import org.springframework.web.bind.annotation.* import java.text.SimpleDateFormat import java.util.* @@ -35,7 +31,7 @@ import java.util.* @RequestMapping("/api/daka") class HoperunSignController { - val LOGIN_URL = "http://pom.hoperun.com:8187/attm/login/login" + init { AutoDakaScheduler() @@ -61,7 +57,7 @@ class HoperunSignController { }*/ val userConfig = getUserConfig(employeeNo).let { - oldLogin(employeeNo) + defaultLogin(employeeNo) getUserConfig(employeeNo) } userConfig ?: return WebResult.getFailed("登陆失败") @@ -145,13 +141,6 @@ class HoperunSignController { return WebResult.getSuccess(JSONObject.parseObject(result, DakaResponse::class.java)) } - private fun getJsessionIdAutoLogin(employeeNo: String, jsessionId: String): String? { - if (sessionMap.get(employeeNo) == null) { - login(employeeNo, jsessionId) - } - sessionMap[employeeNo] = jsessionId - return sessionMap.get(employeeNo) - } /** * 查询近两个月的 @@ -194,30 +183,11 @@ class HoperunSignController { object : TypeReference?>() {}) } - private fun login(employeeNo: String, jsessionId: String) { - // 读取员工姓名 - if (userConfigMap[employeeNo]?.username == null) { - setUserConfig(employeeNo, jsessionId) - } + private fun defaultLogin(employeeNo: String) { + resetJSessionId(employeeNo) + setUserConfig(employeeNo) } - - private fun oldLogin(employeeNo: String) { - val jsessionId: String? - val loginRequest = Request.Builder() - .url(LOGIN_URL) - .post( - FormBody.Builder() - .add("login_id", padEmployeeNumber(employeeNo)) - .add("password", "123456") - .build() - ) - .build() - val response = client.newCall(loginRequest).execute() - jsessionId = response.request.url.pathSegments[2].substring(19) - sessionMap.put(employeeNo, jsessionId) - setUserConfigOld(employeeNo) - } - +/* private fun setUserConfig(employeeNo: String, jsessionId: String) { val attendancesDetailRequest = Request.Builder() .url("http://pom.hoperun.com:8187/attm/calendar/monthAtt?staff_code=${padEmployeeNumber(employeeNo)}&yearmonth=${getNowDateyyyy_MM()}-01") @@ -227,7 +197,7 @@ class HoperunSignController { "User-Agent", "Qing/0.9.113;iOS 16.4.1;Apple;iPhone13,2;deviceId:a8baf66f-fdeb-4f4d-b1e5-9fafcd5045b6;deviceName:iOS;clientId:10200;os:iOS 16.3.1;brand:Apple;model:iPhone13,2;lang:zh-CN;fontNum:0;fontScale:1.0;ver:10.7.14;Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" ) - .addHeader("accept", "*/*") + .addHeader("accept", "*") .addHeader("Origin", "http://pom.hoperun.com:8187") .addHeader("Referer", "http://pom.hoperun.com:8187/attm/attence/getInfo") .addHeader("content-type", "application/x-www-form-urlencoded; charset=UTF-8") @@ -263,7 +233,7 @@ class HoperunSignController { "User-Agent", "Qing/0.9.113;iOS 16.3.1;Apple;iPhone13,2;deviceId:a8baf66f-fdeb-4f4d-b1e5-9fafcd5045b6;deviceName:iOS;clientId:10200;os:iOS 16.3.1;brand:Apple;model:iPhone13,2;lang:zh-CN;fontNum:0;fontScale:1.0;ver:10.7.14;Mozilla/5.0 (iPhone; CPU iPhone OS 16_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148" ) - .addHeader("accept", "*/*") + .addHeader("accept", "*") .addHeader("Origin", "http://pom.hoperun.com:8187") .addHeader("Referer", "http://pom.hoperun.com:8187/attm/attence/getInfo") .addHeader("content-type", "application/x-www-form-urlencoded; charset=UTF-8") @@ -278,10 +248,10 @@ class HoperunSignController { HoperunUserConfig.addUserConfig( employeeNo, userConfig ) - } + }*/ - private fun setUserConfigOld(employeeNo: String) { + private fun setUserConfig(employeeNo: String) { // 获取deviceua val loginRequest = Request.Builder() .url("http://pom.hoperun.com:8187/attp/login/login.do") diff --git a/src/main/kotlin/com/pomelotea/hoperun/sign/common/Common.kt b/src/main/kotlin/com/pomelotea/hoperun/sign/common/Common.kt index 126fe60..e17d289 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/common/Common.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/common/Common.kt @@ -9,6 +9,7 @@ import com.pomelotea.hoperun.sign.config.HoperunUserConfig.getUserConfig import com.pomelotea.hoperun.sign.config.UserConfig import com.pomelotea.hoperun.sign.holidays import com.pomelotea.hoperun.sign.workdays +import okhttp3.FormBody import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.OkHttpClient import okhttp3.Request @@ -160,6 +161,22 @@ fun endTimeHoperunDakaRequest( return hoperunDakaRequest } +const val LOGIN_URL = "http://pom.hoperun.com:8187/attm/login/login" +fun resetJSessionId(employeeNo: String) { + val jsessionId: String? + val loginRequest = Request.Builder() + .url(LOGIN_URL) + .post( + FormBody.Builder() + .add("login_id", padEmployeeNumber(employeeNo)) + .add("password", "123456") + .build() + ) + .build() + val response = client.newCall(loginRequest).execute() + jsessionId = response.request.url.pathSegments[2].substring(19) + sessionMap.put(employeeNo, jsessionId) +} fun randowSecond(): String { val second = Random().nextInt(59) 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 9a186e5..db1d6f9 100644 --- a/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt +++ b/src/main/kotlin/com/pomelotea/hoperun/sign/scheduler/AutoDakaScheduler.kt @@ -4,12 +4,14 @@ 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 com.pomelotea.hoperun.sign.logger +import org.slf4j.Logger +import org.slf4j.LoggerFactory import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.* import java.util.concurrent.Executors import java.util.concurrent.ScheduledExecutorService +import java.util.concurrent.ScheduledThreadPoolExecutor import java.util.concurrent.TimeUnit /** @@ -25,11 +27,12 @@ class AutoDakaScheduler { val schedulerThreadPool: ScheduledExecutorService = Executors.newScheduledThreadPool(10) init { - timeThreadPool.scheduleAtFixedRate({addAutoDakaScheduled()}, 1, 60, TimeUnit.MINUTES) + timeThreadPool.scheduleAtFixedRate({ addAutoDakaScheduled() }, 1, 60, TimeUnit.MINUTES) } companion object { val dakaQueue: MutableList = LinkedList() + val logger: Logger = LoggerFactory.getLogger("DAKA-SHCEDULER") } fun addAutoDakaScheduled(dakaDate: String = getNowDateyyyy_MM_dd()) { @@ -48,39 +51,77 @@ class AutoDakaScheduler { } } - dakaQueue.filter { !it.added }.forEach { - it.added = true - val beginDate = LocalDateTime.parse(it.dakaDate + "T" + it.beginTime + ":" + randowSecond(), DateTimeFormatter.ISO_LOCAL_DATE_TIME) - val endDate = LocalDateTime.parse(it.dakaDate + "T" + it.endTime + ":" + randowSecond(), DateTimeFormatter.ISO_LOCAL_DATE_TIME) - val beginSeconds = beginDate.toEpochSecond(DEFAULT_ZONE) - (System.currentTimeMillis() / 1000) - val endSeconds = endDate.toEpochSecond(DEFAULT_ZONE) - (System.currentTimeMillis() / 1000) - if (beginSeconds > 0) { - logger.info("[ADD-SCHEDULE]BEGIN:${it.employeeNo}:DATE:${it.dakaDate}TIME:${it.beginTime}") - schedulerThreadPool.schedule({beginDaka(it)}, beginSeconds, TimeUnit.SECONDS) - } - if (endSeconds > 0) { - logger.info("[ADD-SCHEDULE]END:${it.employeeNo}:DATE:${it.dakaDate}TIME:${it.endTime}") - schedulerThreadPool.schedule({endDaka(it)}, endSeconds, TimeUnit.SECONDS) + dakaQueue.forEach { + if (!it.added) { + it.added = true + val beginDate = LocalDateTime.parse( + it.dakaDate + "T" + it.beginTime + ":" + randowSecond(), + DateTimeFormatter.ISO_LOCAL_DATE_TIME + ) + val endDate = LocalDateTime.parse( + it.dakaDate + "T" + it.endTime + ":" + randowSecond(), + DateTimeFormatter.ISO_LOCAL_DATE_TIME + ) + val beginSeconds = beginDate.toEpochSecond(DEFAULT_ZONE) - (System.currentTimeMillis() / 1000) + val endSeconds = endDate.toEpochSecond(DEFAULT_ZONE) - (System.currentTimeMillis() / 1000) + if (beginSeconds > 0) { + logger.info("[ADD-SCHEDULE]BEGIN:${it.employeeNo}:DATE:${it.dakaDate}TIME:${it.beginTime}") + schedulerThreadPool.schedule({ beginDaka(it) }, beginSeconds, TimeUnit.SECONDS) + } + if (endSeconds > 0) { + 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) -// schedulerThreadPool.schedule({ endDaka(it) }, 5, TimeUnit.SECONDS) +// schedulerThreadPool.schedule({ endDaka(it) }, 10, TimeUnit.SECONDS) } dakaQueue.removeIf { it.dakaDate.compareTo(dakaDate) == -1 } + printScheduler() + dakaQueue.forEach { + logger.info("Task: ${it.toCsv()}") + } } private fun beginDaka(daka: Daka) { // println("begin:${daka.toCsv()}") - 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()) + try { + logger.info("[EXECUTE]BEGIN:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.beginTime}") + // 模拟重新登录打卡 + logger.info("${daka.employeeNo}OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}") + resetJSessionId(employeeNo = 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") { + logger.error("打上班卡失败") + } else { + logger.info("打上班卡成功") + } + } catch (e: Exception) { + logger.error(e.message, e) + } + } private fun endDaka(daka: Daka) { // println("end:${daka.toCsv()}") - 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()) + try { + logger.info("[EXECUTE]END:${daka.employeeNo}:DATE:${daka.dakaDate}:TIME:${daka.endTime}") + // 模拟重新登录打卡 + logger.info("${daka.employeeNo}OLD-JSESSIONID: ${sessionMap[daka.employeeNo]}") + resetJSessionId(employeeNo = 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("打下班卡失败") + } else { + logger.info("打下班卡成功") + } + } catch (e: Exception) { + logger.error(e.message, e) + } } private fun generateDakaInfo(userConfig: UserConfig, dakaDate: String): Daka { @@ -92,8 +133,14 @@ class AutoDakaScheduler { ) } + fun printScheduler() { + schedulerThreadPool as ScheduledThreadPoolExecutor + val queue = schedulerThreadPool.queue + logger.info("任务队列数量: ${queue.size}") + } + private fun getRandomEndTime(): String { - val hourArray = intArrayOf(18, 19, 20, 21, 22, 23, 20, 21, 22, 19, 18, 20) + val hourArray = intArrayOf(18, 19, 20, 21, 22, 23, 19, 20, 20, 19, 18, 20) val randomHour = hourArray[Math.round(Math.random() * 9).toInt()] val randomMinute = if (randomHour == 18) { 30 + Random().nextInt(19) diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index c7d5795..d46ac36 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -58,18 +58,19 @@ - - + + + true ${logging.level} ACCEPT DENY - ${logging.path}/rest.log + ${logging.path}/scheduler.log ${logging.size} - ${logging.path}/rest.log.%d{yyyy-MM-dd}.%i + ${logging.path}/scheduler.log.%d{yyyy-MM-dd}.%i ${logging.maxHistory} @@ -78,14 +79,6 @@ - - - 256 - 0 - true - - - @@ -93,37 +86,20 @@ + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - -