From 0160430ef9b03028e5d1896e17f006f8af0c7daa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 九月 2022 09:22:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/SignController.java | 55 +++----------------------------------------------------
1 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/SignController.java b/src/main/java/com/lf/server/controller/sys/SignController.java
index 9a23ce9..9f9fc9f 100644
--- a/src/main/java/com/lf/server/controller/sys/SignController.java
+++ b/src/main/java/com/lf/server/controller/sys/SignController.java
@@ -4,9 +4,6 @@
import com.lf.server.entity.sys.Result;
import com.lf.server.entity.sys.User;
import com.lf.server.service.sys.UserService;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.*;
-import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -36,7 +33,7 @@
public ModelAndView toIndex(ModelAndView mv) {
mv.setViewName("index");
- User user = (User) SecurityUtils.getSubject().getPrincipal();
+ User user = null;
if (user != null) {
mv.addObject("msg", "Hello " + user.getLoginName() + " !");
}
@@ -58,6 +55,7 @@
/**
* 璺冲埌鏈巿鏉冮〉闈�
+ * return "redirect:/toLogin"
*
* @return String
*/
@@ -69,23 +67,6 @@
}
/**
- * 鐢ㄤ簬娴嬭瘯璁颁綇鎴戝拰璁よ瘉鐨勫尯鍒�
- *
- * @return String
- */
- @GetMapping("/buy")
- public String buy() {
- Subject subject = SecurityUtils.getSubject();
-
- // 鍙湁璁よ瘉鍚庢墠鑳借闂紝濡傛灉鍙槸璁颁綇鎴戝垯闇�瑕佸厛鐧诲綍
- if (!subject.isAuthenticated()) {
- return "redirect:/toLogin";
- }
-
- return "add";
- }
-
- /**
* 鐧诲綍璁よ瘉
*
* @return String
@@ -94,29 +75,13 @@
public ModelAndView login(String username, String password, String service, Integer rememberMe) {
ModelAndView mv = new ModelAndView();
try {
- Subject subject = SecurityUtils.getSubject();
-
- // 鑾峰彇浠ょ墝
- UsernamePasswordToken token = new UsernamePasswordToken(username, password);
- if (rememberMe != null && rememberMe == 1) {
- token.setRememberMe(true);
- }
-
- // 鐧诲綍璁よ瘉
- subject.login(token);
-
mv.setViewName("index");
if (service != null && service.length() > 0) {
mv.addObject("url", service);
} else {
mv.addObject("msg", username);
}
- } catch (UnknownAccountException e) { // 杩斿洖null灏变細杩涘叆杩欓噷
- mv.setViewName("login");
- mv.addObject("msg", "鐢ㄦ埛鍚嶄笉瀛樺湪锛�");
- } catch (IncorrectCredentialsException e) { // 瀵嗙爜閿欒灏变細杩涘叆杩欓噷
- mv.setViewName("login");
- mv.addObject("msg", "瀵嗙爜閿欒锛�");
+ } catch (Exception e) {
}
return mv;
@@ -129,9 +94,6 @@
*/
@GetMapping("/logout")
public ModelAndView logout() {
- Subject subject = SecurityUtils.getSubject();
- subject.logout();
-
ModelAndView mv = new ModelAndView();
mv.setViewName("login");
@@ -147,20 +109,9 @@
@PostMapping(value = "/ajaxLogin", produces = "application/json; charset=UTF-8")
public Result ajaxLogin(@RequestBody User userInfo) {
try {
- Subject subject = SecurityUtils.getSubject();
-
- UsernamePasswordToken token = new UsernamePasswordToken(userInfo.getLoginName(), userInfo.getPassword());
- subject.login(token);
-
LoginInfo loginInfo = userService.getLoginInfo(userInfo.getLoginName());
return new Result(200, loginInfo != null ? "鐧诲綍鎴愬姛" : "鐧诲綍澶辫触", loginInfo);
- } catch (IncorrectCredentialsException e) {
- return new Result(500, "瀵嗙爜閿欒");
- } catch (LockedAccountException e) {
- return new Result(500, "鐧诲綍澶辫触锛岃鐢ㄦ埛宸茶鍐荤粨");
- } catch (AuthenticationException e) {
- return new Result(500, "璇ョ敤鎴蜂笉瀛樺湪");
} catch (Exception e) {
e.printStackTrace();
return new Result(500, e.getMessage());
--
Gitblit v1.9.3