From 1863e6353f0de84082a21738f5d0a28f3cfeadc0 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:49 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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..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();
@@ -101,6 +106,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,18 +120,18 @@
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" ;
}
}
-
/**
* 点击登录执行的动作
*/
@@ -193,6 +200,13 @@
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