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 | 57 +++++++++++++++++++++++++++++----------------------------
1 files changed, 29 insertions(+), 28 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 d587d7c..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
@@ -74,7 +74,7 @@
/**
- * 娴嬭瘯鐧婚檰
+ * 鍚庣鐧婚檰
* @param username
* @param pwd
* @param request
@@ -84,37 +84,38 @@
public void adminLoginJP(String callback, String username,String pwd,String code,
HttpServletRequest request,PrintWriter out) {
- System.out.println("username:"+username);
- System.out.println("pwd:"+pwd);
-
String ocode = request.getSession().getAttribute(Constant.RANDKEY) + "";
- request.getSession().removeAttribute(Constant.RANDKEY);
if (StringUtil.isNullOrEmpty(code) || !code.equalsIgnoreCase(ocode)) {
- out.print(JsonUtil.loadFalseResult("楠岃瘉鐮侀敊璇�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("楠岃瘉鐮侀敊璇�"));
return;
- } else {
- if (StringUtil.isNullOrEmpty(username)||StringUtil.isNullOrEmpty(pwd)) {
- out.print(JsonUtil.loadJSONP(callback,JsonUtil.loadFalseResult("鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖")));
- } else {
+ }
+ request.getSession().removeAttribute(Constant.RANDKEY);
+
+ if (StringUtil.isNullOrEmpty(username)||StringUtil.isNullOrEmpty(pwd)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鍚嶆垨瀵嗙爜涓虹┖"));
+ }
- AdminUser info = adminUserService.login(username.trim(), pwd.trim());
-
- if (info == null) {
- out.print(JsonUtil.loadJSONP(callback,JsonUtil.loadFalseResult("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒")));
- return;
- } else {
- request.getSession().setAttribute(Constant.SESSION_ADMIN, info);
- String sessionId=request.getSession().getId();
- System.out.println("login"+sessionId);
-
- JSONObject data = new JSONObject();
- data.put("info", info);
- out.print(JsonUtil.loadJSONP(callback,JsonUtil.loadTrueResult(data)));
- return;
- }
- }
- }
-
+ AdminUser info = adminUserService.login(username.trim(), pwd.trim());
+ if (info == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒"));
+ return;
+ }
+
+ // 缂撳瓨鍒皊ession
+ request.getSession().setAttribute(Constant.SESSION_ADMIN, info);
+
+ JSONObject data = new JSONObject();
+ data.put("info", info);
+ JsonUtil.printMode(out, callback,JsonUtil.loadTrueResult(data));
+ 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