From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 d2c7cc0..c437e29 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
@@ -8,6 +8,7 @@
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Service;
@@ -97,9 +98,9 @@
@Transactional
@Override
- public LoginResult login(HttpSession session, Boolean first, String appId, String code, String phone,
+ public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,
UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException {
-
+ HttpSession session = request.getSession();
if (first != null && first == true)
session.removeAttribute("LAST_LOGIN_USER");
// 浼氳瘽涓笂娆＄櫥褰曠殑鐢ㄦ埛
@@ -154,6 +155,11 @@
updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
updateUserInfo.setWxName(weiXinUser.getNickname());
+ // 璁剧疆鐧诲綍鏃堕棿涓庣櫥褰曠被鍨�
+ updateUserInfo.setLastLoginTime(System.currentTimeMillis());
+ updateUserInfo.setLoginType(loginType);
+ updateUserInfo.setLastLoginIp(request.getRemoteHost());
+
userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
// 鍒犻櫎閭�璇峰浘鐗�
spreadUserImgService.deleteImgUrl(userInfo.getId());
@@ -167,6 +173,9 @@
userInfo.setWxOpenId(weiXinUser.getOpenid());
userInfo.setWxUnionId(weiXinUser.getUnionid());
userInfo.setWxPic(weiXinUser.getHeadimgurl());
+ userInfo.setLastLoginTime(System.currentTimeMillis());
+ userInfo.setLoginType(loginType);
+ userInfo.setLastLoginIp(request.getRemoteHost());
addUser(userInfo);
return new LoginResult(LoginResult.TYPE_NORMAL, userInfo);
@@ -247,6 +256,8 @@
userInfo.setTbPic(lastUser.getTbPic());
}
userInfo.setLastLoginTime(System.currentTimeMillis());
+ userInfo.setLoginType(loginType);
+ userInfo.setLastLoginIp(request.getRemoteHost());
addUser(userInfo);
session.removeAttribute("LAST_LOGIN_USER");
return new LoginResult(LoginResult.TYPE_NORMAL, userInfo);
--
Gitblit v1.8.0