🐛 修复 BUG

This commit is contained in:
Wisp X
2022-03-05 01:51:00 +08:00
parent 43b5b09714
commit a43df045d7
+8 -1
View File
@@ -3,8 +3,10 @@
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;
@@ -41,7 +43,12 @@ class AppServiceProvider extends ServiceProvider
if (file_exists(base_path('installed.lock'))) {
// 覆盖默认配置
Config::set('app.name', Utils::config(ConfigKey::AppName));
Config::set('mail', array_merge(\config('mail'), Utils::config(ConfigKey::Mail)->toArray()));
/** @var Collection $mailConfigs */
$mailConfigs = Utils::config(ConfigKey::Mail);
if ($mailConfigs->get(SmtpOption::Host)) {
Config::set('mail', array_merge(\config('mail'), $mailConfigs->toArray()));
}
$configs = Auth::check() && Auth::user()->group ?
Auth::user()->group->configs :