|
@@ -474,7 +474,7 @@ public class AppLoginController extends AppBaseController{
|
|
|
userMapper.updateFsUser(fsUser);
|
|
userMapper.updateFsUser(fsUser);
|
|
|
logger.info("zyp \n【手机加密】:{}",encryptPhone(phone));
|
|
logger.info("zyp \n【手机加密】:{}",encryptPhone(phone));
|
|
|
}
|
|
}
|
|
|
- return R.ok().put("isNew",true).put("phone",encryptPhone(phone));
|
|
|
|
|
|
|
+ return R.ok(generateTokenAndReturn(user.get(0))).put("isNew",true).put("phone",encryptPhone(phone));
|
|
|
}
|
|
}
|
|
|
return generateTokenAndReturn(user.get(0));
|
|
return generateTokenAndReturn(user.get(0));
|
|
|
}
|
|
}
|
|
@@ -711,7 +711,7 @@ public class AppLoginController extends AppBaseController{
|
|
|
userMapper.updateFsUser(fsUser);
|
|
userMapper.updateFsUser(fsUser);
|
|
|
logger.info("zyp \n【手机加密】:{}",encryptPhone(param.getPhone()));
|
|
logger.info("zyp \n【手机加密】:{}",encryptPhone(param.getPhone()));
|
|
|
}
|
|
}
|
|
|
- return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
|
|
|
|
|
|
|
+ return R.ok(generateTokenAndReturn(user)).put("isNew",true).put("phone",encryptPhone(param.getPhone()));
|
|
|
}
|
|
}
|
|
|
// 校验用户是否存在及账号状态
|
|
// 校验用户是否存在及账号状态
|
|
|
if (user == null) {
|
|
if (user == null) {
|