From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java | 56 +-------------------------------------------------------
1 files changed, 1 insertions(+), 55 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
index 1e4ac3a..63fdeb0 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -50,11 +50,8 @@
@Autowired
private IUserService userService;
- private Map<String, Long> loginTime = new HashMap<>();
-
private Map<String, Integer> loginFailures = new HashMap<>();
- private List<String> ips = Arrays.asList("127.0.0.1","192.168.0.247");
@@ -121,42 +118,11 @@
*/
@RequestMapping(value = "/login", method = RequestMethod.POST)
public String loginVali(String username, String password, String remember, Model model, HttpServletRequest request) {
- String ip = request.getHeader("x-forwarded-for");
- if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) {
- // 多次反向代理后会有多个ip值，第一个ip才是真实ip
- if (ip.indexOf(",") != -1) {
- ip = ip.split(",")[0];
- }
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("WL-Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("HTTP_CLIENT_IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("HTTP_X_FORWARDED_FOR");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("X-Real-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getRemoteAddr();
- }
- if(!ips.contains(ip)){
- model.addAttribute("tips", "请在特定的网络下使用系统");
- return "/login.html";
- }
-
Integer f = loginFailures.get(username);
f = f == null ? 0 : f;
// 校验账号，密码是否正确，如果错误，对次数进行加1
IShiro shiroFactory = ShiroFactroy.me();
User user = userService.getByAccount(username);
- password = AESUtils.decrypt(password);
if(null == user){
f++;
loginFailures.put(username, f);
@@ -164,9 +130,7 @@
// 校验密码
ShiroUser shiroUser1 = shiroFactory.shiroUser(user);
SimpleAuthenticationInfo info = shiroFactory.info(shiroUser1, user, username);
- System.out.println(info.getCredentials());
String pass = ShiroKit.md5(password, user.getSalt());
- System.out.println(pass);
if(!info.getCredentials().equals(pass)){
f++;
loginFailures.put(username, f);
@@ -176,29 +140,11 @@
if(f==5){
model.addAttribute("number", "5");
}
+ model.addAttribute("message","账号或密码错误!");
return "/login.html";
}
}
model.addAttribute("number", "3");
- /*if(f > 5 ){
- model.addAttribute("tips", "登录次数过多，请等30分钟再试！");
- if (KaptchaUtil.getKaptchaOnOff()) {
- String kaptcha = super.getPara("kaptcha").trim();
- String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
- if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
- throw new InvalidKaptchaException();
- }
- }
- return "/login.html";
- }*/
- //验证验证码是否正确
-// if (KaptchaUtil.getKaptchaOnOff()) {
-// String kaptcha = super.getPara("kaptcha").trim();
-// String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
-// if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
-// throw new InvalidKaptchaException();
-// }
-// }
Subject currentUser = ShiroKit.getSubject();
UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
--
Gitblit v1.7.1