用户手机号登录

fs-live-app/src/main/java/com/fs/app/controller/UserController.java

@@ -231,17 +231,17 @@ public class UserController extends AppBaseController {
 		FsUser user = findUserByPhone(param.getPhone());
 		if (user == null) {
 			createNewUser(param);
-			return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
+			//return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
 		} else {
 			if (user.getUnionId()==null){
 				if (user.getPhone().length()<=11){
 					FsUser fsUser = new FsUser();
 					fsUser.setUserId(user.getUserId());
-					fsUser.setPhone(encryptPhone(param.getPhone()));
+					fsUser.setPhone(param.getPhone());
 					userMapper.updateFsUser(fsUser);
 					logger.info("zyp \n【手机加密】：{}",encryptPhone(param.getPhone()));
 				}
-				return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
+				//return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
 			}
 			/*if (org.apache.commons.lang3.StringUtils.isNotEmpty(param.getJpushId())) {
 				updateExistingUserJpushId(user, param.getJpushId());
@@ -281,7 +281,7 @@ public class UserController extends AppBaseController {
 		return user;
 	}
 
-	private FsUser createNewUser(FsUserLoginParam param) {
+	private void createNewUser(FsUserLoginParam param) {
 		FsUser newUser = new FsUser();
 		newUser.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
 		newUser.setSource(param.getSource() != null ? param.getSource() : null );
@@ -294,7 +294,8 @@ public class UserController extends AppBaseController {
 			newUser.setJpushId(param.getJpushId());
 		}*/
 		userService.insertFsUser(newUser);
-		return newUser;
 	}
 
+	//
+
 }