Skip to content
GitLab
Commit c4623555 authored by cjl's avatar cjl
Browse files

从远程仓库jsh更新解决用户登录失败的bug

parents db536047 fc03d050
Show whitespace changes
Inline Side-by-side
erp_web/index.html
View file @ c4623555
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<head> <head>
<title>ERP系统</title> <title>ERP系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <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 rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link type="text/css" rel="stylesheet" href="/css/css.css"/> <link type="text/css" rel="stylesheet" href="/css/css.css"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script> <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
......
erp_web/login.html
View file @ c4623555
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
<head> <head>
<title>ERP系统</title> <title>ERP系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <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 rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link type="text/css" rel="stylesheet" href="/css/css.css"/> <link type="text/css" rel="stylesheet" href="/css/css.css"/>
<script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script> <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
...@@ -132,7 +130,7 @@ ...@@ -132,7 +130,7 @@
if(res.data.user) { if(res.data.user) {
var user = res.data.user; var user = res.data.user;
sessionStorage.setItem("userId", user.id); sessionStorage.setItem("userId", user.id);
window.location.href = "/"; top.location.href = "http://" + location.host + "/index.html";
} }
} }
}, },
......
erp_web/pages/common/main.html
View file @ c4623555
...@@ -5,21 +5,6 @@ ...@@ -5,21 +5,6 @@
<title>ERP系统</title> <title>ERP系统</title>
<link href="/js/HoorayOS_mini/js/HoorayLibs/hooraylibs.css" rel="stylesheet"/> <link href="/js/HoorayOS_mini/js/HoorayLibs/hooraylibs.css" rel="stylesheet"/>
<link href="/js/HoorayOS_mini/img/ui/index.css" rel="stylesheet"/> <link href="/js/HoorayOS_mini/img/ui/index.css" rel="stylesheet"/>
<style>
#user-name-span{
text-align:center;
color:white;
position:absolute;
top:435px;
left:0px;
display:inline-block;
max-width:100%;
float: left;
overflow: hidden;
text-overflow: ellipsis;
white-space: normal;
}
</style>
</head> </head>
<body> <body>
<div class="loading"></div> <div class="loading"></div>
...@@ -58,7 +43,7 @@ ...@@ -58,7 +43,7 @@
<a id="loginOut" href="#"> <a id="loginOut" href="#">
<img src="/js/HoorayOS_mini/img/exit.png" style="height:50px;width:50px;"> <img src="/js/HoorayOS_mini/img/exit.png" style="height:50px;width:50px;">
</a> </a>
<span id="user-name-span"> <span style="text-align:center;color:white; position:absolute;top:435px; left:15px;">
</span> </span>
</div> </div>
</div> </div>
...@@ -121,6 +106,7 @@ ...@@ -121,6 +106,7 @@
$('#loginOut').click(function () { $('#loginOut').click(function () {
if (confirm("确认要退出系统吗？")) if (confirm("确认要退出系统吗？"))
sessionStorage.removeItem("userId");
location.href = '/user/logout'; location.href = '/user/logout';
}) })
//IE下禁止选中 //IE下禁止选中
......
src/main/java/com/jsh/erp/controller/UserController.java
View file @ c4623555
...@@ -52,8 +52,7 @@ public class UserController { ...@@ -52,8 +52,7 @@ public class UserController {
if (userInfo != null) { if (userInfo != null) {
sessionUser = (User) userInfo; sessionUser = (User) userInfo;
} }
if (sessionUser != null && username.equalsIgnoreCase(sessionUser.getLoginame()) if (sessionUser != null && username.equalsIgnoreCase(sessionUser.getLoginame())) {
&& sessionUser.getPassword().equals(password)) {
logger.info("====用户 " + username + "已经登录过, login 方法调用结束===="); logger.info("====用户 " + username + "已经登录过, login 方法调用结束====");
msgTip = "user already login"; msgTip = "user already login";
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment