Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/com/dx/union/CheckLogin.java

src/main/java/com/dx/union/CheckLogin.java

@@ -12,6 +12,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import org.apache.logging.log4j.LogManager;
@@ -122,50 +123,43 @@ public class CheckLogin {
             log.info("开始{}打卡 {} 的账号，密码为：{}", signMark == 0 ? "上班" : "下班", username, password);
             password = encrypt2ToMD5(password);
             log.info("加密密码为：{}", password);
-            String body = HttpRequest.post("https://login.oa.unionpay.com/idsapi/portal/Login")
+            try (HttpResponse response = HttpRequest.post("https://login.oa.unionpay.com/idsapi/portal/Login")
                          .form("username", username)
                          .form("password", password)
                          .form("saveUsername", "false")
                          .form("savePassword", "false")
                          .form("loginType", "normal")
                          .form("code", "")
-                    .execute().body();
-            JSONObject data = JSONUtil.parseObj(body).getJSONObject("data");
+                         .execute()) {
+                JSONObject data = JSONUtil.parseObj(response.body()).getJSONObject("data");
                 if (data != null) {
                     String token = data.getStr("token");
                     log.info("认证系统返回token {}", token);
-                String thirdBody = HttpRequest
+                    try (HttpResponse thirdResponse = HttpRequest
                             .get("http://oms.oa.unionpay.com/prod-api/checkTokenThenLogin?personType=0&token=" + token)
-                        .execute().body();
-                JSONObject thirdBodyJson = JSONUtil.parseObj(thirdBody);
+                            .execute()) {
+                        JSONObject thirdBodyJson = JSONUtil.parseObj(thirdResponse.body());
                         if (!"200".equals(thirdBodyJson.getStr("code"))) {
                             log.error("签到系统返回报文出错 {}", thirdBodyJson);
                             return false;
                         }
                         String thirdToken = thirdBodyJson.getStr("localToken");
-                String ssoToken = thirdBodyJson.getStr("ssoToken");
-                // http://oms.oa.unionpay.com/prod-api/atds/gcp/1
-                // String userInfoRes = HttpRequest.get("http://oms.oa.unionpay.com/prod-api/system/user/getUser")
-                //         .header("Authorization", "Bearer " + thirdToken)
-                //         .header("ssoToken", ssoToken)
-                //         .execute().body();
-                // JSONObject userInfoJson = JSONUtil.parseObj(userInfoRes);
-                // log.info("nikename: {}", userInfoJson.getJSONObject("user").getJSONObject("user").getStr("nickName"));
-                String signUrl = "http://oms.oa.unionpay.com/prod-api/atds/ds/" + signMark;
-                String resultBody = HttpRequest.post(signUrl)
+                        try (HttpResponse httpResponse = HttpRequest.post("http://oms.oa.unionpay.com/prod-api/atds/ds/" + signMark)
                                 .header("Authorization", "Bearer " + thirdToken)
-                        .header("ssoToken", ssoToken)
-                        .execute().body();
-                JSONObject signJson = JSONUtil.parseObj(resultBody);
+                                .execute()) {
+                            JSONObject signJson = JSONUtil.parseObj(httpResponse.body());
                             if ("200".equals(signJson.getStr("code"))) {
                                 String signDateTime = DateUtil.formatDateTime(signJson.getDate("data"));
                                 result = true;
-                    log.info("{} 打卡时间 {}", username, signDateTime);
+                                log.info("{} 打卡时间 {}", user.getUsername(), signDateTime);
                             } else {
-                    log.error("签到接口出错 {}", resultBody);
+                                log.error("签到接口出错 {}", signJson);
+                            }
+                        }
                     }
                 } else {
-                log.error("认证系统返回报文出错 {}", body);
+                    log.error("认证系统返回报文出错 {}", response.body());
+                }
             }
         } catch (Exception e) {
             log.error("sign error", e);
@@ -205,13 +199,12 @@ public class CheckLogin {
     /**
      * 利用BiConsumer实现foreach循环支持index
      *
-     * @param biConsumer
-     * @param <T>
-     * @return
      */
     public static <T> Consumer<T> forEachWithIndex(BiConsumer<T, Integer> biConsumer) {
-        /*这里说明一下，我们每次传入forEach都是一个重新实例化的Consumer对象，在lambada表达式中我们无法对int进行++操作,
-        我们模拟AtomicInteger对象，写个getAndIncrement方法，不能直接使用AtomicInteger哦*/
+        /*
+        这里说明一下，我们每次传入forEach都是一个重新实例化的Consumer对象，在lambada表达式中我们无法对int进行++操作,
+        我们模拟AtomicInteger对象，写个getAndIncrement方法，不能直接使用AtomicInteger哦
+        */
         class IncrementInt{
             int i = 0;
             public int getAndIncrement(){