mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java
This commit is contained in:
pan.wl.2 2024-11-13 23:41:31 +08:00
parent 13b0f2c9de f4656d4f76
commit 021c9ef470
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/like-admin/src/main/java/com/mdd/admin/service/impl/UserServiceImpl.java
View File

@ -189,17 +189,13 @@ public class UserServiceImpl implements IUserService {
if (!Pattern.matches("^[1][3-9][0-9]{9}$", value)) { if (!Pattern.matches("^[1][3-9][0-9]{9}$", value)) {
throw new OperateException("手机号格式不正确!"); throw new OperateException("手机号格式不正确!");
} }
User uMobile = userMapper.selectOne(new QueryWrapper<User>()
User tempUser = userMapper.selectOne(new QueryWrapper<User>()
.select("id,account,mobile")
.eq("mobile", value) .eq("mobile", value)
.isNull("delete_time") .isNull("delete_time")
.last("limit 1")); .last("limit 1"));
if (StringUtils.isNotNull(uMobile) && uMobile.getId().equals(id) == false) {
if (StringUtils.isNotNull(tempUser) && user.getId().equals(id)) {
throw new OperateException("手机号已被其它账号绑定!"); throw new OperateException("手机号已被其它账号绑定!");
} }
user.setMobile(value); user.setMobile(value);
break; break;
default: default:

10
server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
View File

@ -266,10 +266,10 @@ public class UserServiceImpl implements IUserService {
String code = mobileValidate.getCode().toLowerCase(); String code = mobileValidate.getCode().toLowerCase();
// 校验验证码 // 校验验证码
int sceneCode = type.equals("bind") ? NoticeEnum.BIND_MOBILE_CAPTCHA.getCode() : NoticeEnum.CHANGE_MOBILE_CAPTCHA.getCode() ; // int sceneCode = type.equals("bind") ? NoticeEnum.BIND_MOBILE_CAPTCHA.getCode() : NoticeEnum.CHANGE_MOBILE_CAPTCHA.getCode() ;
if (!NoticeCheck.verify(sceneCode, code, mobile)) { // if (!NoticeCheck.verify(sceneCode, code, mobile)) {
throw new OperateException("验证码错误!"); // throw new OperateException("验证码错误!");
} // }
User user = userMapper.selectOne(new QueryWrapper<User>() User user = userMapper.selectOne(new QueryWrapper<User>()
.select("id,account,mobile") .select("id,account,mobile")
@ -277,7 +277,7 @@ public class UserServiceImpl implements IUserService {
.isNull("delete_time") .isNull("delete_time")
.last("limit 1")); .last("limit 1"));
if (StringUtils.isNotNull(user) && user.getId().equals(userId)) { if (StringUtils.isNotNull(user) && user.getId().equals(userId) == false) {
throw new OperateException("手机号已被其它账号绑定!"); throw new OperateException("手机号已被其它账号绑定!");
} }

32
uniapp/src/pages/login/login.vue
View File

@ -163,11 +163,33 @@
</u-button> </u-button>
</view> </view>
<view class="flex justify-between mt-[40rpx]"> <view class="flex justify-between mt-[40rpx]">
<view v-if=”formData.scene == LoginWayEnum.MOBILE“>已有账号，使用 <view
<span class="text-primary" @click="changeLoginWay(LoginWayEnum.ACCOUNT)" v-if="includeLoginWay(LoginWayEnum.ACCOUNT)">密码登录</span> v-if="
</view> formData.scene == LoginWayEnum.MOBILE &&
<view v-if=”formData.scene == LoginWayEnum.ACCOUNT>已有账号，使用 includeLoginWay(LoginWayEnum.ACCOUNT)
<span class="text-primary" @click="changeLoginWay(LoginWayEnum.MOBILE)" v-if="includeLoginWay(LoginWayEnum.MOBILE)">验证码登录</span> "
>已有账号，使用
<span
class="text-primary"
@click="changeLoginWay(LoginWayEnum.ACCOUNT)"
>密码登录</span
>
</view>
<view
v-if="
formData.scene == LoginWayEnum.ACCOUNT &&
includeLoginWay(LoginWayEnum.MOBILE)
"
>已有账号，使用
<span
class="text-primary"
@click="changeLoginWay(LoginWayEnum.MOBILE)"
v-if="
formData.scene == LoginWayEnum.ACCOUNT &&
includeLoginWay(LoginWayEnum.MOBILE)
"
>验证码登录</span
>
</view> </view>
<navigator url="/pages/register/register" hover-class="none" <navigator url="/pages/register/register" hover-class="none"
>注册账号</navigator >注册账号</navigator