From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java |   37 ++-----------------------------------
 1 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
index eabfb0a..cf95a76 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -282,7 +282,7 @@
 
 		} catch (UserAccountException e) {
 			try {
-				LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+				LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
 			} catch (Exception e1) {
 				e1.printStackTrace();
 			}
@@ -356,39 +356,6 @@
 		}
 	}
 
-	/**
-	 * 璐﹀彿鎵撻��
-	 * 
-	 * @param acceptData
-	 * @param mainUid
-	 * @param lessUid
-	 * @param session
-	 * @param out
-	 */
-	@RequestMapping(value = "connect")
-	public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) {
-		BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
-				acceptData.getPackages());
-		if (system == null) {
-			out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
-			return;
-		}
-
-		if (mainUid == 0 || lessUid == 0) {
-			out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼犳墦閫氱敤鎴稩D"));
-			return;
-		}
-
-		try {
-			userAccountService.connectUsers(new UserInfo(mainUid), new UserInfo(lessUid));
-			UserInfo user = userInfoService.getUserByIdWithMybatis(mainUid);
-			JSONObject data = new JSONObject();
-			data.put("user", GsonUtil.toJsonExpose(UserUtil.filterForClientUser(user)));
-			out.print(JsonUtil.loadTrueResult(data));
-		} catch (UserAccountException e) {
-			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
-		}
-	}
 
 	/**
 	 * 鑾峰彇鐢ㄦ埛ID
@@ -1243,7 +1210,7 @@
 		} catch (UserAccountException e) {
 			out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
 			try {
-				LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+				LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
 			} catch (Exception e1) {
 				e1.printStackTrace();
 			}

--
Gitblit v1.8.0