From 78b6b14bc531b9e613fb416520d03ced7d880c59 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 26 四月 2022 11:37:35 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 9 +++++++--
ximon-admin/src/main/java/com/sandu/ximon/admin/security/authcode/VerifyCodeController.java | 13 +++++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 7 +++++--
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index c73e926..d5cbb74 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -23,6 +23,7 @@
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.MenuNode;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -73,10 +74,14 @@
if (admin == null) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
- String session_vcode = (String) request.getSession().getAttribute(loginParam.getKey());
- if (!StrUtil.equalsIgnoreCase(session_vcode, loginParam.getVlue())) {
+// String session_vcode = (String) request.getSession().getAttribute(loginParam.getKey());
+ String s = RedisUtils.getBean().get(loginParam.getKey());
+ System.out.println(s+"===========================");
+ if (!loginParam.getVlue().equals(s)) {
+ log.error(loginParam.getVlue() + "楠岃瘉鐮�");
return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
}
+ RedisUtils.getBean().delete(loginParam.getKey());
if (!passwordEncoder.matches(loginParam.getPassword(), admin.getPassword())) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index d55ae98..0b8b177 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -23,6 +23,7 @@
import com.sandu.ximon.admin.service.ClientRoleRelationService;
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.admin.service.RoleService;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -160,10 +161,12 @@
if (client == null) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
- String session_vcode = (String) request.getSession().getAttribute(loginParam.getKey());
- if (!StrUtil.equalsIgnoreCase(session_vcode, loginParam.getVlue())) {
+ String s = RedisUtils.getBean().get(loginParam.getKey());
+ System.out.println(s+"===========================");
+ if (!loginParam.getVlue().equals(s)) {
return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
}
+ RedisUtils.getBean().delete(loginParam.getKey());
if (!passwordEncoder.matches(loginParam.getPassword(), client.getPassword())) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/authcode/VerifyCodeController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/authcode/VerifyCodeController.java
index 4ffe3ce..5fbc493 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/authcode/VerifyCodeController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/authcode/VerifyCodeController.java
@@ -4,6 +4,7 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.sandu.common.security.annotation.AnonymousAccess;
+import com.sandu.ximon.admin.utils.RedisUtils;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,6 +34,7 @@
public class VerifyCodeController {
private final Snowflake snowflake;
+// private final RedisUtils redisUtils;
@AnonymousAccess
@@ -47,15 +49,18 @@
long key = snowflake.nextId();
ImageVerificationCode ivc = new ImageVerificationCode(); //鐢ㄦ垜浠殑楠岃瘉鐮佺被锛岀敓鎴愰獙璇佺爜绫诲璞�
BufferedImage image = ivc.getImage(); //鑾峰彇楠岃瘉鐮�
- request.getSession().setAttribute(key+"", MD5Util.md5(ivc.getText().toUpperCase())); //灏嗛獙璇佺爜鐨勬枃鏈瓨鍦╯ession涓�
+ System.out.println(ivc.getText()+"----鍔犲瘑鍓嶇殑楠岃瘉鐮�");
+// System.out.println(MD5Util.md5(ivc.getText().toUpperCase())+"----鍔犲瘑鍚庣殑楠岃瘉鐮�");
+ RedisUtils.getBean().set(key+"",MD5Util.md5(ivc.getText().toUpperCase()),60);
+// request.getSession().setAttribute(key+"", MD5Util.md5(ivc.getText().toUpperCase())); //灏嗛獙璇佺爜鐨勬枃鏈瓨鍦╯ession涓�
// ImageVerificationCode.output(image, response.getOutputStream());//灏嗛獙璇佺爜鍥剧墖鍝嶅簲缁欏鎴风
String img = getBufferedImageToBase64(image, "JPEG");
- String session_vcode = (String) request.getSession().getAttribute(key+"");
+// String session_vcode = (String) request.getSession().getAttribute(key+"");
+
Map map = new HashMap();
-// map.put("img", "data:image/jpg;base64,"+png_base64);
map.put("img", img);
- map.put("vlue", session_vcode);
+// map.put("vlue", session_vcode);
map.put("key", key);
return map;
}
--
Gitblit v1.9.3