diff --git a/erp_web/index.html b/erp_web/index.html
index eef621af..cf2d7b8f 100644
--- a/erp_web/index.html
+++ b/erp_web/index.html
@@ -3,8 +3,6 @@
ERP系统
-
-
diff --git a/erp_web/login.html b/erp_web/login.html
index 7f99ae4b..2e6d1101 100644
--- a/erp_web/login.html
+++ b/erp_web/login.html
@@ -3,8 +3,6 @@
ERP系统
-
-
@@ -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";
}
}
},
diff --git a/erp_web/pages/common/main.html b/erp_web/pages/common/main.html
index 2be5c92e..ef1936e7 100644
--- a/erp_web/pages/common/main.html
+++ b/erp_web/pages/common/main.html
@@ -5,21 +5,6 @@
ERP系统
-
@@ -58,7 +43,7 @@
-
+
@@ -121,6 +106,7 @@
$('#loginOut').click(function () {
if (confirm("确认要退出系统吗？"))
+ sessionStorage.removeItem("userId");
location.href = '/user/logout';
})
//IE下禁止选中
diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index 18761f9f..31fb9fc2 100644
--- 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";
}