tcjlj/Xboard
1
0
Fork 0
mirror of https://github.com/cedar2025/Xboard.git synced 2025-01-22 10:38:14 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: 修复邮箱配置无法从环境变量读取的问题

Browse Source
This commit is contained in:
xboard 2024-01-01 01:06:07 +08:00
parent 2c963d9a7d
commit cdc86bbe47
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Functions.php
View File

@ -28,6 +28,6 @@ if (! function_exists('admin_setting')) {
return;
}
$default = config('v2board.'. $key) ?? $default;
return app('setting')->get($key, $default) ;
return app('setting')->get($key) ?? $default ;
}
}

12
app/Jobs/SendEmailJob.php
View File

@ -37,12 +37,12 @@ class SendEmailJob implements ShouldQueue
public function handle()
{
if (admin_setting('email_host')) {
Config::set('mail.host', admin_setting('email_host', env('mail.host')));
Config::set('mail.port', admin_setting('email_port', env('mail.port')));
Config::set('mail.encryption', admin_setting('email_encryption', env('mail.encryption')));
Config::set('mail.username', admin_setting('email_username', env('mail.username')));
Config::set('mail.password', admin_setting('email_password', env('mail.password')));
Config::set('mail.from.address', admin_setting('email_from_address', env('mail.from.address')));
Config::set('mail.host', admin_setting('email_host', config('mail.host')));
Config::set('mail.port', admin_setting('email_port', config('mail.port')));
Config::set('mail.encryption', admin_setting('email_encryption', config('mail.encryption')));
Config::set('mail.username', admin_setting('email_username', config('mail.username')));
Config::set('mail.password', admin_setting('email_password', config('mail.password')));
Config::set('mail.from.address', admin_setting('email_from_address', config('mail.from.address')));
Config::set('mail.from.name', admin_setting('app_name', 'XBoard'));
}
$params = $this->params;