优化代码

app/Components/Helpers.php

@@ -3,6 +3,8 @@
 namespace App\Components;
 
 use App\Http\Models\Config;
+use App\Http\Models\CouponLog;
+use App\Http\Models\EmailLog;
 use App\Http\Models\Level;
 use App\Http\Models\SsConfig;
 use App\Http\Models\User;
@@ -105,4 +107,49 @@ class Helpers
     {
         return Level::query()->get()->sortBy('level');
     }
+
+    /**
+     * 写入邮件发送日志
+     *
+     * @param int    $user_id 用户ID
+     * @param string $title   标题
+     * @param string $content 内容
+     * @param int    $status  投递状态
+     * @param string $error   投递失败时记录的异常信息
+     *
+     * @return int
+     */
+    public static function addEmailLog($user_id, $title, $content, $status = 1, $error = '')
+    {
+        $log = new EmailLog();
+        $log->user_id = $user_id;
+        $log->title = $title;
+        $log->content = $content;
+        $log->status = $status;
+        $log->error = $error;
+        $log->created_at = date('Y-m-d H:i:s');
+
+        return $log->save();
+    }
+
+    /**
+     * 添加优惠券操作日志
+     *
+     * @param int    $couponId 优惠券ID
+     * @param int    $goodsId  商品ID
+     * @param int    $orderId  订单ID
+     * @param string $desc     备注
+     *
+     * @return int
+     */
+    public static function addCouponLog($couponId, $goodsId, $orderId, $desc = '')
+    {
+        $log = new CouponLog();
+        $log->coupon_id = $couponId;
+        $log->goods_id = $goodsId;
+        $log->order_id = $orderId;
+        $log->desc = $desc;
+
+        return $log->save();
+    }
 }

app/Components/Namesilo.php

@@ -2,8 +2,6 @@
 
 namespace App\Components;
 
-use App\Http\Models\Config;
-use App\Http\Models\EmailLog;
 use LSS\XML2Array;
 use Log;
 
@@ -91,39 +89,18 @@ class Namesilo
 
             // 出错
             if (empty($result['namesilo']) || $result['namesilo']['reply']['code'] != 300 || $result['namesilo']['reply']['detail'] != 'success') {
-                $this->addEmailLog(1, '[Namesilo API] - [' . $operation . ']', $content, 0, $result['namesilo']['reply']['detail']);
+                Helpers::addEmailLog(1, '[Namesilo API] - [' . $operation . ']', $content, 0, $result['namesilo']['reply']['detail']);
             }
 
             return $result['namesilo']['reply'];
         } catch (\Exception $e) {
             Log::error('CURL请求失败：' . $e->getMessage() . ' --- ' . $e->getLine());
-            $this->addEmailLog(1, '[Namesilo API] - [' . $operation . ']', $content, 0, $e->getMessage());
+            Helpers::addEmailLog(1, '[Namesilo API] - [' . $operation . ']', $content, 0, $e->getMessage());
 
             return false;
         }
     }
 
-    /**
-     * 写入邮件发送日志
-     *
-     * @param int    $user_id 用户ID
-     * @param string $title   标题
-     * @param string $content 内容
-     * @param int    $status  投递状态
-     * @param string $error   投递失败时记录的异常信息
-     */
-    private function addEmailLog($user_id, $title, $content, $status = 1, $error = '')
-    {
-        $emailLogObj = new EmailLog();
-        $emailLogObj->user_id = $user_id;
-        $emailLogObj->title = $title;
-        $emailLogObj->content = $content;
-        $emailLogObj->status = $status;
-        $emailLogObj->error = $error;
-        $emailLogObj->created_at = date('Y-m-d H:i:s');
-        $emailLogObj->save();
-    }
-
     // 发起一个CURL请求
     private function curlRequest($url, $data = [])
     {

app/Components/ServerChan.php

@@ -2,8 +2,6 @@
 
 namespace App\Components;
 
-use App\Http\Models\Config;
-use App\Http\Models\EmailLog;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7;
 use GuzzleHttp\Exception\RequestException;
@@ -19,10 +17,13 @@ class ServerChan
     }
 
     /**
+     * 推送消息
+     *
      * @param string $title   消息标题
      * @param string $content 消息内容
      *
-     * @return string
+     * @return mixed
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     public function send($title, $content)
     {
@@ -38,9 +39,9 @@ class ServerChan
 
             $result = json_decode($response->getBody());
             if (!$result->errno) {
-                $this->addEmailLog(1, '[ServerChan]' . $title, $content);
+                Helpers::addEmailLog(1, '[ServerChan]' . $title, $content);
             } else {
-                $this->addEmailLog(1, '[ServerChan]' . $title, $content, 0, $result->errmsg);
+                Helpers::addEmailLog(1, '[ServerChan]' . $title, $content, 0, $result->errmsg);
             }
         } catch (RequestException $e) {
             Log::error(Psr7\str($e->getRequest()));
@@ -49,25 +50,4 @@ class ServerChan
             }
         }
     }
-
-    /**
-     * 写入邮件发送日志
-     *
-     * @param int    $user_id 用户ID
-     * @param string $title   标题
-     * @param string $content 内容
-     * @param int    $status  投递状态
-     * @param string $error   投递失败时记录的异常信息
-     */
-    private function addEmailLog($user_id, $title, $content, $status = 1, $error = '')
-    {
-        $emailLogObj = new EmailLog();
-        $emailLogObj->user_id = $user_id;
-        $emailLogObj->title = $title;
-        $emailLogObj->content = $content;
-        $emailLogObj->status = $status;
-        $emailLogObj->error = $error;
-        $emailLogObj->created_at = date('Y-m-d H:i:s');
-        $emailLogObj->save();
-    }
 }

app/Console/Commands/AutoCheckNodeStatus.php

@@ -5,7 +5,6 @@ namespace App\Console\Commands;
 use App\Components\Helpers;
 use Illuminate\Console\Command;
 use App\Components\ServerChan;
-use App\Http\Models\EmailLog;
 use App\Http\Models\SsNode;
 use App\Http\Models\SsNodeInfo;
 use App\Mail\nodeCrashWarning;
@@ -141,6 +140,8 @@ class AutoCheckNodeStatus extends Command
      * @param string $content    消息内容
      * @param string $nodeName   节点名称
      * @param string $nodeServer 节点域名
+     *
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     private function notifyMaster($title, $content, $nodeName, $nodeServer)
     {
@@ -161,9 +162,9 @@ class AutoCheckNodeStatus extends Command
         if (self::$systemConfig['is_node_crash_warning'] && self::$systemConfig['crash_warning_email']) {
             try {
                 Mail::to(self::$systemConfig['crash_warning_email'])->send(new nodeCrashWarning(self::$systemConfig['website_name'], $nodeName, $nodeServer));
-                $this->addEmailLog(1, $title, $content);
+                Helpers::addEmailLog(1, $title, $content);
             } catch (\Exception $e) {
-                $this->addEmailLog(1, $title, $content, 0, $e->getMessage());
+                Helpers::addEmailLog(1, $title, $content, 0, $e->getMessage());
             }
         }
     }
@@ -173,6 +174,8 @@ class AutoCheckNodeStatus extends Command
      *
      * @param string $title   消息标题
      * @param string $content 消息内容
+     *
+     * @throws \GuzzleHttp\Exception\GuzzleException
      */
     private function notifyMasterByServerchan($title, $content)
     {
@@ -182,27 +185,6 @@ class AutoCheckNodeStatus extends Command
         }
     }
 
-    /**
-     * 添加邮件发送日志
-     *
-     * @param int    $userId  接收者用户ID
-     * @param string $title   标题
-     * @param string $content 内容
-     * @param int    $status  投递状态
-     * @param string $error   投递失败时记录的异常信息
-     */
-    private function addEmailLog($userId, $title, $content, $status = 1, $error = '')
-    {
-        $emailLogObj = new EmailLog();
-        $emailLogObj->user_id = $userId;
-        $emailLogObj->title = $title;
-        $emailLogObj->content = $content;
-        $emailLogObj->status = $status;
-        $emailLogObj->error = $error;
-        $emailLogObj->created_at = date('Y-m-d H:i:s');
-        $emailLogObj->save();
-    }
-
     /**
      * 发起一个CURL请求
      *

app/Console/Commands/AutoJob.php

@@ -4,7 +4,6 @@ namespace App\Console\Commands;
 
 use App\Components\Helpers;
 use App\Components\Yzy;
-use App\Http\Models\EmailLog;
 use App\Http\Models\Goods;
 use App\Http\Models\GoodsLabel;
 use App\Http\Models\ReferralLog;
@@ -14,7 +13,6 @@ use App\Http\Models\UserBalanceLog;
 use App\Mail\sendUserInfo;
 use Illuminate\Console\Command;
 use App\Http\Models\Coupon;
-use App\Http\Models\CouponLog;
 use App\Http\Models\Invite;
 use App\Http\Models\Order;
 use App\Http\Models\Payment;
@@ -455,9 +453,9 @@ class AutoJob extends Command
 
                             try {
                                 Mail::to($order->email)->send(new sendUserInfo(self::$systemConfig['website_name'], $content));
-                                $this->sendEmailLog($order->user_id, $title, json_encode($content));
+                                Helpers::addEmailLog($order->user_id, $title, json_encode($content));
                             } catch (\Exception $e) {
-                                $this->sendEmailLog($order->user_id, $title, json_encode($content), 0, $e->getMessage());
+                                Helpers::addEmailLog($order->user_id, $title, json_encode($content), 0, $e->getMessage());
                             }
                         }
 
@@ -491,7 +489,7 @@ class AutoJob extends Command
                     if ($payment->order->coupon_id) {
                         Coupon::query()->where('id', $payment->order->coupon_id)->update(['status' => 0]);
 
-                        $this->addCouponLog($payment->order->coupon_id, $payment->order->goods_id, $payment->oid, '订单超时未支付，自动退回');
+                        Helpers::addCouponLog($payment->order->coupon_id, $payment->order->goods_id, $payment->oid, '订单超时未支付，自动退回');
                     }
                 }
 
@@ -520,24 +518,6 @@ class AutoJob extends Command
         $log->save();
     }
 
-    /**
-     * 添加优惠券操作日志
-     *
-     * @param int    $couponId 优惠券ID
-     * @param int    $goodsId  商品ID
-     * @param int    $orderId  订单ID
-     * @param string $desc     备注
-     */
-    private function addCouponLog($couponId, $goodsId, $orderId, $desc = '')
-    {
-        $couponLog = new CouponLog();
-        $couponLog->coupon_id = $couponId;
-        $couponLog->goods_id = $goodsId;
-        $couponLog->order_id = $orderId;
-        $couponLog->desc = $desc;
-        $couponLog->save();
-    }
-
     /**
      * 添加返利日志
      *
@@ -587,25 +567,4 @@ class AutoJob extends Command
 
         return $log->save();
     }
-
-    /**
-     * 添加邮件发送日志
-     *
-     * @param int    $userId  接收者用户ID
-     * @param string $title   标题
-     * @param string $content 内容
-     * @param int    $status  投递状态
-     * @param string $error   投递失败时记录的异常信息
-     */
-    private function sendEmailLog($userId, $title, $content, $status = 1, $error = '')
-    {
-        $emailLogObj = new EmailLog();
-        $emailLogObj->user_id = $userId;
-        $emailLogObj->title = $title;
-        $emailLogObj->content = $content;
-        $emailLogObj->status = $status;
-        $emailLogObj->error = $error;
-        $emailLogObj->created_at = date('Y-m-d H:i:s');
-        $emailLogObj->save();
-    }
 }

app/Console/Commands/UserExpireAutoWarning.php

@@ -5,7 +5,6 @@ namespace App\Console\Commands;
 use App\Components\Helpers;
 use Illuminate\Console\Command;
 use App\Http\Models\User;
-use App\Http\Models\EmailLog;
 use App\Mail\userExpireWarning;
 use App\Mail\userExpireWarningToday;
 use Mail;
@@ -56,9 +55,9 @@ class UserExpireAutoWarning extends Command
 
                 try {
                     Mail::to($user->username)->send(new userExpireWarningToday(self::$systemConfig['website_name']));
-                    $this->sendEmailLog($user->id, $title, $content);
+                    Helpers::addEmailLog($user->id, $title, $content);
                 } catch (\Exception $e) {
-                    $this->sendEmailLog($user->id, $title, $content, 0, $e->getMessage());
+                    Helpers::addEmailLog($user->id, $title, $content, 0, $e->getMessage());
                 }
             } elseif ($lastCanUseDays > 0 && $lastCanUseDays <= self::$systemConfig['expire_days']) {
                 $title = '账号过期提醒';
@@ -66,32 +65,11 @@ class UserExpireAutoWarning extends Command
 
                 try {
                     Mail::to($user->username)->send(new userExpireWarning(self::$systemConfig['website_name'], $lastCanUseDays));
-                    $this->sendEmailLog($user->id, $title, $content);
+                    Helpers::addEmailLog($user->id, $title, $content);
                 } catch (\Exception $e) {
-                    $this->sendEmailLog($user->id, $title, $content, 0, $e->getMessage());
+                    Helpers::addEmailLog($user->id, $title, $content, 0, $e->getMessage());
                 }
             }
         }
     }
-
-    /**
-     * 写入邮件发送日志
-     *
-     * @param int    $user_id 用户ID
-     * @param string $title   标题
-     * @param string $content 内容
-     * @param int    $status  投递状态
-     * @param string $error   投递失败时记录的异常信息
-     */
-    private function sendEmailLog($user_id, $title, $content, $status = 1, $error = '')
-    {
-        $emailLogObj = new EmailLog();
-        $emailLogObj->user_id = $user_id;
-        $emailLogObj->title = $title;
-        $emailLogObj->content = $content;
-        $emailLogObj->status = $status;
-        $emailLogObj->error = $error;
-        $emailLogObj->created_at = date('Y-m-d H:i:s');
-        $emailLogObj->save();
-    }
 }

app/Console/Commands/UserTrafficAbnormalAutoWarning.php

@@ -19,7 +19,6 @@ class UserTrafficAbnormalAutoWarning extends Command
     {
         parent::__construct();
         self::$systemConfig = Helpers::systemConfig();
-
     }
 
     public function handle()

app/Console/Commands/UserTrafficAutoWarning.php

@@ -5,7 +5,6 @@ namespace App\Console\Commands;
 use App\Components\Helpers;
 use Illuminate\Console\Command;
 use App\Http\Models\User;
-use App\Http\Models\EmailLog;
 use App\Mail\userTrafficWarning;
 use Mail;
 use Log;
@@ -54,32 +53,11 @@ class UserTrafficAutoWarning extends Command
 
                 try {
                     Mail::to($user->username)->send(new userTrafficWarning(self::$systemConfig['website_name'], $usedPercent));
-                    $this->sendEmailLog($user->id, $title, $content);
+                    Helpers::addEmailLog($user->id, $title, $content);
                 } catch (\Exception $e) {
-                    $this->sendEmailLog($user->id, $title, $content, 0, $e->getMessage());
+                    Helpers::addEmailLog($user->id, $title, $content, 0, $e->getMessage());
                 }
             }
         }
     }
-
-    /**
-     * 写入邮件发送日志
-     *
-     * @param int    $user_id 用户ID
-     * @param string $title   标题
-     * @param string $content 内容
-     * @param int    $status  投递状态
-     * @param string $error   投递失败时记录的异常信息
-     */
-    private function sendEmailLog($user_id, $title, $content, $status = 1, $error = '')
-    {
-        $emailLogObj = new EmailLog();
-        $emailLogObj->user_id = $user_id;
-        $emailLogObj->title = $title;
-        $emailLogObj->content = $content;
-        $emailLogObj->status = $status;
-        $emailLogObj->error = $error;
-        $emailLogObj->created_at = date('Y-m-d H:i:s');
-        $emailLogObj->save();
-    }
 }

app/Http/Controllers/Api/YzyController.php

@@ -287,9 +287,9 @@ class YzyController extends Controller
 
                 try {
                     Mail::to($order->email)->send(new sendUserInfo(self::$systemConfig['website_name'], $content));
-                    $this->sendEmailLog($order->user_id, $title, json_encode($content));
+                    Helpers::addEmailLog($order->user_id, $title, json_encode($content));
                 } catch (\Exception $e) {
-                    $this->sendEmailLog($order->user_id, $title, json_encode($content), 0, $e->getMessage());
+                    Helpers::addEmailLog($order->user_id, $title, json_encode($content), 0, $e->getMessage());
                 }
             }
 

app/Http/Controllers/Controller.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Models\CouponLog;
 use App\Http\Models\ReferralLog;
 use App\Http\Models\SensitiveWords;
 use App\Http\Models\UserBalanceLog;
@@ -13,11 +12,6 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use App\Http\Models\Config;
-use App\Http\Models\EmailLog;
-use App\Http\Models\Level;
-use App\Http\Models\SsConfig;
-use App\Http\Models\User;
 
 class Controller extends BaseController
 {
@@ -84,51 +78,6 @@ class Controller extends BaseController
         return $i;
     }
 
-    /**
-     * 写入邮件发送日志
-     *
-     * @param int    $user_id 用户ID
-     * @param string $title   标题
-     * @param string $content 内容
-     * @param int    $status  投递状态
-     * @param string $error   投递失败时记录的异常信息
-     *
-     * @return int
-     */
-    public function sendEmailLog($user_id, $title, $content, $status = 1, $error = '')
-    {
-        $log = new EmailLog();
-        $log->user_id = $user_id;
-        $log->title = $title;
-        $log->content = $content;
-        $log->status = $status;
-        $log->error = $error;
-        $log->created_at = date('Y-m-d H:i:s');
-
-        return $log->save();
-    }
-
-    /**
-     * 添加优惠券操作日志
-     *
-     * @param int    $couponId 优惠券ID
-     * @param int    $goodsId  商品ID
-     * @param int    $orderId  订单ID
-     * @param string $desc     备注
-     *
-     * @return int
-     */
-    public function addCouponLog($couponId, $goodsId, $orderId, $desc = '')
-    {
-        $log = new CouponLog();
-        $log->coupon_id = $couponId;
-        $log->goods_id = $goodsId;
-        $log->order_id = $orderId;
-        $log->desc = $desc;
-
-        return $log->save();
-    }
-
     /**
      * 记录余额操作日志
      *

app/Http/Controllers/PaymentController.php

@@ -82,14 +82,14 @@ class PaymentController extends Controller
         // 验证账号是否存在有效期更长的套餐
         if ($goods->type == 2) {
             $existOrderList = Order::query()
-                    ->with(['goods'])
-                    ->whereHas('goods', function ($q) {
-                        $q->where('type', 2);
-                    })
-                    ->where('user_id', $user['id'])
-                    ->where('is_expire', 0)
-                    ->where('status', 2)
-                    ->get();
+                ->with(['goods'])
+                ->whereHas('goods', function ($q) {
+                    $q->where('type', 2);
+                })
+                ->where('user_id', $user['id'])
+                ->where('is_expire', 0)
+                ->where('status', 2)
+                ->get();
 
             foreach ($existOrderList as $vo) {
                 if ($vo->goods->days > $goods->days) {
@@ -147,7 +147,7 @@ class PaymentController extends Controller
                     $coupon->save();
                 }
 
-                $this->addCouponLog($coupon->id, $goods_id, $order->oid, '在线支付使用');
+                Helpers::addCouponLog($coupon->id, $goods_id, $order->oid, '在线支付使用');
             }
 
             DB::commit();

app/Http/Controllers/RegisterController.php

@@ -207,9 +207,9 @@ class RegisterController extends Controller
 
                 try {
                     Mail::to($username)->send(new activeUser(self::$systemConfig['website_name'], $activeUserUrl));
-                    $this->sendEmailLog($user->id, '注册激活', '请求地址：' . $activeUserUrl);
+                    Helpers::addEmailLog($user->id, '注册激活', '请求地址：' . $activeUserUrl);
                 } catch (\Exception $e) {
-                    $this->sendEmailLog($user->id, '注册激活', '请求地址：' . $activeUserUrl, 0, $e->getMessage());
+                    Helpers::addEmailLog($user->id, '注册激活', '请求地址：' . $activeUserUrl, 0, $e->getMessage());
                 }
 
                 Session::flash('regSuccessMsg', '注册成功：激活邮件已发送，如未收到，请查看垃圾邮箱');
@@ -253,7 +253,7 @@ class RegisterController extends Controller
     {
         // 邀请人ID
         $referral_uid = 0;
-        
+
         // 邀请码ID
         $code_id = 0;
 

app/Http/Controllers/TicketController.php

@@ -69,17 +69,17 @@ class TicketController extends Controller
                     if (self::$systemConfig['crash_warning_email']) {
                         try {
                             Mail::to(self::$systemConfig['crash_warning_email'])->send(new replyTicket(self::$systemConfig['website_name'], $title, $content));
-                            $this->sendEmailLog(1, $title, $content);
+                            Helpers::addEmailLog(1, $title, $content);
                         } catch (\Exception $e) {
-                            $this->sendEmailLog(1, $title, $content, 0, $e->getMessage());
+                            Helpers::addEmailLog(1, $title, $content, 0, $e->getMessage());
                         }
                     }
                 } else {
                     try {
                         Mail::to($ticket->user->username)->send(new replyTicket(self::$systemConfig['website_name'], $title, $content));
-                        $this->sendEmailLog($ticket->user_id, $title, $content);
+                        Helpers::addEmailLog($ticket->user_id, $title, $content);
                     } catch (\Exception $e) {
-                        $this->sendEmailLog($ticket->user_id, $title, $content, 0, $e->getMessage());
+                        Helpers::addEmailLog($ticket->user_id, $title, $content, 0, $e->getMessage());
                     }
                 }
 
@@ -123,9 +123,9 @@ class TicketController extends Controller
         // 发邮件通知用户
         try {
             Mail::to($ticket->user->username)->send(new closeTicket(self::$systemConfig['website_name'], $title, $content));
-            $this->sendEmailLog($ticket->user_id, $title, $content);
+            Helpers::addEmailLog($ticket->user_id, $title, $content);
         } catch (\Exception $e) {
-            $this->sendEmailLog($ticket->user_id, $title, $content, 0, $e->getMessage());
+            Helpers::addEmailLog($ticket->user_id, $title, $content, 0, $e->getMessage());
         }
 
         return Response::json(['status' => 'success', 'data' => '', 'message' => '关闭成功']);

app/Http/Controllers/UserController.php

@@ -439,9 +439,9 @@ class UserController extends Controller
             if (self::$systemConfig['crash_warning_email']) {
                 try {
                     Mail::to(self::$systemConfig['crash_warning_email'])->send(new newTicket(self::$systemConfig['website_name'], $emailTitle, $content));
-                    $this->sendEmailLog(1, $emailTitle, $content);
+                    Helpers::addEmailLog(1, $emailTitle, $content);
                 } catch (\Exception $e) {
-                    $this->sendEmailLog(1, $emailTitle, $content, 0, $e->getMessage());
+                    Helpers::addEmailLog(1, $emailTitle, $content, 0, $e->getMessage());
                 }
             }
 
@@ -487,13 +487,13 @@ class UserController extends Controller
                 $content = "标题：【" . $ticket->title . "】<br>用户回复：" . $content;
 
                 // 发邮件通知管理员
-                try {
-                    if (self::$systemConfig['crash_warning_email']) {
+                if (self::$systemConfig['crash_warning_email']) {
+                    try {
                         Mail::to(self::$systemConfig['crash_warning_email'])->send(new replyTicket(self::$systemConfig['website_name'], $title, $content));
-                        $this->sendEmailLog(1, $title, $content);
+                        Helpers::addEmailLog(1, $title, $content);
+                    } catch (\Exception $e) {
+                        Helpers::addEmailLog(1, $title, $content, 0, $e->getMessage());
                     }
-                } catch (\Exception $e) {
-                    $this->sendEmailLog(1, $title, $content, 0, $e->getMessage());
                 }
 
                 // 通过ServerChan发微信消息提醒管理员
@@ -648,9 +648,9 @@ class UserController extends Controller
 
             try {
                 Mail::to($user->username)->send(new activeUser(self::$systemConfig['website_name'], $activeUserUrl));
-                $this->sendEmailLog($user->id, $title, $content);
+                Helpers::addEmailLog($user->id, $title, $content);
             } catch (\Exception $e) {
-                $this->sendEmailLog($user->id, $title, $content, 0, $e->getMessage());
+                Helpers::addEmailLog($user->id, $title, $content, 0, $e->getMessage());
             }
 
             Cache::put('activeUser_' . md5($username), $activeTimes + 1, 1440);
@@ -769,9 +769,9 @@ class UserController extends Controller
 
             try {
                 Mail::to($user->username)->send(new resetPassword(self::$systemConfig['website_name'], $resetPasswordUrl));
-                $this->sendEmailLog($user->id, $title, $content);
+                Helpers::addEmailLog($user->id, $title, $content);
             } catch (\Exception $e) {
-                $this->sendEmailLog($user->id, $title, $content, 0, $e->getMessage());
+                Helpers::addEmailLog($user->id, $title, $content, 0, $e->getMessage());
             }
 
             Cache::put('resetPassword_' . md5($username), $resetTimes + 1, 1440);
@@ -951,14 +951,14 @@ class UserController extends Controller
             // 验证账号是否存在有效期更长的套餐
             if ($goods->type == 2) {
                 $existOrderList = Order::query()
-                        ->with(['goods'])
-                        ->whereHas('goods', function ($q) {
-                            $q->where('type', 2);
-                        })
-                        ->where('user_id', $user['id'])
-                        ->where('is_expire', 0)
-                        ->where('status', 2)
-                        ->get();
+                    ->with(['goods'])
+                    ->whereHas('goods', function ($q) {
+                        $q->where('type', 2);
+                    })
+                    ->where('user_id', $user['id'])
+                    ->where('is_expire', 0)
+                    ->where('status', 2)
+                    ->get();
 
                 foreach ($existOrderList as $vo) {
                     if ($vo->goods->days > $goods->days) {
@@ -997,7 +997,7 @@ class UserController extends Controller
                     }
 
                     // 写入日志
-                    $this->addCouponLog($coupon->id, $goods_id, $order->oid, '余额支付订单使用');
+                    Helpers::addCouponLog($coupon->id, $goods_id, $order->oid, '余额支付订单使用');
                 }
 
                 // 如果买的是套餐，则先将之前购买的所有套餐置都无效，并扣掉之前所有套餐的流量，重置用户已用流量为0
@@ -1015,6 +1015,7 @@ class UserController extends Controller
 
                     foreach ($existOrderList as $vo) {
                         Order::query()->where('oid', $vo->oid)->update(['is_expire' => 1]);
+
                         // 先判断，防止手动扣减过流量的用户流量被扣成负数
                         if ($order->user->transfer_enable - $vo->goods->traffic * 1048576 <= 0) {
                             User::query()->where('id', $order->user_id)->update(['u' => 0, 'd' => 0, 'transfer_enable' => 0]);
@@ -1302,7 +1303,7 @@ class UserController extends Controller
             $coupon->save();
 
             // 写入卡券日志
-            $this->addCouponLog($coupon->id, 0, 0, '账户余额充值使用');
+            Helpers::addCouponLog($coupon->id, 0, 0, '账户余额充值使用');
 
             DB::commit();
 

app/Http/Kernel.php

@@ -38,7 +38,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
+            'throttle:200,1', // API请求限制：1分钟内同一个IP限制只能请求200次
             'bindings',
         ],
     ];

resources/lang/ja/404.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
 return [
     'title' => 'ページがありません',

resources/lang/ja/active.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
 return [
     'title'                => 'アカウントを有効にする',

resources/lang/ja/home.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
 return [
     'panel'                           => 'コントロールパネル',

resources/lang/ja/login.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
 return [
     'title'           => 'ログイン',

resources/lang/ja/register.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 
 return [
     'title'                => '新しいアカウントの登録',