From 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 09:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
index 2883638..1f1e870 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
@@ -68,6 +68,8 @@
*/
@RequestMapping(value = "/", method = RequestMethod.GET)
public String index(Model model) {
+ // 判断是否第一次登录 如果是跳转至修改密码页面
+
model.addAttribute("tips", "");
//获取菜单列表
User user = UserExt.getUser();
@@ -189,13 +191,19 @@
}
}
User user = userService.getByAccount(username);
- // todo 记得该回去!!!!!!!!!!
-// password = AESUtils.decrypt(password);
-// String s = MD5.md5(password);
-// if(!user.getPassword().equals(s)){
-// model.addAttribute("tips", "账号密码错误");
-// return "/login.html";
-// }
+ password = AESUtils.decrypt(password);
+ String s = MD5.md5(password);
+ if(!user.getPassword().equals(s)){
+ model.addAttribute("tips", "账号密码错误");
+ return "/login.html";
+ }
+ if (user.getStatus() == 2){
+ model.addAttribute("tips", "该账号已被冻结");
+ return "/login.html";
+ }else if (user.getStatus() == 3){
+ model.addAttribute("tips", "该账号不存在");
+ return "/login.html";
+ }
GetTokenRequest tokenRequest = new GetTokenRequest();
--
Gitblit v1.7.1