From 23678302ba588ff846acf1e42619e3a9bad2a82f Mon Sep 17 00:00:00 2001
From: Wisp X <wisp-x@qq.com>
Date: Sat, 5 Mar 2022 21:34:47 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Auth/RegisteredUserController.php | 4 +++-
 app/Providers/AppServiceProvider.php                   | 9 +--------
 config/convention.php                                  | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
index 44e78bcc..93d65845 100644
--- a/app/Http/Controllers/Auth/RegisteredUserController.php
+++ b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -54,7 +54,9 @@ class RegisteredUserController extends Controller
             'password' => Hash::make($request->password),
         ]);
 
-        event(new Registered($user));
+        if (Utils::config(ConfigKey::IsUserNeedVerify)) {
+            event(new Registered($user));
+        }
 
         Auth::login($user);
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 577f4612..fc20f746 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,10 +3,8 @@
 namespace App\Providers;
 
 use App\Enums\ConfigKey;
-use App\Enums\Mail\SmtpOption;
 use App\Models\Group;
 use App\Utils;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
@@ -43,12 +41,7 @@ class AppServiceProvider extends ServiceProvider
         if (file_exists(base_path('installed.lock'))) {
             // 覆盖默认配置
             Config::set('app.name', Utils::config(ConfigKey::AppName));
-
-            /** @var Collection $mailConfigs */
-            $mailConfigs = Utils::config(ConfigKey::Mail);
-            if ($mailConfigs->get(SmtpOption::Host)) {
-                Config::set('mail', array_merge(\config('mail'), $mailConfigs->toArray()));
-            }
+            Config::set('mail', array_merge(\config('mail'), Utils::config(ConfigKey::Mail)->toArray()));
 
             $configs = Auth::check() && Auth::user()->group ?
                 Auth::user()->group->configs :
diff --git a/config/convention.php b/config/convention.php
index 0b28f9a8..4c865409 100644
--- a/config/convention.php
+++ b/config/convention.php
@@ -22,7 +22,7 @@ return [
         ConfigKey::IsEnableApi => 1,
         ConfigKey::IsAllowGuestUpload => 1,
         ConfigKey::UserInitialCapacity => 512000,
-        ConfigKey::IsUserNeedVerify => 1,
+        ConfigKey::IsUserNeedVerify => 0,
         ConfigKey::Mail => [
             'default' => 'smtp',
             'mailers' => [