update 登录ip优化

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -417,6 +417,9 @@ public class AppLoginController extends AppBaseController{
     @ApiOperation("绑定手机号")
     @PostMapping("/setIPhoneNumber")
     public R setIPhoneNumber(@Validated @RequestBody FsUserEditPhoneParam param) {
+        if (StringUtils.isBlank(param.getPhone())){
+            return setIPhoneNumberOne(param);
+        }
         FsUser userMap = findUserByPhone(param.getPhone());
         if (userMap != null) {
             if (StringUtils.isNotEmpty(userMap.getAppleKey()) && !param.getAppleKey().equals(userMap.getAppleKey())) {
@@ -534,7 +537,7 @@ public class AppLoginController extends AppBaseController{
 //            userMap.setFirstLoginTime(new Date());
 //        }
         userMap.setSource(param.getSource());
-        if (userMap.getNickName().equals("匿名用户**")) {
+        if ("匿名用户**".equals(userMap.getNickName())) {
             userMap.setNickName("苹果用户" + param.getPhone().substring(param.getPhone().length() - 4));
         }
         userMap.setAppleKey(param.getAppleKey());
@@ -641,7 +644,7 @@ public class AppLoginController extends AppBaseController{
 //            userMap.setFirstLoginTime(new Date());
 //        }
         userMap.setSource(param.getSource());
-        if (user.getNickName().equals("匿名用户**")) {
+        if ("匿名用户**".equals(user.getNickName())) {
             userMap.setNickName("匿名用户" + param.getPhone().substring(param.getPhone().length() - 4));
         }
         userMap.setUserId(user.getUserId());
@@ -658,6 +661,9 @@ public class AppLoginController extends AppBaseController{
     @Transactional(rollbackFor = Exception.class)
     public R setPhone(@Validated @RequestBody FsUserEditPhoneParam param) {
         logger.info("fcj 绑定手机号入参:{}", param);
+        if (StringUtils.isBlank(param.getPhone())){
+            return setPhoneOne(param);
+        }
         FsUser user = userService.selectFsUserByUnionid(param.getUnionId());
         if (user==null){
             return R.error("用户数据不存在");

fs-user-app/src/main/java/com/fs/app/param/FsUserEditPhoneParam.java

@@ -10,8 +10,8 @@ import java.io.Serializable;
 @Data
 public class FsUserEditPhoneParam implements Serializable {
 
-    @NotBlank(message = "手机号不能为空")
-    @Pattern(regexp="^1[3456789]\\d{9}$",message="手机号格式不正确")
+//    @NotBlank(message = "手机号不能为空")
+//    @Pattern(regexp="^1[3456789]\\d{9}$",message="手机号格式不正确")
     private String phone;
     @NotNull(message = "unionId不能为空")
     private String unionId;