From 7aa9607492e2c0b70838c53083f5362e49e74f44 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 26 九月 2023 21:39:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 13 ++++++-------
1 files changed, 6 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..4ff330d 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
@@ -189,13 +189,12 @@
}
}
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";
+ }
GetTokenRequest tokenRequest = new GetTokenRequest();
--
Gitblit v1.7.1