From c35f907f1ab5c2cd45a55bf757bb2fc17a5bcf1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:45:54 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 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..620978e 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
@@ -5,6 +5,8 @@
import com.dsh.course.feignClient.auth.model.TokenResponse;
import com.dsh.course.model.node.MenuNode;
import com.dsh.guns.config.UserExt;
+import com.dsh.guns.modular.system.controller.util.CaptchaGenerator;
+import com.dsh.guns.modular.system.controller.util.CaptchaImageGenerator;
import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.model.Role;
import com.dsh.guns.modular.system.service.IRelationService;
@@ -25,8 +27,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import javax.activation.MailcapCommandMap;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.awt.image.BufferedImage;
import java.util.*;
/**
@@ -68,6 +72,7 @@
*/
@RequestMapping(value = "/", method = RequestMethod.GET)
public String index(Model model) {
+ // 判断是否第一次登录 如果是跳转至修改密码页面
model.addAttribute("tips", "");
//获取菜单列表
User user = UserExt.getUser();
@@ -82,37 +87,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,38 +104,34 @@
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();
+ Integer objectType = user.getObjectType();
+
model.addAttribute("roleNames", role.getName());
model.addAttribute("language", language);
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";
}
+
/**
- * 跳转到登录页面
+ * 跳转到场地管理页面
*/
@RequestMapping(value = "/login", method = RequestMethod.GET)
public String login() {
- if (false || false) {
+ if (UserExt.getUser()!=null) {
return REDIRECT + "/";
} else {
return "/login.html" ;
}
}
-
/**
* 点击登录执行的动作
*/
@@ -219,7 +197,14 @@
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";
+ }
+ if (user.getStatus() == 2){
+ model.addAttribute("tips", "该账号已被冻结");
+ return "/login.html";
+ }else if (user.getStatus() == 3){
+ model.addAttribute("tips", "该账号不存在");
return "/login.html";
}
@@ -233,7 +218,6 @@
super.getSession().setAttribute("username", user.getAccount());
super.getSession().setAttribute("token", token);
super.getSession().setAttribute("language",language);
-
return REDIRECT + "/";
}
--
Gitblit v1.7.1