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'),
                     ]);