gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf: 【注册】校验参数是否合法顺序优化

Browse Source
This commit is contained in:
韦荣超 2022-02-17 14:41:49 +08:00
parent 858709f610
commit 4f74a0440c
5 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Api/UsersController.php
View File

@ -43,6 +43,17 @@ class UsersController extends AbstractController
$email = trim(Request::input('email'));
$password = trim(Request::input('password'));
if ($type == 'reg') {
$password2 = trim(Request::input('password2'));
//邮箱
if (!Base::isMail($email)) {
return Base::retError('请输入正确的邮箱地址');
}
if (User::email2userid($email) > 0) {
return Base::retError('邮箱地址已存在');
}
if ($password != $password2) {
return Base::retError('确认密码输入不一致');
}
$setting = Base::setting('system');
if ($setting['reg'] == 'close') {
return Base::retError('未开放注册');

7
app/Models/User.php
View File

@ -180,13 +180,6 @@ class User extends AbstractModel
*/
public static function reg($email, $password, $other = [])
{
//邮箱
if (!Base::isMail($email)) {
throw new ApiException('请输入正确的邮箱地址');
}
if (User::email2userid($email) > 0) {
throw new ApiException('邮箱地址已存在');
}
//密码
self::passwordPolicy($password);
//开始注册

9
public/js/language.all.js
View File

@ -438,5 +438,14 @@
{"CN": "月","EN": "Month","TC": "月","KM": "ខេ","TH": "เดือน","KO": "달","JA": "月"},
{"CN": "日","EN": "Day","TC": "日","KM": "ថៃ","TH": "วัน","KO": "일","JA": "日"},
{"CN": "天","EN": "Day","TC": "天","KM": "ថៃ","TH": "วัน","KO": "일","JA": "日"},
{"CN": "请输入邮箱地址","EN": "Please input the email address","TC": "請輸入郵箱地址","KM": "សូមបញ្ចូលអាសយដ្ឋានអ៊ីមែល","TH": "กรุณาใส่ที่อยู่อีเมล","KO": "이메일 주소를 입력하십시오","JA": "電子メールアドレスを入力してください"},
{"CN": "请输入正确的邮箱地址","EN": "Please input the correct email address","TC": "請輸入正確的郵箱地址","KM": "សូមបញ្ចូលអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវ","TH": "โปรดป้อนที่อยู่อีเมลที่ถูกต้อง","KO": "올바른 이메일 주소를 입력하십시오","JA": "正しいEメールアドレスを入力してください"},
{"CN": "请输入密码","EN": "Please enter your password","TC": "請輸入密碼","KM": "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក","TH": "กรุณาใส่รหัสผ่านของคุณ","KO": "암호를 입력하십시오","JA": "パスワードを入力してください"},
{"CN": "确认密码输入不一致","EN": "Confirm password input is inconsistent","TC": "確認密碼輸入不一致","KM": "បញ្ជាក់ការបញ្ចូលពាក្យសម្ងាត់គឺមិនស្ថិតស្ថេរ","TH": "ยืนยันการป้อนรหัสผ่านไม่สอดคล้องกัน","KO": "암호 입력이 일치하지 않는지 확인하십시오","JA": "パスワード入力の確認が矛盾しています"},
{"CN": "请输入注册邀请码","EN": "Please enter the registration invitation code","TC": "請輸入註冊邀請碼","KM": "សូមបញ្ចូលលេខកូដការចុះឈ្មោះចុះឈ្មោះ","TH": "กรุณาใส่รหัสเชิญลงทะเบียน","KO": "등록 초대 코드를 입력하십시오","JA": "登録招待状コードを入力してください"},
{"CN": "邀请码","EN": "Invitation code","TC": "邀請碼","KM": "លេខ​កូដ​ការ​អញ្ជើញ","TH": "รหัสการเชิญ","KO": "초대 코드","JA": "招待コード"},
{"CN": "取消置顶","EN": "Cancel","TC": "取消置頂","KM": "លប់ចោល","TH": "ยกเลิก","KO": "취소","JA": "キャンセル"},
{"CN": "置顶该聊天","EN": "Top the chat","TC": "置頂該聊天","KM": "បញ្ចូលការជជែក","TH": "ด้านบนการแชท","KO": "채팅 상단","JA": "トップチャット"},
{"CN": "请输入正确的邀请码","EN": "Please enter the correct invitation code","TC": "請輸入正確的邀請碼","KM": "សូមបញ្ចូលលេខកូដអញ្ជើញត្រឹមត្រូវ","TH": "โปรดป้อนรหัสเชิญที่ถูกต้อง","KO": "올바른 초대 코드를 입력하십시오","JA": "正しい招待状コードを入力してください"},
]
})(window)

9
resources/assets/js/pages/login.vue
View File

@ -243,12 +243,6 @@ export default {
if (!this.password) {
return;
}
if (this.loginType == 'reg') {
if (this.password != this.password2) {
$A.messageWarning("确认密码输入不一致");
return;
}
}
this.loadIng++;
this.$store.dispatch("call", {
url: 'users/login',
@ -256,6 +250,7 @@ export default {
type: this.loginType,
email: this.email,
password: this.password,
password2: this.password2,
code: this.code,
invite: this.invite,
},
@ -269,7 +264,7 @@ export default {
});
}).catch(({data, msg}) => {
this.loadIng--;
$A.modalError(msg);
$A.modalError(this.$L(msg));
if (data.code === 'need') {
this.reCode();
this.codeNeed = true;

9
resources/assets/statics/public/js/language.all.js
View File

@ -438,5 +438,14 @@
{"CN": "月","EN": "Month","TC": "月","KM": "ខេ","TH": "เดือน","KO": "달","JA": "月"},
{"CN": "日","EN": "Day","TC": "日","KM": "ថៃ","TH": "วัน","KO": "일","JA": "日"},
{"CN": "天","EN": "Day","TC": "天","KM": "ថៃ","TH": "วัน","KO": "일","JA": "日"},
{"CN": "请输入邮箱地址","EN": "Please input the email address","TC": "請輸入郵箱地址","KM": "សូមបញ្ចូលអាសយដ្ឋានអ៊ីមែល","TH": "กรุณาใส่ที่อยู่อีเมล","KO": "이메일 주소를 입력하십시오","JA": "電子メールアドレスを入力してください"},
{"CN": "请输入正确的邮箱地址","EN": "Please input the correct email address","TC": "請輸入正確的郵箱地址","KM": "សូមបញ្ចូលអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវ","TH": "โปรดป้อนที่อยู่อีเมลที่ถูกต้อง","KO": "올바른 이메일 주소를 입력하십시오","JA": "正しいEメールアドレスを入力してください"},
{"CN": "请输入密码","EN": "Please enter your password","TC": "請輸入密碼","KM": "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក","TH": "กรุณาใส่รหัสผ่านของคุณ","KO": "암호를 입력하십시오","JA": "パスワードを入力してください"},
{"CN": "确认密码输入不一致","EN": "Confirm password input is inconsistent","TC": "確認密碼輸入不一致","KM": "បញ្ជាក់ការបញ្ចូលពាក្យសម្ងាត់គឺមិនស្ថិតស្ថេរ","TH": "ยืนยันการป้อนรหัสผ่านไม่สอดคล้องกัน","KO": "암호 입력이 일치하지 않는지 확인하십시오","JA": "パスワード入力の確認が矛盾しています"},
{"CN": "请输入注册邀请码","EN": "Please enter the registration invitation code","TC": "請輸入註冊邀請碼","KM": "សូមបញ្ចូលលេខកូដការចុះឈ្មោះចុះឈ្មោះ","TH": "กรุณาใส่รหัสเชิญลงทะเบียน","KO": "등록 초대 코드를 입력하십시오","JA": "登録招待状コードを入力してください"},
{"CN": "邀请码","EN": "Invitation code","TC": "邀請碼","KM": "លេខ​កូដ​ការ​អញ្ជើញ","TH": "รหัสการเชิญ","KO": "초대 코드","JA": "招待コード"},
{"CN": "取消置顶","EN": "Cancel","TC": "取消置頂","KM": "លប់ចោល","TH": "ยกเลิก","KO": "취소","JA": "キャンセル"},
{"CN": "置顶该聊天","EN": "Top the chat","TC": "置頂該聊天","KM": "បញ្ចូលការជជែក","TH": "ด้านบนการแชท","KO": "채팅 상단","JA": "トップチャット"},
{"CN": "请输入正确的邀请码","EN": "Please enter the correct invitation code","TC": "請輸入正確的邀請碼","KM": "សូមបញ្ចូលលេខកូដអញ្ជើញត្រឹមត្រូវ","TH": "โปรดป้อนรหัสเชิญที่ถูกต้อง","KO": "올바른 초대 코드를 입력하십시오","JA": "正しい招待状コードを入力してください"},
]
})(window)