From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 40 +++++-----------------------------------
1 files changed, 5 insertions(+), 35 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 4b47cae..d1998b7 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
@@ -82,37 +82,14 @@
Integer language = UserExt.getLanguage();
List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
List<MenuNode> titles = MenuNode.buildTitle(menus);
- if(language==1 || language==null){
-
- }else if(language==2){
- for (MenuNode menu : menus) {
- menu.setName(menu.getEname());
- }
- }else if(language==3){
- for (MenuNode menu : menus) {
- menu.setName(menu.getBname());
- }
- }
-
-
List<String> resUrlsByRoleId = menuService.getResUrlsByRoleId(Integer.valueOf(roleList.get(0)));
CacheUtil.menus.put(user.getAccount(), resUrlsByRoleId);
if (SinataUtil.isEmpty(user)){
String a ="请重新登录";
- if(language==2){
- a="Please log in again";
- }else if(language==3){
- a="Silakan log masuk lagi";
- }
-
model.addAttribute("tips", a);
return "/login.html";
- }
- //设置上级ID
- if (SinataUtil.isNotEmpty(user.getObjectId())){
-// ShiroKit.getUser().setObjectId(user.getObjectId());
}
//设置角色
// ShiroKit.getUser().setRoleType(user.getRoleType());
@@ -122,12 +99,6 @@
Role role = roleService.getBaseMapper().selectById(roleList.get(0));
User byId = userService.getById(user.getId());
- String a = "您的密码已经90天未更换了，请及时更换密码！！！";
- if(language==2){
- a="Your password has not been changed for 90 days, please change your password in time!!";
- }else if(language==3){
- a="Kata sandi Anda belum diubah selama 90 hari, silakan merubah kata sandi Anda pada waktu!!";
- }
//获取用户头像 Obtain user profile
String avatar = byId.getAvatar();
model.addAttribute("roleNames", role.getName());
@@ -135,10 +106,10 @@
model.addAttribute("avatar", avatar);
model.addAttribute("userName", user.getName());
model.addAttribute("type", 0);
- model.addAttribute("passwordHint",
- null == user.getPassWordUpdate()
- || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
- ? a: "");
+// model.addAttribute("passwordHint",
+// null == user.getPassWordUpdate()
+// || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
+// ? a: "");
return "/index.html";
}
@@ -219,7 +190,7 @@
password = AESUtils.decrypt(password);
String s = MD5.md5(password);
if(!user.getPassword().equals(s)){
- model.addAttribute("tips", "Account password error");
+ model.addAttribute("tips", "账号密码错误");
return "/login.html";
}
@@ -233,7 +204,6 @@
super.getSession().setAttribute("username", user.getAccount());
super.getSession().setAttribute("token", token);
super.getSession().setAttribute("language",language);
-
return REDIRECT + "/";
}
--
Gitblit v1.7.1