|
@@ -1,7 +1,11 @@
|
|
|
package beilv.web.controller.system;
|
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
+import beilv.common.core.controller.BaseController;
|
|
|
+import beilv.common.core.domain.AjaxResult;
|
|
|
+import beilv.common.core.text.Convert;
|
|
|
+import beilv.common.utils.ServletUtils;
|
|
|
+import beilv.common.utils.StringUtils;
|
|
|
+import beilv.framework.web.service.ConfigService;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
import org.apache.shiro.authc.AuthenticationException;
|
|
|
import org.apache.shiro.authc.UsernamePasswordToken;
|
|
@@ -13,21 +17,17 @@ import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
-import beilv.common.core.controller.BaseController;
|
|
|
-import beilv.common.core.domain.AjaxResult;
|
|
|
-import beilv.common.core.text.Convert;
|
|
|
-import beilv.common.utils.ServletUtils;
|
|
|
-import beilv.common.utils.StringUtils;
|
|
|
-import beilv.framework.web.service.ConfigService;
|
|
|
+
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
/**
|
|
|
* 登录验证
|
|
|
- *
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
@Controller
|
|
|
-public class SysLoginController extends BaseController
|
|
|
-{
|
|
|
+public class SysLoginController extends BaseController {
|
|
|
/**
|
|
|
* 是否开启记住我功能
|
|
|
*/
|
|
@@ -38,11 +38,9 @@ public class SysLoginController extends BaseController
|
|
|
private ConfigService configService;
|
|
|
|
|
|
@GetMapping("/login")
|
|
|
- public String login(HttpServletRequest request, HttpServletResponse response, ModelMap mmap)
|
|
|
- {
|
|
|
+ public String login(HttpServletRequest request, HttpServletResponse response, ModelMap mmap) {
|
|
|
// 如果是Ajax请求,返回Json字符串。
|
|
|
- if (ServletUtils.isAjaxRequest(request))
|
|
|
- {
|
|
|
+ if (ServletUtils.isAjaxRequest(request)) {
|
|
|
return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
|
|
|
}
|
|
|
// 是否开启记住我
|
|
@@ -54,20 +52,15 @@ public class SysLoginController extends BaseController
|
|
|
|
|
|
@PostMapping("/login")
|
|
|
@ResponseBody
|
|
|
- public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
|
|
|
- {
|
|
|
+ public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe) {
|
|
|
UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
|
|
|
Subject subject = SecurityUtils.getSubject();
|
|
|
- try
|
|
|
- {
|
|
|
+ try {
|
|
|
subject.login(token);
|
|
|
return success();
|
|
|
- }
|
|
|
- catch (AuthenticationException e)
|
|
|
- {
|
|
|
+ } catch (AuthenticationException e) {
|
|
|
String msg = "用户或密码错误";
|
|
|
- if (StringUtils.isNotEmpty(e.getMessage()))
|
|
|
- {
|
|
|
+ if (StringUtils.isNotEmpty(e.getMessage())) {
|
|
|
msg = e.getMessage();
|
|
|
}
|
|
|
return error(msg);
|
|
@@ -75,8 +68,7 @@ public class SysLoginController extends BaseController
|
|
|
}
|
|
|
|
|
|
@GetMapping("/unauth")
|
|
|
- public String unauth()
|
|
|
- {
|
|
|
+ public String unauth() {
|
|
|
return "error/unauth";
|
|
|
}
|
|
|
}
|