From 645acc44aa077c8ed3b0e7ca783ead3086dfddfd Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Thu, 2 Nov 2023 13:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=84=9F=E7=99=BB=E5=BD=95=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=94=B9=E4=B8=BA30=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository_manage/controller/PageController.java | 6 ++++-- .../service/impl/QyWxOperationService.java | 5 ++++- .../templates/pages/application/application-review.html | 2 +- .../templates/pages/scanQrCode/ScanBarOrQrCodeOut.html | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index bedf1af9..7fe7d6b4 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -216,22 +216,24 @@ public class PageController { String time1 = (String)request.getParameter("time"); if (null != userkey1 && userkey1.length() != 0 && null != usertoken1 && usertoken1.length() != 0 && null != sing1 && sing1.length() != 0 && null != time1 && time1.length() != 0){ long time1Long = Long.parseLong(time1); + long timeDifference = javaTime-time1Long; // 将时间戳转换为LocalDateTime对象 LocalDateTime dateTime1 = LocalDateTime.ofInstant(Instant.ofEpochMilli(javaTime), ZoneId.systemDefault()); LocalDateTime dateTime2 = LocalDateTime.ofInstant(Instant.ofEpochMilli(time1Long), ZoneId.systemDefault()); // 计算时间差 - Duration duration = Duration.between(dateTime2, dateTime1); + Duration duration = Duration.between(dateTime1, dateTime2);//上线使用,真正校验时间 //Duration duration = Duration.between(dateTime1, dateTime2); // 获取时间差的毫秒数 long diffMillis = duration.toMillis(); /*System.out.println(dateTime1); System.out.println(dateTime2); System.out.println(diffMillis);*/ - if(diffMillis<5000){//如果间隔时间不超过5秒 + if(timeDifference<30000){//如果间隔时间不超过5秒 String singJava = Md5Util.md5InsensibleLogin(userkey1, usertoken1, time1); if(sing1.equals(singJava)){//校验通过允许无感登录 flag = true; }else{ + //验证失败-密钥与key,token,time不匹配 msg = "验证失败"; } }else{ diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index 80cdf2e5..e4362fa1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -1514,7 +1514,10 @@ public class QyWxOperationService { } // 将申请人添加到抄送列表 - notifyerList.add(workwechat); + if(null != workwechat && !workwechat.equals("")){ + notifyerList.add(workwechat); + } + // 设置申请人 approvalTemplate.setCreator_userid(workwechat); diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index f9ea46f7..90f1690f 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -92,7 +92,7 @@
diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index 10123cc6..e7c36210 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -86,7 +86,7 @@ });*/ - var result = "1207080357";//当needResult为1时返回处理结果 1701795870830534656 + var result = "1201020003";//当needResult为1时返回处理结果 1701795870830534656 var req = {}; req.qrCode = result; outboundLogic(req); @@ -293,7 +293,7 @@ } })*/ // 回调 - var result = '1641260862546419712';//1638091255811710976当needResult为1时返回处理结果1641262864907149312 + var result = '1648852836191346688';//1638091255811710976当needResult为1时返回处理结果1641262864907149312 var req = {}; req.qrCode = result; outboundLogic(req);