diff --git a/src/main/java/com/pro/sys/controller/LoginController.java b/src/main/java/com/pro/sys/controller/LoginController.java
index b58640f19a760febde295ba0c3a5a023058d4031..6b19219940368241ab426c680725fc66d29dcea0 100644
--- a/src/main/java/com/pro/sys/controller/LoginController.java
+++ b/src/main/java/com/pro/sys/controller/LoginController.java
@@ -4,6 +4,7 @@ import com.pro.sys.entity.Menu;
import com.pro.sys.service.ShiroService;
import com.pro.utils.Utils;
import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
@@ -25,11 +26,9 @@ public class LoginController {
private ShiroService shiroService;
@RequestMapping(value = "/login")
public String Login(@RequestHeader(value="Via",required=false) String via , @RequestHeader("user-agent") String userAgent, String username, String password, String rememberMe, HttpSession session, Model model){
+ System.out.println("name--"+username+"---pass---"+password);
//判断是否为手机端访问
boolean is = Utils.isMobileDevice(via, userAgent);
- if(is) {
- return "mobile/login";
- }
//主体,当前状态为没有认证的状态“未认证”
Subject subject = SecurityUtils.getSubject();
if (subject.getSession().getAttribute("user") != null){//防止重复访问login
@@ -38,6 +37,9 @@ public class LoginController {
return "sys/home";
}
if(username==null){
+ if(is) {
+ return "mobile/login";
+ }
model.addAttribute("message", "账号不为空");
return "sys/login";
}
@@ -62,7 +64,16 @@ public class LoginController {
System.out.println("登录完成");
return "sys/home";
} catch (UnknownAccountException e) {
- model.addAttribute("message", "登录失败");
+ model.addAttribute("message", "账号不存在");
+ if(is) {
+ return "mobile/login";
+ }
+ return "sys/login";
+ } catch (IncorrectCredentialsException e){
+ model.addAttribute("message", "密码不正确");
+ if(is) {
+ return "mobile/login";
+ }
return "sys/login";
}
}
diff --git a/src/main/web/WEB-INF/views/mobile/login.jsp b/src/main/web/WEB-INF/views/mobile/login.jsp
index 078756e7b9741bbc30c056bbdce8c3fee17db806..301697697f552ad823907142d7292f118e1fb4a5 100644
--- a/src/main/web/WEB-INF/views/mobile/login.jsp
+++ b/src/main/web/WEB-INF/views/mobile/login.jsp
@@ -5,6 +5,10 @@
Time: 14:14
To change this template use File | Settings | File Templates.
--%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+
+
-
+
{{ title }}
-
-
+
+
登录
技术支持：XXX软件有限公司
+
+
+
+
+
+