diff --git a/.gitignore b/.gitignore index d5119de..eaf2157 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ buildNumber.properties .idea/jarRepositories.xml .idea/compiler.xml .idea/libraries/ +.idea/* *.iws *.iml *.ipr @@ -42,6 +43,7 @@ buildNumber.properties # Log file *.log +*.log.gz # BlueJ files *.ctxt diff --git a/src/main/java/com/dx/union/CheckLogin.java b/src/main/java/com/dx/union/CheckLogin.java index 9bdaf3f..75ab8a2 100644 --- a/src/main/java/com/dx/union/CheckLogin.java +++ b/src/main/java/com/dx/union/CheckLogin.java @@ -80,18 +80,18 @@ public class CheckLogin { boolean isSignSuccess = sign(user, singMark); if (isSignSuccess) { log.info("{} 账号打卡成功", user.getUsername()); + String sign_time = DateUtil.date().toString(); + if (isMorning) { + user.setIsStartWorkSign(sign_time); + } else { + if (StrUtil.isEmpty(user.getIsStartWorkSign())) { + user.setIsStartWorkSign(""); + } + user.setIsEndWorkSign(sign_time); + } } else { log.error("{} 账号打卡失败", user.getUsername()); } - String sign_time = DateUtil.date().toString(); - if (isMorning) { - user.setIsStartWorkSign(sign_time); - } else { - if (StrUtil.isEmpty(user.getIsStartWorkSign())) { - user.setIsStartWorkSign(""); - } - user.setIsEndWorkSign(sign_time); - } if (index + 1 == size) { return; } @@ -116,9 +116,11 @@ public class CheckLogin { public static boolean sign(User user, Integer signMark) { boolean result = false; try { - log.info("开始{}打卡 {} 的账号,密码为:{}", signMark == 0 ? "上班" : "下班", user.getUsername(), user.getPassword()); - String password = encrypt2ToMD5(user.getPassword()); + HttpRequest.getCookieManager().getCookieStore().removeAll(); String username = user.getUsername(); + String password = user.getPassword(); + log.info("开始{}打卡 {} 的账号,密码为:{}", signMark == 0 ? "上班" : "下班", username, password); + password = encrypt2ToMD5(password); log.info("加密密码为:{}", password); String body = HttpRequest.post("https://login.oa.unionpay.com/idsapi/portal/Login") .form("username", username) @@ -141,14 +143,24 @@ public class CheckLogin { return false; } String thirdToken = thirdBodyJson.getStr("localToken"); - String resultBody = HttpRequest.post("http://oms.oa.unionpay.com/prod-api/atds/ds/" + signMark) + 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) .header("Authorization", "Bearer " + thirdToken) + .header("ssoToken", ssoToken) .execute().body(); JSONObject signJson = JSONUtil.parseObj(resultBody); if ("200".equals(signJson.getStr("code"))) { String signDateTime = DateUtil.formatDateTime(signJson.getDate("data")); result = true; - log.info("{} 打卡时间 {}", user.getUsername(), signDateTime); + log.info("{} 打卡时间 {}", username, signDateTime); } else { log.error("签到接口出错 {}", resultBody); }