From 02356666ca267f505e16643768cbd3b35b850929 Mon Sep 17 00:00:00 2001
From: lkddi <lkddi@163.com>
Date: Fri, 27 Feb 2026 09:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=A2=9E=E5=BC=BA?=
 =?UTF-8?q?=20SMTP=20=E8=BF=9E=E9=80=9A=E6=80=A7=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=AE=B9=E9=94=99=EF=BC=8C=E5=8A=A0=E5=85=A5=2010=20=E7=A7=92?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E9=99=90=E5=88=B6=E9=81=BF=E5=85=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E4=B8=8D=E9=80=9A=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=AD=BB=E9=94=81=EF=BC=8C=E5=B9=B6=E6=8D=95=E8=8E=B7=20Throwa?=
 =?UTF-8?q?ble=20=E9=98=B2=E6=AD=A2=E8=87=B4=E5=91=BD=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/SmtpController.php | 2 +-
 app/Providers/AppServiceProvider.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/SmtpController.php b/app/Http/Controllers/Admin/SmtpController.php
index 052ee67..9805b90 100644
--- a/app/Http/Controllers/Admin/SmtpController.php
+++ b/app/Http/Controllers/Admin/SmtpController.php
@@ -77,7 +77,7 @@ class SmtpController extends Controller
             });
 
             return redirect()->route('admin.smtp.edit')->with('success', "测试邮件已成功发送至 {$testEmail}，请注意查收。");
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return redirect()->route('admin.smtp.edit')->with('error', "测试发出失败，原因：" . $e->getMessage());
         }
     }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index cccff55..b94445e 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -36,7 +36,7 @@ class AppServiceProvider extends ServiceProvider
                         'encryption' => $smtpConfig->get('smtp_encryption', 'ssl'),
                         'username' => $smtpConfig->get('smtp_username'),
                         'password' => $smtpConfig->get('smtp_password'),
-                        'timeout' => null,
+                        'timeout'  => 10,
                         'local_domain' => env('MAIL_EHLO_DOMAIN'),
                     ]);