moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

手机号授权：旧校验替换

Browse Source
This commit is contained in:
lzm
2022-11-28 16:38:05 +08:00
committed by yeungchihang
parent 592d5ed994
commit 424bc3fbda
14 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java
View File

@@ -189,7 +189,7 @@ public class CommonUtil {
* @return
*/
public static String maskPhone(String phone) {
if(!checkIsPhone(phone)){
if(!checkNumberOnly(phone)){
return null;
}

4
accompany-base/accompany-common/src/main/java/com/accompany/common/utils/StringUtils.java
View File

@@ -237,8 +237,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @param phone
* @return
*/
public static String maskPhone(String phone) {
if(!isPhone(phone)){
public static String maskPhone(String phoneAreaCode,String phone) {
if(CommonUtil.checkPhoneFormat(phoneAreaCode,phone)){
return null;
}

1
accompany-base/accompany-core/src/main/java/com/accompany/core/vo/user/InvitedUserVO.java
View File

@@ -23,4 +23,5 @@ public class InvitedUserVO {
private Date createTime;
private String phone;
private String phoneAreaCode;
}

2
accompany-base/accompany-core/src/main/resources/sqlmappers/UsersMapper.xml
View File

@@ -1110,7 +1110,7 @@
</update>
<select id="listInvitedUsers" resultType="com.accompany.core.vo.user.InvitedUserVO">
select a.uid, a.phone, u.nick, u.avatar, u.gender, a.sign_time createTime,
select a.uid, a.phone,a.phone_area_code, u.nick, u.avatar, u.gender, a.sign_time createTime,
case when u.nick is null and u.gender is null then 0 else 1 end hasLoginActived from account a left join users u on u.uid = a.uid
where ((a.prefill_invite_uid = ${uid} and u.nick is null and u.gender is null)
or u.invite_uid = ${uid})

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/MidyearActivityService.java
View File

@@ -625,7 +625,7 @@ public class MidyearActivityService extends ActivityBaseService {
//防刷
//被关注者
Users users = this.usersService.getUsersByUid(likedUid);
if (users == null || StringUtils.isEmpty(users.getPhone()) || !CommonUtil.checkIsPhone(users.getPhone())) {
if (users == null || StringUtils.isEmpty(users.getPhone()) || !CommonUtil.checkPhoneFormat(users.getPhoneAreaCode(),users.getPhone())) {
return;
}
//关注者

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/VoiceBottleActivityService.java
View File

@@ -16,6 +16,7 @@ import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.BlankUtil;
import com.accompany.common.utils.CommonUtil;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.StringUtils;
import com.accompany.core.exception.ServiceException;
@@ -118,7 +119,7 @@ public class VoiceBottleActivityService extends ActivityBaseService {
String redisKey = RedisKey.activity_rank_voice_bottle_like.getKey();
this.verifyActivity(uid, new Date(messTime)); //条件检验
Users users = usersService.getUsersByUid(uid);
if (users == null || StringUtils.isEmpty(users.getPhone()) || StringUtils.isNotPhone(users.getPhone())){
if (users == null || StringUtils.isEmpty(users.getPhone()) || CommonUtil.checkPhoneFormat(users.getPhoneAreaCode(),users.getPhone())){
logger.info("update like user num failed, users is not exist or no bind mobile phone uid = {}", uid);
return;
}

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/drawprize/UserDrawService.java
View File

@@ -404,7 +404,7 @@ public class UserDrawService {
Users users = this.getUsersByUid(uid);
if (users !=null){
//如果手机号码为空,或者手机号码为平台号
if(StringUtils.isEmpty(users.getPhone()) || !CommonUtil.checkIsPhone(users.getPhone())) {
if(StringUtils.isEmpty(users.getPhone()) || !CommonUtil.checkPhoneFormat(users.getPhoneAreaCode(),users.getPhone())) {
throw new ApiException(BusiStatus.RADISH_DRAW_PHONE_BIND);
}
}

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mission/MissionService.java
View File

@@ -445,7 +445,7 @@ public class MissionService extends BaseService {
*/
public boolean existsUserPhone(Long uid){
Users user = this.usersService.getUsersByUid(uid);
return user!=null && CommonUtil.checkValidPhone(user.getPhone());
return user!=null && CommonUtil.checkPhoneFormat(user.getPhoneAreaCode(),user.getPhone());
}
/**

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/InviteCodeService.java
View File

@@ -12,6 +12,7 @@ import com.accompany.common.constant.AppEnum;
import com.accompany.common.constant.Constant;
import com.accompany.common.device.DeviceInfo;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.CommonUtil;
import com.accompany.core.model.Room;
import com.accompany.core.service.user.UsersBaseService;
import com.accompany.core.vo.user.InvitePageVO;
@@ -262,10 +263,11 @@ public class InviteCodeService extends BaseService {
List<InvitedUserVO> users = usersMapper.listInvitedUsers(uid, sigupApps);
users.stream().forEach(it -> {
if (!it.getHasLoginActived()) {
it.setNick(StringUtils.maskPhone(it.getPhone()));
it.setNick(StringUtils.maskPhone(it.getPhoneAreaCode(),it.getPhone()));
}
it.setPhone(null);
it.setPhoneAreaCode(null);
});
pageVO.setInviteList(users);
return pageVO;

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserBankAccountService.java
View File

@@ -60,7 +60,7 @@ public class UserBankAccountService extends BaseService {
if(null == users) {
throw new ServiceException(BusiStatus.USERNOTEXISTS);
}
if(!CommonUtil.checkValidPhone(users.getPhone())) {
if(!CommonUtil.checkPhoneFormat(users.getPhoneAreaCode(),users.getPhone())) {
throw new ServiceException(BusiStatus.PHONE_NO_BIND);
}
boolean check = smsService.verifySmsCode(users.getPhone(), req.getSmsCode());

10
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UsersService.java
View File

@@ -392,7 +392,7 @@ public class UsersService extends BaseService {
userInfoSkillVo, userExpand);
Account account = accountService.getById(uid);
// TODO 延用之前代码的手机绑定判断规则
userVo.setIsBindPhone(CommonUtil.checkValidPhone(user.getPhone()));
userVo.setIsBindPhone(CommonUtil.checkPhoneFormat(user.getPhoneAreaCode(),user.getPhone()));
// 是否绑定了登录密码
userVo.setIsBindPasswd(!StringUtils.isEmpty(account.getPassword()));
// 是否绑定了支付宝
@@ -472,7 +472,7 @@ public class UsersService extends BaseService {
userVo = new UserVo();
userVo.setUid(uid);
userVo.setIsBindPhone(
account.getPhone() != null && CommonUtil.checkValidPhone(account.getPhone()));
account.getPhone() != null && CommonUtil.checkPhoneFormat(account.getPhoneAreaCode(),account.getPhone()));
userVo.setPrefillInviteCode(account.getPrefillInviteCode());
userVo.setPrefillInviteUid(account.getPrefillInviteUid());
return userVo;
@@ -494,7 +494,7 @@ public class UsersService extends BaseService {
UserExpandVo userExpand = userExpandService.getUserExpandVo(uid);
userVo = converToUserVo(user, nobleUsers, userLevelVo, carport, userHeadwearVo, familyId, hallMember == null ? null : hallMember.getHallId(),
userInfoSkillVo, userExpand);
userVo.setIsBindPhone(CommonUtil.checkValidPhone(account.getPhone())
userVo.setIsBindPhone(CommonUtil.checkPhoneFormat(account.getPhoneAreaCode(),account.getPhone())
|| user.getDefUser().byteValue() == Constant.DefUser.LABOR_UNION);
// 是否绑定了登录密码
userVo.setIsBindPasswd(!StringUtils.isEmpty(account.getPassword()));
@@ -660,7 +660,7 @@ public class UsersService extends BaseService {
userVo.setHasPrettyErbanNo(user.getHasPrettyErbanNo());
userVo.setUid(user.getUid());
userVo.setErbanNo(user.getErbanNo());
userVo.setPhone(StringUtils.maskPhone(user.getPhone()));
userVo.setPhone(StringUtils.maskPhone(user.getPhoneAreaCode(),user.getPhone()));
userVo.setPhoneAreaCode(user.getPhoneAreaCode());
userVo.setAvatar(user.getAvatar());
userVo.setBirth(user.getBirth());
@@ -1185,7 +1185,7 @@ public class UsersService extends BaseService {
return new BusiResult(BusiStatus.USERNOTEXISTS);
}
String phone = users.getPhone();
if (CommonUtil.checkValidPhone(phone)) {
if (CommonUtil.checkPhoneFormat(users.getPhoneAreaCode(),phone)) {
return busiResult;
}
return new BusiResult(BusiStatus.PHONEINVALID);

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/WithdrawService.java
View File

@@ -102,7 +102,7 @@ public class WithdrawService extends ServiceImpl<WithdrawMapper,WithdrawRecord>
if (StringUtils.isNoneBlank(users.getAlipayAccountName())) {
withDrawVo.setZxcAccountName(users.getAlipayAccountName());
}
withDrawVo.setIsNotBoundPhone(CommonUtil.checkValidPhone(users.getPhone()) ? false : true);
withDrawVo.setIsNotBoundPhone(CommonUtil.checkPhoneFormat(users.getPhoneAreaCode(),users.getPhone()) ? false : true);
// 青少年模式开关和青少年提现开关
if(users.getParentMode() != null){
withDrawVo.setIsTeen(users.getParentMode());

2
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/activities/ActivitiesAnnualController.java
View File

@@ -42,7 +42,7 @@ public class ActivitiesAnnualController extends BaseController {
if (uid == null || StringUtils.isEmpty(phone) || StringUtils.isEmpty(phoneAreaCode)){
return new BusiResult(BusiStatus.PARAMERROR);
}
if (!CommonUtil.checkValidPhone(phone)){
if (!CommonUtil.checkPhoneFormat(phoneAreaCode,phone)){
return new BusiResult(BusiStatus.PARAMERROR);
}
return activitiesAnnualService.bindPhone(uid, phone,phoneAreaCode);

2
accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/SuperAdminGrantService.java
View File

@@ -43,7 +43,7 @@ public class SuperAdminGrantService {
return;
}
CustomOAuth2Exception exception = new CustomOAuth2Exception(CustomOAuth2Exception.INVALID_SUPER_USER, "Bad credentials");
if(!CommonUtil.checkValidPhone(account.getPhone())){
if(!CommonUtil.checkPhoneFormat(account.getPhoneAreaCode(),account.getPhone())){
logger.error("super-admin login error.:{}",phone);
exception.addAdditionalInformation("msgWithValue","账号异常，未绑定手机号码");
throw exception;