From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/login/LoginAdminController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/login/LoginAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/login/LoginAdminController.java
index 4c6048f..525df9a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/login/LoginAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/login/LoginAdminController.java
@@ -85,13 +85,11 @@
HttpServletRequest request,PrintWriter out) {
String ocode = request.getSession().getAttribute(Constant.RANDKEY) + "";
-
- request.getSession().removeAttribute(Constant.RANDKEY);
-
if (StringUtil.isNullOrEmpty(code) || !code.equalsIgnoreCase(ocode)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("楠岃瘉鐮侀敊璇�"));
return;
}
+ request.getSession().removeAttribute(Constant.RANDKEY);
if (StringUtil.isNullOrEmpty(username)||StringUtil.isNullOrEmpty(pwd)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖"));
@@ -112,4 +110,12 @@
return;
}
+
+ @RequestMapping("loginExitJP")
+ public void loginExitJP(String callback, HttpServletRequest request,PrintWriter out) {
+ request.getSession().removeAttribute(Constant.SESSION_ADMIN);
+ request.getSession().invalidate();
+ JsonUtil.printMode(out, callback,JsonUtil.loadTrueResult("閫�鍑烘垚鍔�"));
+ return;
+ }
}
--
Gitblit v1.8.0