|
|
@ -1,13 +1,17 @@
|
|
|
|
package com.ruoyi.project.system.user.controller;
|
|
|
|
package com.ruoyi.project.system.user.controller;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
|
import org.apache.shiro.authc.AuthenticationException;
|
|
|
|
import org.apache.shiro.authc.AuthenticationException;
|
|
|
|
import org.apache.shiro.authc.UsernamePasswordToken;
|
|
|
|
import org.apache.shiro.authc.UsernamePasswordToken;
|
|
|
|
import org.apache.shiro.subject.Subject;
|
|
|
|
import org.apache.shiro.subject.Subject;
|
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
|
|
|
|
|
import org.springframework.ui.Model;
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
|
|
import com.ruoyi.common.utils.ServletUtils;
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
|
import com.ruoyi.framework.web.controller.BaseController;
|
|
|
|
import com.ruoyi.framework.web.controller.BaseController;
|
|
|
|
import com.ruoyi.framework.web.domain.AjaxResult;
|
|
|
|
import com.ruoyi.framework.web.domain.AjaxResult;
|
|
|
@ -22,8 +26,14 @@ public class LoginController extends BaseController
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/login")
|
|
|
|
@GetMapping("/login")
|
|
|
|
public String login()
|
|
|
|
public String login(HttpServletRequest request, HttpServletResponse response, Model model)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
// 如果是Ajax请求,返回Json字符串。
|
|
|
|
|
|
|
|
if (ServletUtils.isAjaxRequest((HttpServletRequest) request))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return ServletUtils.renderString(response, "{\"code\":\"1\",\"msg\":\"未登录或登录超时。请重新登录\"}");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return "login";
|
|
|
|
return "login";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|