From 6ac6da4613affc18991da068d3dbbb9d84785bbf Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 24 Aug 2023 09:53:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/config/shiro/ShiroRealm.java     |  1 +
 .../controller/CompanyLoginController.java    | 28 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java
index ce2d536a..55bbcab3 100644
--- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java
+++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java
@@ -3,6 +3,7 @@ package com.jero.config.shiro;
 import com.jero.common.constant.enums.LoginType;
 import com.jero.common.constant.enums.LoginUserTypeEnum;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
index bba2f717..39be4cc1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
@@ -182,18 +182,18 @@ public class CompanyLoginController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        //String captcha = sysLoginModel.getCaptcha();
-        //if (captcha == null) {
-        //    result.error500("验证码无效");
-        //    return result;
-        //}
-        //Object checkCode = redisUtil.get("_verification:_phone:" + phone);
-        //if (checkCode == null || !Objects.equals(checkCode,captcha)) {
-        //    result.error500("验证码错误");
-        //    return result;
-        //} else {
-        //    redisUtil.del("_verification:_phone:" + phone);
-        //}
+        /*String captcha = sysLoginModel.getCaptcha();
+        if (captcha == null) {
+            result.error500("验证码无效");
+            return result;
+        }
+        Object checkCode = redisUtil.get("_verification:_phone:" + phone);
+        if (checkCode == null || !Objects.equals(checkCode,captcha)) {
+            result.error500("验证码错误");
+            return result;
+        } else {
+            redisUtil.del("_verification:_phone:" + phone);
+        }*/
 
         //1. 校验用户是否有效
         //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
@@ -384,8 +384,8 @@ public class CompanyLoginController {
         // 生成token
         String token = JwtUtil.sign(phone, syspassword);
         // 设置token缓存有效时间
-        redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-        redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
+        redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + phone, token);
+        redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + phone, JwtUtil.EXPIRE_TIME * 2 / 1000);
 
         JSONObject obj = new JSONObject();
         obj.put("token", token);