|
|
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import com.fs.app.annotation.Login;
|
|
|
import com.fs.app.param.*;
|
|
|
+import com.fs.app.utils.JsonUtils;
|
|
|
import com.fs.app.utils.WxUtil;
|
|
|
import com.fs.common.VerifyCodeUtil;
|
|
|
import com.fs.common.annotation.RepeatSubmit;
|
|
|
@@ -293,12 +294,15 @@ public class AppLoginController extends AppBaseController{
|
|
|
|
|
|
@PostMapping("/loginByPhone")
|
|
|
public R loginByPhone(@RequestBody Map<String,String> map){
|
|
|
+ logger.info("短信登录参数:{}",map.toString());
|
|
|
String phone = map.get("phone");
|
|
|
String code = map.get("code");
|
|
|
String encryptPhone = encryptPhone(phone);
|
|
|
List<FsUser> user = userService.selectFsUserListByPhone(encryptPhone);
|
|
|
+ logger.info("加密手机号查询用户列表数据:{}", JsonUtils.toJson(user));
|
|
|
if (CollectionUtil.isEmpty(user)){
|
|
|
user = userService.selectFsUserListByPhone(encryptPhoneOldKey(phone));
|
|
|
+ logger.info("加密手机号查询用户列表数据----1>:{}", JsonUtils.toJson(user));
|
|
|
}
|
|
|
if (CollectionUtil.isEmpty(user)){
|
|
|
return R.error("此电话号码未绑定用户");
|
|
|
@@ -306,6 +310,7 @@ public class AppLoginController extends AppBaseController{
|
|
|
if (user.size()>1){
|
|
|
//如果出现了一个手机号多个用户的情况,找出登陆过app的那个用户
|
|
|
user.removeIf(fsUser -> StringUtils.isEmpty(fsUser.getHistoryApp()));
|
|
|
+ logger.info("历史数据用户>:{}", JsonUtils.toJson(user));
|
|
|
}
|
|
|
String redisCode = redisCache.getCacheObject("sms:code:" + phone);
|
|
|
if (StringUtils.isEmpty(redisCode)){
|