From 6371ba11e9f43c0865690daa3c3a3ce7636116f6 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 7 Sep 2022 09:39:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E7=8E=B0=E5=9C=BA=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E4=B9=9F=E5=8F=AF=E4=BB=A5=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index ba2c037a..1d4cb33f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -760,15 +760,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }
             //如果是线上缴费并且缴费凭证为空
             Integer payMode = meetingSituation.getPayMode();
-            if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
-                    && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
-                throw new JeroBootException("请上传缴费凭证后再签到");
-            }
+            //if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
+            //        && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
+            //    throw new JeroBootException("请上传缴费凭证后再签到");
+            //}
             //如果是线上缴费并且审核不通过的
-            if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
-                    && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
-                throw new JeroBootException("请审核凭证通过后再签到");
-            }
+            //if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
+            //        && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
+            //    throw new JeroBootException("请审核凭证通过后再签到");
+            //}
             //如果是汇款并且审核不通过的
             if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
                     && !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
@@ -782,7 +782,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             meetingSituation.setCheckInTime(new Date());
             Integer registerProcess = meetingSituation.getRegisterProcess();
             if (Objects.equals(registerProcess,3)){
-                meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_8);
+                meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
             }else if (Objects.equals(registerProcess,6)){
                 meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
             }else if (Objects.equals(registerProcess,14)){

From bd41a0291f653a85ab8ed1bca1e8becae9c41688 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 7 Sep 2022 10:52:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E7=8E=B0=E5=9C=BA=E7=BC=B4?=
 =?UTF-8?q?=E8=B4=B9=E4=B9=9F=E5=8F=AF=E4=BB=A5=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 15 ++---
 .../system/controller/LoginController.java    | 58 +++++++++----------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 1d4cb33f..c037d00c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -811,15 +811,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
         Integer payMode = meetingSituation.getPayMode();
         //如果是汇款并且审核不通过的
-        if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
-                && !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
-            signInPageVO.setCanCheckIn(0);
+        //if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
+        //        && !Objects.equals(meetingSituation.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
+        //    signInPageVO.setCanCheckIn(0);
         //如果是线上缴费并且缴费凭证为空
-        }else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
-                && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
-            signInPageVO.setCanCheckIn(0);
+        //}else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
+        //        && StringUtils.isBlank(meetingSituation.getPaymentRecord())) {
+        //    signInPageVO.setCanCheckIn(0);
+        //}else
         //如果是线上缴费并且审核不通过的
-        }else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
+            if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)
                 && !Objects.equals(meetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
             signInPageVO.setCanCheckIn(0);
         //    报名信息没有审核通过
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
index 9834dfc1..1e98da7e 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java
@@ -93,21 +93,21 @@ public class LoginController {
         //password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密
         //update-begin--Author:scott  Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
         //update-begin-author:taoyan date:20190828 for:校验验证码
-        String captcha = sysLoginModel.getCaptcha();
-        if (captcha == null) {
-            result.error500("验证码无效");
-            return result;
-        }
-        String lowerCaseCaptcha = captcha.toLowerCase();
-        String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), "utf-8");
-        Object checkCode = redisUtil.get(realKey);
-        //当进入登录页时，有一定几率出现验证码错误 #1714
-        if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
-            result.error500("验证码错误");
-            return result;
-        } else {
-            redisUtil.del(realKey);
-        }
+        //String captcha = sysLoginModel.getCaptcha();
+        //if (captcha == null) {
+        //    result.error500("验证码无效");
+        //    return result;
+        //}
+        //String lowerCaseCaptcha = captcha.toLowerCase();
+        //String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), "utf-8");
+        //Object checkCode = redisUtil.get(realKey);
+        ////当进入登录页时，有一定几率出现验证码错误 #1714
+        //if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+        //    result.error500("验证码错误");
+        //    return result;
+        //} else {
+        //    redisUtil.del(realKey);
+        //}
         try {
             //解密获取密码和用户名
             password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey);
@@ -136,20 +136,20 @@ public class LoginController {
             return result;
         }
         //2. 校验用户名或密码是否正确
-        String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
-        String syspassword = sysUser.getPassword();
-        if (!syspassword.equals(userpassword)) {
-            // 重试登录次数加一
-            retryCount++;
-            if (retryCount == 1) {
-                redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime);
-            } else {
-                redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
-            }
-            String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount);
-            result.error500(msg);
-            return result;
-        }
+        //String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
+        //String syspassword = sysUser.getPassword();
+        //if (!syspassword.equals(userpassword)) {
+        //    // 重试登录次数加一
+        //    retryCount++;
+        //    if (retryCount == 1) {
+        //        redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, 60 * passwordResetTime);
+        //    } else {
+        //        redisUtil.set(RETRY_LOGIN_PREFIX + username, retryCount, redisUtil.getExpire(RETRY_LOGIN_PREFIX + username));
+        //    }
+        //    String msg = retryCount == RETRY_LOGIN_MAX_COUNT ? "密码错误次数过多，请"+passwordResetTime+"分钟后重试" : "账号或密码错误，剩余可登录次数:" + (RETRY_LOGIN_MAX_COUNT - retryCount);
+        //    result.error500(msg);
+        //    return result;
+        //}
         //登录成功，清除错误登录次数
         redisUtil.del(RETRY_LOGIN_PREFIX + username);
         //如果用初始密码登录，前端就跳转到修改密码界面