Upgrade Professional Edition

app/Models/UserEmailVerification.php

@@ -16,6 +16,7 @@ use Guanguans\Notify\Messages\EmailMessage;
  * @property string|null $code 验证参数
  * @property string|null $email 电子邮箱
  * @property int|null $status 0-未验证，1-已验证
+ * @property int|null $type 邮件类型：1-邮箱认证，2-修改邮箱
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification newModelQuery()
@@ -26,6 +27,7 @@ use Guanguans\Notify\Messages\EmailMessage;
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereEmail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserEmailVerification whereUserid($value)
  * @mixin \Eloquent
@@ -36,38 +38,54 @@ class UserEmailVerification extends AbstractModel
     /**
      * 发验证邮箱
      * @param User $user
+     * @param int $type
+     * @param null $email
      */
-    public static function userEmailSend(User $user)
+    public static function userEmailSend(User $user, $type = 1, $email = null)
     {
-        $res = self::whereUserid($user->userid)->where('created_at', '>', Carbon::now()->subMinutes(30))->first();
-        if ($res) return;
+        $email = $type == 1 ? $user->email : $email;
+        $res = self::whereEmail($email)->where('created_at', '>', Carbon::now()->subMinutes(30))->whereType($type)->first();
+        if ($res && $type == 1) return;
         //删除
-        self::whereUserid($user->userid)->delete();
-        $userEmailVerification = self::createInstance([
+        self::whereUserid($email)->delete();
+        $code = $type == 1 ? Base::generatePassword(64) : rand(100000, 999999);
+        $row = self::createInstance([
             'userid' => $user->userid,
-            'email' => $user->email,
-            'code' => Base::generatePassword(64),
+            'email' => $email,
+            'code' => $code,
             'status' => 0,
+            'type' => $type
         ]);
-        $userEmailVerification->save();
-
+        $row->save();
         $setting = Base::setting('emailSetting');
-        $url = Base::fillUrl('single/valid/email') . '?code=' . $userEmailVerification->code;
         try {
-            if (!Base::isEmail($user->email)) {
-                throw new \Exception("User email '{$user->email}' address error");
+            if (!Base::isEmail($email)) {
+                throw new \Exception("User email '{$email}' address error");
+            }
+            switch ($type) {
+                case 2:
+                    $subject = env('APP_NAME') . "修改邮箱验证";
+                    $content = "<p>{$user->nickname} 您好，您正在修改 " . env('APP_NAME') . " 的邮箱，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    break;
+                case 3:
+                    $subject = env('APP_NAME') . "注销帐号验证";
+                    $content = "<p>{$user->nickname} 您好，您正在注销 " . env('APP_NAME') . " 的帐号，验证码如下。请在30分钟内输入验证码</p><p style='color: #0000DD;'><u>$code</u></p><p>如果不是本人操作，您的帐号可能存在风险，请及时修改密码!</p>";
+                    break;
+                default:
+                    $url = Base::fillUrl('single/valid/email') . '?code=' . $row->code;
+                    $subject = env('APP_NAME') . "绑定邮箱验证";
+                    $content = "<p>{$user->nickname} 您好，您正在绑定 " . env('APP_NAME') . " 的邮箱，请于30分钟之内点击以下链接完成验证 :</p><p style='display: flex; justify-content: center;'><a href='{$url}' target='_blank'>{$url}</a></p>";
+                    break;
             }
-            $subject = env('APP_NAME') . " 绑定邮箱验证";
-            $content = "<p>{$user->nickname} 您好，您正在绑定 " . env('APP_NAME') . " 的邮箱，请于30分钟之内点击以下链接完成验证 :</p><p style='display: flex; justify-content: center;'><a href='{$url}' target='_blank'>{$url}</a></p>";
             Factory::mailer()
                 ->setDsn("smtp://{$setting['account']}:{$setting['password']}@{$setting['smtp_server']}:{$setting['port']}?verify_peer=0")
                 ->setMessage(EmailMessage::create()
                     ->from(env('APP_NAME', 'Task') . " <{$setting['account']}>")
-                    ->to($user->email)
+                    ->to($email)
                     ->subject($subject)
                     ->html($content))
                 ->send();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             if (str_contains($e->getMessage(), "Timed Out")) {
                 throw new ApiException("language.TimedOut");
             } elseif ($e->getCode() === 550) {
@@ -77,4 +95,39 @@ class UserEmailVerification extends AbstractModel
             }
         }
     }
+
+    /**
+     * 校验验证码
+     * @param $email
+     * @param $code
+     * @param int $type
+     * @return bool
+     */
+    public static function verify($email, $code, $type = 1)
+    {
+        if (!$code) {
+            throw new ApiException('请输入验证码');
+        }
+        /** @var UserEmailVerification $emailVerify */
+        $emailVerify = self::whereEmail($email)->whereType($type)->orderByDesc('id')->first();
+
+        if (empty($emailVerify) || $emailVerify->code != $code) {
+            throw new ApiException('验证码错误');
+        }
+
+        $oldTime = Carbon::parse($emailVerify->created_at)->timestamp;
+        $time = Base::Time();
+
+        // 30分钟失效
+        if (abs($time - $oldTime) > 1800) {
+            throw new ApiException('验证码已失效');
+        }
+
+        self::whereEmail($email)->whereCode($code)->whereType($type)->update([
+            'status' => 1
+        ]);
+
+        return true;
+    }
+
 }