From a99684a9a4ecbdd71d1c93ef824f7741ff52c5d9 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 16 九月 2023 11:06:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 d1998b7..2883638 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
@@ -101,6 +101,8 @@
User byId = userService.getById(user.getId());
//获取用户头像 Obtain user profile
String avatar = byId.getAvatar();
+ Integer objectType = user.getObjectType();
+
model.addAttribute("roleNames", role.getName());
model.addAttribute("language", language);
model.addAttribute("avatar", avatar);
@@ -113,8 +115,9 @@
return "/index.html";
}
+
/**
- * 跳转到登录页面
+ * 跳转到场地管理页面
*/
@RequestMapping(value = "/login", method = RequestMethod.GET)
public String login() {
@@ -124,7 +127,6 @@
return "/login.html" ;
}
}
-
/**
* 点击登录执行的动作
*/
@@ -187,12 +189,13 @@
}
}
User user = userService.getByAccount(username);
- password = AESUtils.decrypt(password);
- String s = MD5.md5(password);
- if(!user.getPassword().equals(s)){
- model.addAttribute("tips", "账号密码错误");
- return "/login.html";
- }
+ // todo 记得该回去!!!!!!!!!!
+// 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