🆗 增加定时打卡前模拟重新登录

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<List<MonthAttLog>?>() {})
     }
 
-    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")