解决用户登录失败的bug

fc03d050 · 季圣华 · 3df03ef9 · fc03d050 · fc03d050 · fc03d050
Commit fc03d050 authored Jan 17, 2019 by 季圣华
--- a/erp_web/index.html
+++ b/erp_web/index.html
@@ -3,8 +3,6 @@
 <head>
 	<title>ERP系统</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<!-- 指定以IE8的方式来渲染 -->
-	<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
 	<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
 	<link type="text/css" rel="stylesheet" href="/css/css.css"/>
 	<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>

--- a/erp_web/login.html
+++ b/erp_web/login.html
@@ -3,8 +3,6 @@
 <head>
    <title>ERP系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <!-- 指定以IE8的方式来渲染 -->
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
    <link type="text/css" rel="stylesheet" href="/css/css.css"/>
    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
@@ -132,7 +130,7 @@
                                        if(res.data.user) {
                                            var user = res.data.user;
                                            sessionStorage.setItem("userId", user.id);
-                                            window.location.href = "/";
+                                            top.location.href = "http://" + location.host + "/index.html";
                                        }
                                    }
                                },

--- a/erp_web/pages/common/main.html
+++ b/erp_web/pages/common/main.html
@@ -106,6 +106,7 @@

        $('#loginOut').click(function () {
            if (confirm("确认要退出系统吗？"))
+                sessionStorage.removeItem("userId");
                location.href = '/user/logout';
        })
        //IE下禁止选中

--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -52,8 +52,7 @@ public class UserController {
            if (userInfo != null) {
                sessionUser = (User) userInfo;
            }
-            if (sessionUser != null && username.equalsIgnoreCase(sessionUser.getLoginame())
-                    && sessionUser.getPassword().equals(password)) {
+            if (sessionUser != null && username.equalsIgnoreCase(sessionUser.getLoginame())) {
                logger.info("====用户 " + username + "已经登录过, login 方法调用结束====");
                msgTip = "user already login";
            }