From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态

---
 fanli/src/main/java/com/yeshi/fanli/controller/login/LoginAdminController.java |   49 ++++++++++++++++++++++---------------------------
 1 files changed, 22 insertions(+), 27 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..4c6048f 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,32 @@
 	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 {
+		} 
+		
+		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;
 	}
 	
 }

--
Gitblit v1.8.0