purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
cjl
2019-01-18 08:59:34 +08:00
parent db536047db fc03d05069
commit c4623555df
4 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/index.html
View File

@@ -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>

4
erp_web/login.html
View File

@@ -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";
}
}
},

18
erp_web/pages/common/main.html
View File

@@ -5,21 +5,6 @@
<title>ERP系统</title>
<link href="/js/HoorayOS_mini/js/HoorayLibs/hooraylibs.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>
<body>
<div class="loading"></div>
@@ -58,7 +43,7 @@
<a id="loginOut" href="#">
<img src="/js/HoorayOS_mini/img/exit.png" style="height:50px;width:50px;">
</a>
<span id="user-name-span">
<span style="text-align:center;color:white; position:absolute;top:435px; left:15px;">
</span>
</div>
</div>
@@ -121,6 +106,7 @@
$('#loginOut').click(function () {
if (confirm("确认要退出系统吗？"))
sessionStorage.removeItem("userId");
location.href = '/user/logout';
})
//IE下禁止选中

3
src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -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";
}