github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 19:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 删除账户必填加星号；邮箱验证码可以多发送

Browse Source
This commit is contained in:
韦荣超 2022-07-14 12:24:01 +08:00
parent 16ac8d6b06
commit 132dd8134a
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/UserEmailVerification.php
View File

@ -45,7 +45,7 @@ class UserEmailVerification extends AbstractModel
{ {
$email = $type == 1 ? $user->email : $email; $email = $type == 1 ? $user->email : $email;
$res = self::whereEmail($email)->where('created_at', '>', Carbon::now()->subMinutes(30))->whereType($type)->first(); $res = self::whereEmail($email)->where('created_at', '>', Carbon::now()->subMinutes(30))->whereType($type)->first();
if ($res) return; if ($res && $type == 1) return;
//删除 //删除
self::whereUserid($email)->delete(); self::whereUserid($email)->delete();
$code = $type == 1 ? Base::generatePassword(64) : rand(100000, 999999); $code = $type == 1 ? Base::generatePassword(64) : rand(100000, 999999);
@ -109,9 +109,9 @@ class UserEmailVerification extends AbstractModel
throw new ApiException('请输入验证码'); throw new ApiException('请输入验证码');
} }
/** @var UserEmailVerification $emailVerify */ /** @var UserEmailVerification $emailVerify */
$emailVerify = self::whereEmail($email)->whereCode($code)->whereType($type)->orderByDesc('id')->first(); $emailVerify = self::whereEmail($email)->whereType($type)->orderByDesc('id')->first();
if (empty($emailVerify)) { if (empty($emailVerify) || $emailVerify->code != $code) {
throw new ApiException('验证码错误'); throw new ApiException('验证码错误');
} }

26
resources/assets/js/pages/manage/setting/delete.vue
View File

@ -74,6 +74,32 @@ export default {
trigger: 'change' trigger: 'change'
}, },
], ],
code: [
{
validator: (rule, value, callback) => {
if (value.trim() === '' && this.isRegVerify == 1) {
callback(new Error(this.$L('请输入邮箱验证码')));
} else {
callback();
}
},
required: true,
trigger: 'change'
},
],
password: [
{
validator: (rule, value, callback) => {
if (value.trim() === '' && this.isRegVerify != 1) {
callback(new Error(this.$L('请输入登录密码')));
} else {
callback();
}
},
required: true,
trigger: 'change'
},
],
}, },
count: 0, count: 0,
isSendButtonShow: true, isSendButtonShow: true,