From d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 19 十二月 2018 17:28:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-moneydetail
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index 1bfdb31..80d62ee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -103,15 +103,16 @@
@Override
public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,
UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException {
-
+
JSONObject logInfo = new JSONObject();
logInfo.put("appId", appId);
logInfo.put("code", code);
logInfo.put("phone", phone);
- logInfo.put("tbUserInfo", tbUserInfo);
+ if (tbUserInfo != null)
+ logInfo.put("tbUserInfo", tbUserInfo.getId());
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
-
+
HttpSession session = request.getSession();
if (first != null && first == true)
session.removeAttribute("LAST_LOGIN_USER");
@@ -319,7 +320,8 @@
logInfo.put("appId", appId);
logInfo.put("code", code);
logInfo.put("phone", phone);
- logInfo.put("tbUserInfo", tbUserInfo);
+ if (tbUserInfo != null)
+ logInfo.put("tbUserInfo", tbUserInfo.getId());
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
--
Gitblit v1.8.0