tcjlj/Xboard
1
0
Fork 0
mirror of https://github.com/cedar2025/Xboard.git synced 2025-02-02 07:28:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add postal mail driver

Browse Source
This commit is contained in:
pplulee 2024-02-17 12:02:11 +00:00
parent 53efe20a86
commit 6507d7888d
No known key found for this signature in database
GPG Key ID: 6D33AC64A79E0C35
4 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/V1/Admin/ConfigController.php
View File

@ -128,7 +128,9 @@ class ConfigController extends Controller
'email_username' => admin_setting('email_username'), 'email_username' => admin_setting('email_username'),
'email_password' => admin_setting('email_password'), 'email_password' => admin_setting('email_password'),
'email_encryption' => admin_setting('email_encryption'), 'email_encryption' => admin_setting('email_encryption'),
'email_from_address' => admin_setting('email_from_address') 'email_from_address' => admin_setting('email_from_address'),
'email_postal_host' => admin_setting('email_postal_host'),
'email_postal_key' => admin_setting('email_postal_key'),
], ],
'telegram' => [ 'telegram' => [
'telegram_bot_enable' => admin_setting('telegram_bot_enable', 0), 'telegram_bot_enable' => admin_setting('telegram_bot_enable', 0),

2
app/Http/Requests/Admin/ConfigSave.php
View File

@ -62,6 +62,8 @@ class ConfigSave extends FormRequest
'email_password' => '', 'email_password' => '',
'email_encryption' => '', 'email_encryption' => '',
'email_from_address' => '', 'email_from_address' => '',
'email_postal_host' => '',
'email_postal_key' => '',
// telegram // telegram
'telegram_bot_enable' => 'in:0,1', 'telegram_bot_enable' => 'in:0,1',
'telegram_bot_token' => '', 'telegram_bot_token' => '',

26
app/Jobs/SendEmailJob.php
View File

@ -10,6 +10,8 @@ use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Mail;
use App\Models\MailLog; use App\Models\MailLog;
use Postal\Client;
use Postal\Send\Message;
class SendEmailJob implements ShouldQueue class SendEmailJob implements ShouldQueue
{ {
@ -36,20 +38,26 @@ class SendEmailJob implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
$driver = "";
if (admin_setting('email_host')) { if (admin_setting('email_host')) {
$driver = "SMTP";
Config::set('mail.host', admin_setting('email_host', config('mail.host'))); 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.port', admin_setting('email_port', config('mail.port')));
Config::set('mail.encryption', admin_setting('email_encryption', config('mail.encryption'))); 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.username', admin_setting('email_username', config('mail.username')));
Config::set('mail.password', admin_setting('email_password', config('mail.password'))); Config::set('mail.password', admin_setting('email_password', config('mail.password')));
} elseif (admin_setting('email_postal_host')) {
$driver = "Postal";
}
Config::set('mail.from.address', admin_setting('email_from_address', config('mail.from.address'))); Config::set('mail.from.address', admin_setting('email_from_address', config('mail.from.address')));
Config::set('mail.from.name', admin_setting('app_name', 'XBoard')); Config::set('mail.from.name', admin_setting('app_name', 'XBoard'));
}
$params = $this->params; $params = $this->params;
$email = $params['email']; $email = $params['email'];
$subject = $params['subject']; $subject = $params['subject'];
$params['template_name'] = 'mail.' . admin_setting('email_template', 'default') . '.' . $params['template_name']; $params['template_name'] = 'mail.' . admin_setting('email_template', 'default') . '.' . $params['template_name'];
try { try {
switch ($driver) {
case 'SMTP':
Mail::send( Mail::send(
$params['template_name'], $params['template_name'],
$params['template_value'], $params['template_value'],
@ -57,6 +65,22 @@ class SendEmailJob implements ShouldQueue
$message->to($email)->subject($subject); $message->to($email)->subject($subject);
} }
); );
break;
case 'Postal':
$senderName = Config::get('mail.from.name');
$senderAddress = Config::get('mail.from.address');
$client = new Client(admin_config('email_postal_host'), admin_config('email_postal_key'));
$message = new Message();
$message->to($email);
$message->from("$senderName <$senderAddress>");
$message->sender($senderAddress);
$message->subject($subject);
$message->htmlBody(view($params['template_name'], $params['template_value'])->render());
$client->send->message($message);
break;
default:
break;
}
} catch (\Exception $e) { } catch (\Exception $e) {
$error = $e->getMessage(); $error = $e->getMessage();
} }

1
composer.json
View File

@ -28,6 +28,7 @@
"nunomaduro/collision": "^7.10", "nunomaduro/collision": "^7.10",
"paragonie/sodium_compat": "^1.20", "paragonie/sodium_compat": "^1.20",
"php-curl-class/php-curl-class": "^8.6", "php-curl-class/php-curl-class": "^8.6",
"postal/postal": "^2.0",
"spatie/db-dumper": "^3.4", "spatie/db-dumper": "^3.4",
"stripe/stripe-php": "^7.36.1", "stripe/stripe-php": "^7.36.1",
"symfony/http-client": "^6.4", "symfony/http-client": "^6.4",