合并优化

2022-03-10 17:44:57 +08:00
parent 48b7f4924e
commit 43c51d48d9
77 changed files with 505 additions and 1552 deletions
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -187,7 +187,7 @@ class User extends AbstractModel
            throw new ApiException('请输入正确的邮箱地址');
        }
        if (User::email2userid($email) > 0) {
-            $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open' ? true : false;
+            $isRegVerify = Base::settingFind('emailSetting', 'reg_verify') === 'open';
            $user = self::whereUserid(User::email2userid($email))->first();
            if ($isRegVerify && $user->is_email_verity === 0) {
                UserEmailVerification::userEmailSend($user);