|
@@ -361,6 +361,11 @@ public class AppLoginController extends AppBaseController{
|
|
|
userMap.setJpushId(param.getJpushId());
|
|
userMap.setJpushId(param.getJpushId());
|
|
|
}
|
|
}
|
|
|
userMap.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
userMap.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
|
|
|
+ userMap.setSource(param.getSource()!=null ? param.getSource() : null);
|
|
|
|
|
+ userMap.setHistoryApp("app");
|
|
|
|
|
+ if(userMap.getFirstLoginTime() == null){
|
|
|
|
|
+ userMap.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
userService.updateFsUser(userMap);
|
|
userService.updateFsUser(userMap);
|
|
|
user=appleUser;
|
|
user=appleUser;
|
|
|
}
|
|
}
|
|
@@ -368,6 +373,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
user = new FsUser();
|
|
user = new FsUser();
|
|
|
user.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
user.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
|
user.setSource(param.getSource()!=null ? param.getSource() : null);
|
|
user.setSource(param.getSource()!=null ? param.getSource() : null);
|
|
|
|
|
+ user.setHistoryApp("app");
|
|
|
|
|
+ if(user.getFirstLoginTime() == null){
|
|
|
|
|
+ user.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
user.setNickName(nickname);
|
|
user.setNickName(nickname);
|
|
|
user.setAvatar(avatar);
|
|
user.setAvatar(avatar);
|
|
|
user.setAppOpenId(openid);
|
|
user.setAppOpenId(openid);
|
|
@@ -418,7 +427,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
userMap.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
userMap.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
|
-
|
|
|
|
|
|
|
+ userMap.setHistoryApp("app");
|
|
|
|
|
+ if(userMap.getFirstLoginTime() == null){
|
|
|
|
|
+ userMap.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
if(userService.updateFsUser(userMap)>0){
|
|
if(userService.updateFsUser(userMap)>0){
|
|
|
userService.deleteFsUserByUserId(appleUser.getUserId());
|
|
userService.deleteFsUserByUserId(appleUser.getUserId());
|
|
|
}else {
|
|
}else {
|
|
@@ -457,6 +469,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
}
|
|
}
|
|
|
// 更新登录设备信息
|
|
// 更新登录设备信息
|
|
|
userMap.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
userMap.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
|
|
|
+ userMap.setHistoryApp("app");
|
|
|
|
|
+ if(userMap.getFirstLoginTime() == null){
|
|
|
|
|
+ userMap.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
userService.updateFsUser(userMap);
|
|
userService.updateFsUser(userMap);
|
|
|
}
|
|
}
|
|
@@ -610,6 +626,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
FsUser newUser = new FsUser();
|
|
FsUser newUser = new FsUser();
|
|
|
newUser.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
newUser.setLoginDevice(param.getLoginDevice()!=null ? param.getLoginDevice() : null);
|
|
|
newUser.setSource(param.getSource()!=null ? param.getSource() : null);
|
|
newUser.setSource(param.getSource()!=null ? param.getSource() : null);
|
|
|
|
|
+ newUser.setHistoryApp("app");
|
|
|
|
|
+ if (newUser.getFirstLoginTime() == null){
|
|
|
|
|
+ newUser.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
newUser.setAppleKey(param.getAppleKey());
|
|
newUser.setAppleKey(param.getAppleKey());
|
|
|
newUser.setPhone(param.getPhone());
|
|
newUser.setPhone(param.getPhone());
|
|
|
newUser.setPassword(Md5Utils.hash(param.getPassword()));
|
|
newUser.setPassword(Md5Utils.hash(param.getPassword()));
|
|
@@ -644,7 +664,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
} else {
|
|
} else {
|
|
|
userMap = createNewAppleUser(param, param.getPhone());
|
|
userMap = createNewAppleUser(param, param.getPhone());
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ userMap.setHistoryApp("app");
|
|
|
|
|
+ if (userMap.getFirstLoginTime() == null) {
|
|
|
|
|
+ userMap.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
userMap.setLoginDevice(param.getLoginDevice());
|
|
userMap.setLoginDevice(param.getLoginDevice());
|
|
|
userMap.setSource(param.getSource());
|
|
userMap.setSource(param.getSource());
|
|
|
if ("匿名用户**".equals(userMap.getNickName())) {
|
|
if ("匿名用户**".equals(userMap.getNickName())) {
|
|
@@ -799,6 +822,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
if (userMap.getUserId().equals(user.getUserId())) {
|
|
if (userMap.getUserId().equals(user.getUserId())) {
|
|
|
user.setPhone(param.getPhone());
|
|
user.setPhone(param.getPhone());
|
|
|
user.setLoginDevice(param.getLoginDevice());
|
|
user.setLoginDevice(param.getLoginDevice());
|
|
|
|
|
+ user.setHistoryApp("app");
|
|
|
|
|
+ if (user.getFirstLoginTime() == null) {
|
|
|
|
|
+ user.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
user.setSource(param.getSource());
|
|
user.setSource(param.getSource());
|
|
|
String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
|
|
String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
|
|
|
user.setLastIp(ipAddr);
|
|
user.setLastIp(ipAddr);
|
|
@@ -819,6 +846,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
deleteUser = userMap;
|
|
deleteUser = userMap;
|
|
|
}
|
|
}
|
|
|
keepUser.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
keepUser.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
|
|
|
+ keepUser.setHistoryApp("app");
|
|
|
|
|
+ if (keepUser.getFirstLoginTime() == null) {
|
|
|
|
|
+ keepUser.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
keepUser.setSource(param.getSource());
|
|
keepUser.setSource(param.getSource());
|
|
|
keepUser.setUnionId(user.getUnionId());
|
|
keepUser.setUnionId(user.getUnionId());
|
|
|
keepUser.setPhone(param.getPhone());
|
|
keepUser.setPhone(param.getPhone());
|
|
@@ -832,9 +863,17 @@ public class AppLoginController extends AppBaseController{
|
|
|
}
|
|
}
|
|
|
user.setPhone(param.getPhone());
|
|
user.setPhone(param.getPhone());
|
|
|
user.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null );
|
|
user.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null );
|
|
|
|
|
+ user.setHistoryApp("app");
|
|
|
|
|
+ if (user.getFirstLoginTime() == null) {
|
|
|
|
|
+ user.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
user.setSource(param.getSource()!= null ? param.getSource() : null);
|
|
user.setSource(param.getSource()!= null ? param.getSource() : null);
|
|
|
userMap = new FsUser();
|
|
userMap = new FsUser();
|
|
|
userMap.setLoginDevice(param.getLoginDevice());
|
|
userMap.setLoginDevice(param.getLoginDevice());
|
|
|
|
|
+ userMap.setHistoryApp("app");
|
|
|
|
|
+ if (userMap.getFirstLoginTime() == null) {
|
|
|
|
|
+ userMap.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
userMap.setSource(param.getSource());
|
|
userMap.setSource(param.getSource());
|
|
|
userMap.setUserId(user.getUserId());
|
|
userMap.setUserId(user.getUserId());
|
|
|
userMap.setPhone(param.getPhone());
|
|
userMap.setPhone(param.getPhone());
|
|
@@ -893,6 +932,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
if (userByUnionId.getUserId().equals(user.getUserId())) {
|
|
if (userByUnionId.getUserId().equals(user.getUserId())) {
|
|
|
user.setPhone(param.getPhone());
|
|
user.setPhone(param.getPhone());
|
|
|
user.setLoginDevice(param.getLoginDevice());
|
|
user.setLoginDevice(param.getLoginDevice());
|
|
|
|
|
+ user.setHistoryApp("app");
|
|
|
|
|
+ if (user.getFirstLoginTime() == null) {
|
|
|
|
|
+ user.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
user.setSource(param.getSource());
|
|
user.setSource(param.getSource());
|
|
|
user.setUnionId(unionid);
|
|
user.setUnionId(unionid);
|
|
|
String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
|
|
String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
|
|
@@ -913,6 +956,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
keepUser.setPhone(param.getPhone());
|
|
keepUser.setPhone(param.getPhone());
|
|
|
keepUser.setSource(param.getSource() != null ? param.getSource() : null );
|
|
keepUser.setSource(param.getSource() != null ? param.getSource() : null );
|
|
|
keepUser.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
keepUser.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
|
|
|
+ keepUser.setHistoryApp("app");
|
|
|
|
|
+ if (keepUser.getFirstLoginTime() == null) {
|
|
|
|
|
+ keepUser.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
keepUser.setNickName(nickname);
|
|
keepUser.setNickName(nickname);
|
|
|
keepUser.setAvatar(avatar);
|
|
keepUser.setAvatar(avatar);
|
|
|
if (keepUser.getPassword() == null && deleteUser.getPassword() != null) {
|
|
if (keepUser.getPassword() == null && deleteUser.getPassword() != null) {
|
|
@@ -931,6 +978,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
}else {
|
|
}else {
|
|
|
user.setSource(param.getSource() != null ? param.getSource() : null );
|
|
user.setSource(param.getSource() != null ? param.getSource() : null );
|
|
|
user.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
user.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
|
|
|
+ user.setHistoryApp("app");
|
|
|
|
|
+ if (user.getFirstLoginTime() == null) {
|
|
|
|
|
+ user.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
user.setNickName(nickname);
|
|
user.setNickName(nickname);
|
|
|
user.setAvatar(avatar);
|
|
user.setAvatar(avatar);
|
|
|
user.setSex(sex);
|
|
user.setSex(sex);
|
|
@@ -1367,6 +1418,10 @@ public class AppLoginController extends AppBaseController{
|
|
|
private FsUser createNewUser(FsUserLoginParam param) {
|
|
private FsUser createNewUser(FsUserLoginParam param) {
|
|
|
FsUser newUser = new FsUser();
|
|
FsUser newUser = new FsUser();
|
|
|
newUser.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
newUser.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
|
|
|
|
|
+ newUser.setHistoryApp("app");
|
|
|
|
|
+ if (newUser.getFirstLoginTime() == null) {
|
|
|
|
|
+ newUser.setFirstLoginTime(new Date());
|
|
|
|
|
+ }
|
|
|
newUser.setSource(param.getSource() != null ? param.getSource() : null );
|
|
newUser.setSource(param.getSource() != null ? param.getSource() : null );
|
|
|
newUser.setNickName("匿名用户**");
|
|
newUser.setNickName("匿名用户**");
|
|
|
newUser.setPhone(param.getPhone());
|
|
newUser.setPhone(param.getPhone());
|