Merge pull request #2304 from sspanel-uim/dev

Dev 20231127

.github/workflows/lint.yml

@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
       - run: |
           composer install --no-interaction --no-progress --no-suggest
           php vendor/bin/phpinsights analyse --no-interaction --format=github-action \

.gitignore

@@ -28,11 +28,10 @@ public/clients/*.*
 
 storage/framework/smarty/cache/*
 storage/framework/smarty/compile/*
-storage/framework/twig/*
-storage/*.*
+storage/framework/twig/cache/*
 !storage/framework/smarty/cache/.gitkeep
 !storage/framework/smarty/compile/.gitkeep
-!storage/framework/twig/.gitkeep
+!storage/framework/twig/cache/.gitkeep
 
 .user.ini
 public/.user.ini

README.md

@@ -19,7 +19,7 @@
 [![Telegram 通知频道](https://img.shields.io/badge/Telegram-通知频道-blue?style=flat-square)](https://t.me/sspanel_uim)
 [![Telegram 开发频道](https://img.shields.io/badge/Telegram-开发频道-blue?style=flat-square)](https://t.me/sspanel_uim_dev)
 [![Discord](https://img.shields.io/discord/1049692075085549600?color=5865F2&label=Discord&style=flat-square)](https://discord.gg/A7uFKCvf8V)
-[![Dev Blog](https://img.shields.io/badge/Blog-Dev-blue?style=flat-square)](https://blog.sspanel.org)
+[![Dev Blog](https://img.shields.io/badge/Dev-Blog-blue?style=flat-square)](https://blog.sspanel.org)
 
 ## 简介
 

composer.json

@@ -40,6 +40,7 @@
         "stripe/stripe-php": "^12.8",
         "symfony/translation": "^6.3.7",
         "tronovav/geoip2-update": "^2.3.1",
+        "twig/twig": "^3.8",
         "vectorface/googleauthenticator": "^3.0",
         "voku/anti-xss": "^4.1.42"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "25635044dfd9ba42712e0f640b98c453",
+    "content-hash": "b90c6c01b6b2836ce21293a49dfe7719",
     "packages": [
         {
             "name": "anankke/omnipay-alipay",
@@ -69,16 +69,16 @@
         },
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.3",
+            "version": "v1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382"
+                "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/5545a4fa310aec39f54279fdacebcce33b3ff382",
-                "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2",
+                "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2",
                 "shasum": ""
             },
             "require": {
@@ -117,9 +117,9 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.3"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4"
             },
-            "time": "2023-10-16T20:10:06+00:00"
+            "time": "2023-11-08T00:42:13+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
@@ -3242,16 +3242,16 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.8.1",
+            "version": "v6.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "e88da8d679acc3824ff231fdc553565b802ac016"
+                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e88da8d679acc3824ff231fdc553565b802ac016",
-                "reference": "e88da8d679acc3824ff231fdc553565b802ac016",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
+                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
                 "shasum": ""
             },
             "require": {
@@ -3271,6 +3271,7 @@
                 "yoast/phpunit-polyfills": "^1.0.4"
             },
             "suggest": {
+                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
                 "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
                 "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
                 "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
@@ -3310,7 +3311,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.1"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.9.1"
             },
             "funding": [
                 {
@@ -3318,7 +3319,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-29T08:26:30+00:00"
+            "time": "2023-11-25T22:23:28+00:00"
         },
         {
             "name": "postal/postal",
@@ -5222,6 +5223,88 @@
             ],
             "time": "2023-05-12T14:21:09+00:00"
         },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.28.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.28-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-01-26T09:26:14+00:00"
+        },
         {
             "name": "symfony/polyfill-iconv",
             "version": "v1.28.0",
@@ -6100,6 +6183,78 @@
             },
             "time": "2023-10-25T22:16:50+00:00"
         },
+        {
+            "name": "twig/twig",
+            "version": "v3.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+                "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "^1.8",
+                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-php80": "^1.22"
+            },
+            "require-dev": {
+                "psr/container": "^1.0|^2.0",
+                "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Twig\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "[email protected]",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Twig Team",
+                    "role": "Contributors"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "[email protected]",
+                    "role": "Project Founder"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/v3.8.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-21T18:54:41+00:00"
+        },
         {
             "name": "vectorface/googleauthenticator",
             "version": "v3.0",
@@ -6840,20 +6995,20 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.39.0",
+            "version": "v3.40.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "04bf7b28fc847185b247d112cab617da941e3cca"
+                "reference": "27d2b3265b5d550ec411b4319967ae7cfddfb2e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04bf7b28fc847185b247d112cab617da941e3cca",
-                "reference": "04bf7b28fc847185b247d112cab617da941e3cca",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/27d2b3265b5d550ec411b4319967ae7cfddfb2e0",
+                "reference": "27d2b3265b5d550ec411b4319967ae7cfddfb2e0",
                 "shasum": ""
             },
             "require": {
-                "composer/semver": "^3.3",
+                "composer/semver": "^3.4",
                 "composer/xdebug-handler": "^3.0.3",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
@@ -6864,25 +7019,25 @@
                 "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
                 "symfony/finder": "^5.4 || ^6.0 || ^7.0",
                 "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.27",
-                "symfony/polyfill-php80": "^1.27",
-                "symfony/polyfill-php81": "^1.27",
+                "symfony/polyfill-mbstring": "^1.28",
+                "symfony/polyfill-php80": "^1.28",
+                "symfony/polyfill-php81": "^1.28",
                 "symfony/process": "^5.4 || ^6.0 || ^7.0",
                 "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
             },
             "require-dev": {
                 "facile-it/paraunit": "^1.3 || ^2.0",
                 "justinrainbow/json-schema": "^5.2",
-                "keradus/cli-executor": "^2.0",
+                "keradus/cli-executor": "^2.1",
                 "mikey179/vfsstream": "^1.6.11",
-                "php-coveralls/php-coveralls": "^2.5.3",
+                "php-coveralls/php-coveralls": "^2.7",
                 "php-cs-fixer/accessible-object": "^1.1",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy": "^1.16",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
+                "phpspec/prophecy": "^1.17",
                 "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "symfony/phpunit-bridge": "^6.2.3 || ^7.0",
+                "phpunit/phpunit": "^9.6",
+                "symfony/phpunit-bridge": "^6.3.8 || ^7.0",
                 "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
             },
             "suggest": {
@@ -6921,7 +7076,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.39.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.40.0"
             },
             "funding": [
                 {
@@ -6929,7 +7084,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-22T11:20:09+00:00"
+            "time": "2023-11-26T09:25:53+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -9572,88 +9727,6 @@
             ],
             "time": "2023-09-26T12:56:25+00:00"
         },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-ctype": "*"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "[email protected]"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-01-26T09:26:14+00:00"
-        },
         {
             "name": "symfony/polyfill-php81",
             "version": "v1.28.0",

phpinsights.php

@@ -12,6 +12,7 @@ return [
         NunoMaduro\PhpInsights\Domain\Insights\ForbiddenGlobals::class,
         PHP_CodeSniffer\Standards\Generic\Sniffs\Commenting\TodoSniff::class,
         PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff::class,
+        PHP_CodeSniffer\Standards\PEAR\Sniffs\WhiteSpace\ObjectOperatorIndentSniff::class,
         PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\GlobalKeywordSniff::class,
         PhpCsFixer\Fixer\Import\OrderedImportsFixer::class,
         SlevomatCodingStandard\Sniffs\Commenting\InlineDocCommentDeclarationSniff::class,

src/Command/Cron.php

@@ -78,7 +78,7 @@ EOL;
                 $jobs->sendTelegramDailyJob();
             }
 
-            Config::where('item', 'last_daily_job_time')->update([
+            (new Config())->where('item', 'last_daily_job_time')->update([
                 'value' => mktime(
                     Config::obtain('daily_job_hour'),
                     Config::obtain('daily_job_minute'),

src/Command/Tool.php

@@ -126,7 +126,7 @@ EOL;
         foreach ($settings as $item) {
             $config[] = $item['item'];
             $item_name = $item['item'];
-            $query = Config::where('item', $item['item'])->first();
+            $query = (new Config())->where('item', $item['item'])->first();
 
             if ($query === null) {
                 $new_item = new Config();
@@ -193,7 +193,7 @@ EOL;
     public function resetPort(): void
     {
         fwrite(STDOUT, '请输入用户id: ');
-        $user = ModelsUser::find(trim(fgets(STDIN)));
+        $user = (new ModelsUser())->find(trim(fgets(STDIN)));
 
         if ($user !== null) {
             $user->port = Tools::getSsPort();
@@ -228,7 +228,7 @@ EOL;
     public function resetTraffic(): void
     {
         try {
-            ModelsUser::where('is_banned', 0)->update([
+            (new ModelsUser())->where('is_banned', 0)->update([
                 'd' => 0,
                 'u' => 0,
                 'transfer_today' => 0,

src/Controllers/Admin/AnnController.php

@@ -68,7 +68,11 @@ final class AnnController extends BaseController
     /**
      * 后台添加公告
      *
-     * @throws TelegramSDKException
+     * @param ServerRequest $request
+     * @param Response $response
+     * @param array $args
+     *
+     * @return Response|ResponseInterface
      */
     public function add(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
@@ -99,7 +103,7 @@ final class AnnController extends BaseController
         }
 
         if ($email_notify) {
-            $users = User::where('class', '>=', $email_notify_class)
+            $users = (new User())->where('class', '>=', $email_notify_class)
                 ->get();
 
             foreach ($users as $user) {
@@ -139,7 +143,7 @@ final class AnnController extends BaseController
      */
     public function edit(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $ann = Ann::find($args['id']);
+        $ann = (new Ann())->find($args['id']);
         return $response->write(
             $this->view()
                 ->assign('ann', $ann)
@@ -152,7 +156,7 @@ final class AnnController extends BaseController
      */
     public function update(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $ann = Ann::find($args['id']);
+        $ann = (new Ann())->find($args['id']);
         $ann->content = (string) $request->getParam('content');
         $ann->date = Tools::toDateTime(time());
 
@@ -185,7 +189,7 @@ final class AnnController extends BaseController
      */
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $ann = Ann::find($args['id']);
+        $ann = (new Ann())->find($args['id']);
         if (! $ann->delete()) {
             return $response->withJson([
                 'ret' => 0,
@@ -203,7 +207,7 @@ final class AnnController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $anns = Ann::orderBy('id', 'asc')->get();
+        $anns = (new Ann())->orderBy('id')->get();
 
         foreach ($anns as $ann) {
             $ann->op = '<button type="button" class="btn btn-red" id="delete-announcement-' . $ann->id . '" 

src/Controllers/Admin/CouponController.php

@@ -140,7 +140,7 @@ final class CouponController extends BaseController
             ]);
         }
 
-        if ($generate_method === 'char' && UserCoupon::where('code', $code)->count() !== 0) {
+        if ($generate_method === 'char' && (new UserCoupon())->where('code', $code)->count() !== 0) {
             return $response->withJson([
                 'ret' => 0,
                 'msg' => '优惠码已存在',
@@ -150,7 +150,7 @@ final class CouponController extends BaseController
         if ($generate_method === 'char_random') {
             $code .= Tools::genRandomChar();
 
-            if (UserCoupon::where('code', $code)->count() !== 0) {
+            if ((new UserCoupon())->where('code', $code)->count() !== 0) {
                 return $response->withJson([
                     'ret' => 0,
                     'msg' => '出现了一些问题，请稍后重试',
@@ -161,7 +161,7 @@ final class CouponController extends BaseController
         if ($generate_method === 'random') {
             $code = Tools::genRandomChar();
 
-            if (UserCoupon::where('code', $code)->count() !== 0) {
+            if ((new UserCoupon())->where('code', $code)->count() !== 0) {
                 return $response->withJson([
                     'ret' => 0,
                     'msg' => '出现了一些问题，请稍后重试',
@@ -205,7 +205,7 @@ final class CouponController extends BaseController
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $coupon_id = $args['id'];
-        UserCoupon::find($coupon_id)->delete();
+        (new UserCoupon())->find($coupon_id)->delete();
 
         return $response->withJson([
             'ret' => 1,
@@ -216,7 +216,7 @@ final class CouponController extends BaseController
     public function disable(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $coupon_id = $args['id'];
-        $coupon = UserCoupon::find($coupon_id)->first();
+        $coupon = (new UserCoupon())->find($coupon_id)->first();
         $limit = json_decode($coupon->limit);
         $limit->disabled = 1;
         $coupon->limit = json_encode($limit);
@@ -233,7 +233,7 @@ final class CouponController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $coupons = UserCoupon::orderBy('id', 'desc')->get();
+        $coupons = (new UserCoupon())->orderBy('id', 'desc')->get();
 
         foreach ($coupons as $coupon) {
             $content = json_decode($coupon->content);

src/Controllers/Admin/DetectBanController.php

@@ -47,8 +47,8 @@ final class DetectBanController extends BaseController
         $page = $request->getParam('start') / $length + 1;
         $draw = $request->getParam('draw');
 
-        $bans = DetectBanLog::orderBy('id', 'desc')->paginate($length, '*', '', $page);
-        $total = DetectBanLog::count();
+        $bans = (new DetectBanLog())->orderBy('id', 'desc')->paginate($length, '*', '', $page);
+        $total = (new DetectBanLog())->count();
 
         foreach ($bans as $ban) {
             $ban->user_name = $ban->userName();

src/Controllers/Admin/DetectLogController.php

@@ -49,8 +49,8 @@ final class DetectLogController extends BaseController
         $page = $request->getParam('start') / $length + 1;
         $draw = $request->getParam('draw');
 
-        $logs = DetectLog::orderBy('id', 'desc')->paginate($length, '*', '', $page);
-        $total = DetectLog::count();
+        $logs = (new DetectLog())->orderBy('id', 'desc')->paginate($length, '*', '', $page);
+        $total = (new DetectLog())->count();
 
         foreach ($logs as $log) {
             $log->user_name = $log->userName();

src/Controllers/Admin/DetectRuleController.php

@@ -96,7 +96,7 @@ final class DetectRuleController extends BaseController
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = $args['id'];
-        $rule = DetectRule::find($id);
+        $rule = (new DetectRule())->find($id);
         if (! $rule->delete()) {
             return $response->withJson([
                 'ret' => 0,
@@ -111,7 +111,7 @@ final class DetectRuleController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $rules = DetectRule::orderBy('id', 'desc')->get();
+        $rules = (new DetectRule())->orderBy('id', 'desc')->get();
 
         foreach ($rules as $rule) {
             $rule->op = '<button type="button" class="btn btn-red" id="delete-rule-' . $rule->id .

src/Controllers/Admin/DocsController.php

@@ -13,7 +13,6 @@ use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Response;
 use Slim\Http\ServerRequest;
-use Telegram\Bot\Exceptions\TelegramSDKException;
 use function time;
 
 final class DocsController extends BaseController
@@ -111,7 +110,7 @@ final class DocsController extends BaseController
      */
     public function edit(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $doc = Docs::find($args['id']);
+        $doc = (new Docs())->find($args['id']);
 
         return $response->write(
             $this->view()
@@ -123,11 +122,15 @@ final class DocsController extends BaseController
     /**
      * 后台编辑文档提交
      *
-     * @throws TelegramSDKException
+     * @param ServerRequest $request
+     * @param Response $response
+     * @param array $args
+     *
+     * @return Response|ResponseInterface
      */
     public function update(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $doc = Docs::find($args['id']);
+        $doc = (new Docs())->find($args['id']);
         $doc->title = $request->getParam('title');
         $doc->content = $request->getParam('content');
         $doc->date = Tools::toDateTime(time());
@@ -150,7 +153,7 @@ final class DocsController extends BaseController
      */
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $doc = Docs::find($args['id']);
+        $doc = (new Docs())->find($args['id']);
 
         if (! $doc->delete()) {
             return $response->withJson([
@@ -170,7 +173,7 @@ final class DocsController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $docs = Docs::orderBy('id', 'asc')->get();
+        $docs = (new Docs())->orderBy('id')->get();
 
         foreach ($docs as $doc) {
             $doc->op = '<button type="button" class="btn btn-red" id="delete-doc-' . $doc->id . '" 

src/Controllers/Admin/GiftCardController.php

@@ -118,7 +118,7 @@ final class GiftCardController extends BaseController
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $card_id = $args['id'];
-        GiftCard::find($card_id)->delete();
+        (new GiftCard())->find($card_id)->delete();
 
         return $response->withJson([
             'ret' => 1,
@@ -128,7 +128,7 @@ final class GiftCardController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $giftcards = GiftCard::orderBy('id', 'desc')->get();
+        $giftcards = (new GiftCard())->orderBy('id', 'desc')->get();
 
         foreach ($giftcards as $giftcard) {
             $giftcard->op = '<button type="button" class="btn btn-red" id="delete-gift-card-' . $giftcard->id . '" 

src/Controllers/Admin/InviteController.php

@@ -87,9 +87,9 @@ final class InviteController extends BaseController
         }
 
         if (str_contains($userid, '@')) {
-            $user = User::where('email', '=', $userid)->first();
+            $user = (new User())->where('email', '=', $userid)->first();
         } else {
-            $user = User::find((int) $userid);
+            $user = (new User())->find((int) $userid);
         }
 
         if ($user === null) {
@@ -123,9 +123,9 @@ final class InviteController extends BaseController
         }
 
         if (str_contains($request->getParam('userid'), '@')) {
-            $user = User::where('email', '=', $request->getParam('userid'))->first();
+            $user = (new User())->where('email', '=', $request->getParam('userid'))->first();
         } else {
-            $user = User::find((int) $request->getParam('userid'));
+            $user = (new User())->find((int) $request->getParam('userid'));
         }
 
         if ($user === null) {
@@ -148,7 +148,7 @@ final class InviteController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $paybacks = Payback::orderBy('id', 'desc')->get();
+        $paybacks = (new Payback())->orderBy('id', 'desc')->get();
 
         foreach ($paybacks as $payback) {
             $payback->datetime = Tools::toDateTime((int) $payback->datetime);

src/Controllers/Admin/InvoiceController.php

@@ -51,11 +51,11 @@ final class InvoiceController extends BaseController
     public function detail(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = $args['id'];
-        $invoice = Invoice::find($id);
+        $invoice = (new Invoice())->find($id);
         $paylist = [];
 
         if ($invoice->status === 'paid_gateway') {
-            $paylist = Paylist::where('invoice_id', $invoice->id)->where('status', 1)->first();
+            $paylist = (new Paylist())->where('invoice_id', $invoice->id)->where('status', 1)->first();
         }
 
         $invoice->status_text = $invoice->status();
@@ -76,7 +76,7 @@ final class InvoiceController extends BaseController
     public function markPaid(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $invoice_id = $args['id'];
-        $invoice = Invoice::find($invoice_id);
+        $invoice = (new Invoice())->find($invoice_id);
 
         if (in_array($invoice->status, ['paid_gateway', 'paid_balance', 'paid_admin'])) {
             return $response->withJson([
@@ -85,7 +85,7 @@ final class InvoiceController extends BaseController
             ]);
         }
 
-        $order = Order::find($invoice->order_id);
+        $order = (new Order())->find($invoice->order_id);
 
         if ($order->status === 'cancelled') {
             return $response->withJson([
@@ -111,7 +111,7 @@ final class InvoiceController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $invoices = Invoice::orderBy('id', 'desc')->get();
+        $invoices = (new Invoice())->orderBy('id', 'desc')->get();
 
         foreach ($invoices as $invoice) {
             $invoice->op = '<a class="btn btn-blue" href="/admin/invoice/' . $invoice->id . '/view">查看</a>';

src/Controllers/Admin/LoginLogController.php

@@ -53,8 +53,8 @@ final class LoginLogController extends BaseController
         $page = $request->getParam('start') / $length + 1;
         $draw = $request->getParam('draw');
 
-        $logins = LoginIp::orderBy('id', 'desc')->paginate($length, '*', '', $page);
-        $total = LoginIp::count();
+        $logins = (new LoginIp())->orderBy('id', 'desc')->paginate($length, '*', '', $page);
+        $total = (new LoginIp())->count();
 
         foreach ($logins as $login) {
             $login->user_name = $login->userName();

src/Controllers/Admin/MoneyLogController.php

@@ -46,7 +46,7 @@ final class MoneyLogController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $money_logs = UserMoneyLog::orderBy('id', 'desc')->get();
+        $money_logs = (new UserMoneyLog())->orderBy('id', 'desc')->get();
 
         foreach ($money_logs as $money_log) {
             $money_log->create_time = Tools::toDateTime((int) $money_log->create_time);

src/Controllers/Admin/NodeController.php

@@ -160,7 +160,7 @@ final class NodeController extends BaseController
      */
     public function edit(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
-        $node = Node::find($args['id']);
+        $node = (new Node())->find($args['id']);
 
         $dynamic_rate_config = json_decode($node->dynamic_rate_config);
         $node->max_rate = $dynamic_rate_config?->max_rate ?? 1;
@@ -184,7 +184,7 @@ final class NodeController extends BaseController
      */
     public function update(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
-        $node = Node::find($args['id']);
+        $node = (new Node())->find($args['id']);
 
         $node->name = $request->getParam('name');
         $node->node_group = $request->getParam('node_group') ?? 0;
@@ -246,7 +246,7 @@ final class NodeController extends BaseController
 
     public function reset(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $node = Node::find($args['id']);
+        $node = (new Node())->find($args['id']);
         $node->password = Tools::genRandomChar(32);
         $node->save();
 
@@ -261,7 +261,7 @@ final class NodeController extends BaseController
      */
     public function delete(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
-        $node = Node::find($args['id']);
+        $node = (new Node())->find($args['id']);
 
         if (! $node->delete()) {
             return $response->withJson([
@@ -296,7 +296,7 @@ final class NodeController extends BaseController
 
     public function copy($request, $response, $args)
     {
-        $old_node = Node::find($args['id']);
+        $old_node = (new Node())->find($args['id']);
         $new_node = $old_node->replicate([
             'node_bandwidth',
         ]);
@@ -321,7 +321,7 @@ final class NodeController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
-        $nodes = Node::orderBy('id', 'desc')->get();
+        $nodes = (new Node())->orderBy('id', 'desc')->get();
 
         foreach ($nodes as $node) {
             $node->op = '<button type="button" class="btn btn-red" id="delete-node-' . $node->id . '" 

src/Controllers/Admin/OnlineLogController.php

@@ -56,8 +56,8 @@ final class OnlineLogController extends BaseController
         $page = $request->getParam('start') / $length + 1;
         $draw = $request->getParam('draw');
 
-        $onlines = OnlineLog::where('last_time', '>', time() - 90)->orderByDesc('last_time')->paginate($length, '*', '', $page);
-        $total = OnlineLog::where('last_time', '>', time() - 90)->count();
+        $onlines = (new OnlineLog())->where('last_time', '>', time() - 90)->orderByDesc('last_time')->paginate($length, '*', '', $page);
+        $total = (new OnlineLog())->where('last_time', '>', time() - 90)->count();
 
         foreach ($onlines as $online) {
             $online->user_name = $online->userName();

src/Controllers/Admin/OrderController.php

@@ -53,14 +53,14 @@ final class OrderController extends BaseController
     {
         $id = $args['id'];
 
-        $order = Order::find($id);
+        $order = (new Order())->find($id);
         $order->product_type_text = $order->productType();
         $order->status_text = $order->status();
         $order->create_time = Tools::toDateTime($order->create_time);
         $order->update_time = Tools::toDateTime($order->update_time);
         $order->content = json_decode($order->product_content);
 
-        $invoice = Invoice::where('order_id', $id)->first();
+        $invoice = (new Invoice())->where('order_id', $id)->first();
         $invoice->status = $invoice->status();
         $invoice->create_time = Tools::toDateTime($invoice->create_time);
         $invoice->update_time = Tools::toDateTime($invoice->update_time);
@@ -78,7 +78,7 @@ final class OrderController extends BaseController
     public function cancel(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $order_id = $args['id'];
-        $order = Order::find($order_id);
+        $order = (new Order())->find($order_id);
 
         if ($order->status === 'activated') {
             return $response->withJson([
@@ -91,7 +91,7 @@ final class OrderController extends BaseController
         $order->status = 'cancelled';
         $order->save();
 
-        $invoice = Invoice::where('order_id', $order_id)->first();
+        $invoice = (new Invoice())->where('order_id', $order_id)->first();
 
         if ($invoice === null) {
             return $response->withJson([
@@ -124,8 +124,8 @@ final class OrderController extends BaseController
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $order_id = $args['id'];
-        Order::find($order_id)->delete();
-        Invoice::where('order_id', $order_id)->first()->delete();
+        (new Order())->find($order_id)->delete();
+        (new Invoice())->where('order_id', $order_id)->first()->delete();
 
         return $response->withJson([
             'ret' => 1,
@@ -135,7 +135,7 @@ final class OrderController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $orders = Order::orderBy('id', 'desc')->get();
+        $orders = (new Order())->orderBy('id', 'desc')->get();
 
         foreach ($orders as $order) {
             $order->op = '<button type="button" class="btn btn-red" id="delete-order-' . $order->id . '"

src/Controllers/Admin/PaylistController.php

@@ -47,7 +47,7 @@ final class PaylistController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $paylists = Paylist::orderBy('id', 'desc')->get();
+        $paylists = (new Paylist())->orderBy('id', 'desc')->get();
 
         foreach ($paylists as $paylist) {
             $paylist->status = $paylist->status();

src/Controllers/Admin/ProductController.php

@@ -81,7 +81,7 @@ final class ProductController extends BaseController
     public function edit(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = $args['id'];
-        $product = Product::find($id);
+        $product = (new Product())->find($id);
         $content = json_decode($product->content);
         $limit = json_decode($product->limit);
 
@@ -230,7 +230,7 @@ final class ProductController extends BaseController
         $node_group_required = $request->getParam('node_group_required') ?? '';
         $new_user_required = $request->getParam('new_user_required') === 'true' ? 1 : 0;
 
-        $product = Product::find($product_id);
+        $product = (new Product())->find($product_id);
 
         if ($price < 0) {
             return $response->withJson([
@@ -315,7 +315,7 @@ final class ProductController extends BaseController
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $product_id = $args['id'];
-        Product::find($product_id)->delete();
+        (new Product())->find($product_id)->delete();
 
         return $response->withJson([
             'ret' => 1,
@@ -326,7 +326,7 @@ final class ProductController extends BaseController
     public function copy(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $old_product_id = $args['id'];
-        $old_product = Product::find($old_product_id);
+        $old_product = (new Product())->find($old_product_id);
 
         $new_product = $old_product->replicate([
             'create_time',
@@ -346,7 +346,7 @@ final class ProductController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $products = Product::orderBy('id', 'desc')->get();
+        $products = (new Product())->orderBy('id', 'desc')->get();
 
         foreach ($products as $product) {
             $product->op = '<button type="button" class="btn btn-red" id="delete-product-' . $product->id . '"

src/Controllers/Admin/Setting/BillingController.php

@@ -75,7 +75,7 @@ final class BillingController extends BaseController
             }
         }
 
-        $gateway = Config::where('item', 'payment_gateway')->first();
+        $gateway = (new Config())->where('item', 'payment_gateway')->first();
         $gateway->value = json_encode($gateway_in_use);
 
         if (! $gateway->save()) {
@@ -113,7 +113,7 @@ final class BillingController extends BaseController
 
     public function returnActiveGateways()
     {
-        $payment_gateways = Config::where('item', 'payment_gateway')->first();
+        $payment_gateways = (new Config())->where('item', 'payment_gateway')->first();
         return json_decode($payment_gateways->value);
     }
 }

src/Controllers/Admin/SubLogController.php

@@ -53,8 +53,8 @@ final class SubLogController extends BaseController
         $page = $request->getParam('start') / $length + 1;
         $draw = $request->getParam('draw');
 
-        $subscribes = SubscribeLog::orderBy('id', 'desc')->paginate($length, '*', '', $page);
-        $total = SubscribeLog::count();
+        $subscribes = (new SubscribeLog())->orderBy('id', 'desc')->paginate($length, '*', '', $page);
+        $total = (new SubscribeLog())->count();
 
         foreach ($subscribes as $subscribe) {
             $subscribe->request_time = Tools::toDateTime($subscribe->request_time);

src/Controllers/Admin/TicketController.php

@@ -71,7 +71,7 @@ final class TicketController extends BaseController
             ]);
         }
 
-        $ticket = Ticket::where('id', $id)->first();
+        $ticket = (new Ticket())->where('id', $id)->first();
 
         if ($ticket === null) {
             return $response->withJson([
@@ -90,7 +90,7 @@ final class TicketController extends BaseController
             ],
         ];
 
-        $user = User::find($ticket->userid);
+        $user = (new User())->find($ticket->userid);
 
         Notification::notifyUser(
             $user,
@@ -117,7 +117,7 @@ final class TicketController extends BaseController
     {
         $id = $args['id'];
 
-        $ticket = Ticket::where('id', $id)->first();
+        $ticket = (new Ticket())->where('id', $id)->first();
 
         if ($ticket === null) {
             return $response->withJson([
@@ -138,7 +138,7 @@ final class TicketController extends BaseController
             ],
         ];
 
-        $user = User::find($ticket->userid);
+        $user = (new User())->find($ticket->userid);
 
         Notification::notifyUser(
             $user,
@@ -164,7 +164,7 @@ final class TicketController extends BaseController
     public function detail(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = $args['id'];
-        $ticket = Ticket::where('id', '=', $id)->first();
+        $ticket = (new Ticket())->where('id', '=', $id)->first();
 
         if ($ticket === null) {
             return $response->withRedirect('/admin/ticket');
@@ -190,7 +190,7 @@ final class TicketController extends BaseController
     public function close(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = $args['id'];
-        $ticket = Ticket::where('id', '=', $id)->first();
+        $ticket = (new Ticket())->where('id', '=', $id)->first();
 
         if ($ticket === null) {
             return $response->withJson([
@@ -221,7 +221,7 @@ final class TicketController extends BaseController
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = $args['id'];
-        Ticket::where('id', '=', $id)->delete();
+        (new Ticket())->where('id', '=', $id)->delete();
 
         return $response->withJson([
             'ret' => 1,
@@ -234,7 +234,7 @@ final class TicketController extends BaseController
      */
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $tickets = Ticket::orderBy('id', 'desc')->get();
+        $tickets = (new Ticket())->orderBy('id', 'desc')->get();
 
         foreach ($tickets as $ticket) {
             $ticket->op = '<button type="button" class="btn btn-red" id="delete-ticket" 

src/Controllers/Admin/TrafficLogController.php

@@ -49,8 +49,8 @@ final class TrafficLogController extends BaseController
         $page = $request->getParam('start') / $length + 1;
         $draw = $request->getParam('draw');
 
-        $trafficlogs = UserHourlyUsage::orderBy('id', 'desc')->paginate($length, '*', '', $page);
-        $total = UserHourlyUsage::count();
+        $trafficlogs = (new UserHourlyUsage())->orderBy('id', 'desc')->paginate($length, '*', '', $page);
+        $total = (new UserHourlyUsage())->count();
 
         foreach ($trafficlogs as $trafficlog) {
             $trafficlog->traffic = round(Tools::flowToGB($trafficlog->traffic), 2);

src/Controllers/Admin/UserController.php

@@ -11,12 +11,9 @@ use App\Models\UserMoneyLog;
 use App\Utils\Hash;
 use App\Utils\Tools;
 use Exception;
-use GuzzleHttp\Exception\GuzzleException;
-use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Response;
 use Slim\Http\ServerRequest;
-use Telegram\Bot\Exceptions\TelegramSDKException;
 use function str_replace;
 use const PHP_EOL;
 
@@ -114,9 +111,7 @@ final class UserController extends BaseController
      *
      * @return Response|ResponseInterface
      *
-     * @throws GuzzleException
-     * @throws ClientExceptionInterface
-     * @throws TelegramSDKException
+     * @throws Exception
      */
     public function create(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
@@ -132,7 +127,7 @@ final class UserController extends BaseController
             ]);
         }
 
-        $exist = User::where('email', $email)->first();
+        $exist = (new User())->where('email', $email)->first();
 
         if ($exist !== null) {
             return $response->withJson([
@@ -146,7 +141,7 @@ final class UserController extends BaseController
         }
 
         AuthController::registerHelper($response, 'user', $email, $password, '', 0, '', $balance, 1);
-        $user = User::where('email', $email)->first();
+        $user = (new User())->where('email', $email)->first();
 
         if ($ref_by !== '') {
             $user->ref_by = (int) $ref_by;
@@ -164,7 +159,7 @@ final class UserController extends BaseController
      */
     public function edit(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $user = User::find($args['id']);
+        $user = (new User())->find($args['id']);
 
         return $response->write(
             $this->view()
@@ -177,7 +172,7 @@ final class UserController extends BaseController
     public function update(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = (int) $args['id'];
-        $user = User::find($id);
+        $user = (new User())->find($id);
 
         if ($request->getParam('pass') !== '' && $request->getParam('pass') !== null) {
             $user->pass = Hash::passwordHash($request->getParam('pass'));
@@ -186,12 +181,12 @@ final class UserController extends BaseController
 
         if ($request->getParam('money') !== '' &&
             $request->getParam('money') !== null &&
-            (float) $request->getParam('money') !== (float) $user->money
+            (float) $request->getParam('money') !== $user->money
         ) {
             $money = (float) $request->getParam('money');
             $diff = $money - $user->money;
             $remark = ($diff > 0 ? '管理员添加余额' : '管理员扣除余额');
-            (new UserMoneyLog())->add($id, (float) $user->money, $money, $diff, $remark);
+            (new UserMoneyLog())->add($id, $user->money, $money, $diff, $remark);
             $user->money = $money;
         }
 
@@ -234,7 +229,7 @@ final class UserController extends BaseController
     public function delete(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         $id = $args['id'];
-        $user = User::find((int) $id);
+        $user = (new User())->find((int) $id);
 
         if (! $user->kill()) {
             return $response->withJson([
@@ -251,7 +246,7 @@ final class UserController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $users = User::orderBy('id', 'desc')->get();
+        $users = (new User())->orderBy('id', 'desc')->get();
 
         foreach ($users as $user) {
             $user->op = '<button type="button" class="btn btn-red" id="delete-user-' . $user->id . '" 

src/Controllers/AuthController.php

@@ -19,14 +19,12 @@ use App\Utils\Hash;
 use App\Utils\ResponseHelper;
 use App\Utils\Tools;
 use Exception;
-use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 use Ramsey\Uuid\Uuid;
 use RedisException;
 use Slim\Http\Response;
 use Slim\Http\ServerRequest;
-use Telegram\Bot\Exceptions\TelegramSDKException;
 use voku\helper\AntiXSS;
 use function array_rand;
 use function date;
@@ -56,9 +54,11 @@ final class AuthController extends BaseController
     }
 
     /**
-     * @throws ClientExceptionInterface
-     * @throws GuzzleException
-     * @throws TelegramSDKException
+     * @param ServerRequest $request
+     * @param Response $response
+     * @param array $args
+     *
+     * @return Response|ResponseInterface
      */
     public function loginHandle(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
@@ -75,7 +75,7 @@ final class AuthController extends BaseController
         $rememberMe = $request->getParam('remember_me') === 'true' ? 1 : 0;
         $email = strtolower(trim($antiXss->xss_clean($request->getParam('email'))));
         $redir = Cookie::get('redir') === '' ? $antiXss->xss_clean(Cookie::get('redir')) : '/user';
-        $user = User::where('email', $email)->first();
+        $user = (new User())->where('email', $email)->first();
         $loginIp = new LoginIp();
 
         if ($user === null) {
@@ -172,14 +172,14 @@ final class AuthController extends BaseController
                 return ResponseHelper::error($response, '你的请求过于频繁，请稍后再试');
             }
 
-            $user = User::where('email', $email)->first();
+            $user = (new User())->where('email', $email)->first();
 
             if ($user !== null) {
                 return ResponseHelper::error($response, '此邮箱已经注册');
             }
 
             $code = Tools::genRandomChar(6);
-            $redis = Cache::initRedis();
+            $redis = (new Cache())->initRedis();
             $redis->setex('email_verify:' . $code, Config::obtain('email_verify_code_ttl'), $email);
 
             try {
@@ -215,9 +215,6 @@ final class AuthController extends BaseController
      *
      * @return ResponseInterface
      *
-     * @throws ClientExceptionInterface
-     * @throws GuzzleException
-     * @throws TelegramSDKException
      * @throws Exception
      */
     public static function registerHelper(
@@ -266,7 +263,7 @@ final class AuthController extends BaseController
         $user->ref_by = 0;
 
         if ($code !== '') {
-            $invite = InviteCode::where('code', $code)->first();
+            $invite = (new InviteCode())->where('code', $code)->first();
             $invite->reward();
             $user->ref_by = $invite->user_id;
             $user->money = Config::obtain('invitation_to_register_balance_reward');
@@ -311,10 +308,8 @@ final class AuthController extends BaseController
      *
      * @return Response|ResponseInterface
      *
-     * @throws ClientExceptionInterface
-     * @throws GuzzleException
      * @throws RedisException
-     * @throws TelegramSDKException
+     * @throws Exception
      */
     public function registerHandle(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
@@ -343,13 +338,13 @@ final class AuthController extends BaseController
         }
 
         if ($code !== '') {
-            $user_invite = InviteCode::where('code', $code)->first();
+            $user_invite = (new InviteCode())->where('code', $code)->first();
 
             if ($user_invite === null) {
                 return ResponseHelper::error($response, '邀请码无效');
             }
 
-            $gift_user = User::where('id', $user_invite->user_id)->first();
+            $gift_user = (new User())->where('id', $user_invite->user_id)->first();
 
             if ($gift_user === null || $gift_user->invite_num === 0) {
                 return ResponseHelper::error($response, '邀请码无效');
@@ -366,7 +361,7 @@ final class AuthController extends BaseController
             return $response->withJson($check_res);
         }
         // check email
-        $user = User::where('email', $email)->first();
+        $user = (new User())->where('email', $email)->first();
 
         if ($user !== null) {
             return ResponseHelper::error($response, '邮箱已经被注册了');
@@ -381,7 +376,7 @@ final class AuthController extends BaseController
         }
 
         if (Config::obtain('reg_email_verify')) {
-            $redis = Cache::initRedis();
+            $redis = (new Cache())->initRedis();
             $email_verify_code = trim($antiXss->xss_clean($request->getParam('emailcode')));
             $email_verify = $redis->get('email_verify:' . $email_verify_code);
 

src/Controllers/BaseController.php

@@ -8,6 +8,7 @@ use App\Models\User;
 use App\Services\Auth;
 use App\Services\View;
 use Smarty;
+use Twig\Environment;
 
 abstract class BaseController
 {
@@ -16,6 +17,11 @@ abstract class BaseController
      */
     protected Smarty $view;
 
+    /**
+     * @var Environment
+     */
+    protected Environment $twig;
+
     /**
      * @var User
      */
@@ -26,7 +32,6 @@ abstract class BaseController
      */
     public function __construct()
     {
-        $this->view = View::getSmarty();
         $this->user = Auth::getUser();
     }
 
@@ -35,6 +40,8 @@ abstract class BaseController
      */
     public function view(): Smarty
     {
+        $this->view = View::getSmarty();
+
         if (View::$connection) {
             $this->view->assign(
                 'queryLog',
@@ -46,4 +53,24 @@ abstract class BaseController
 
         return $this->view;
     }
+
+    /**
+     * Get twig
+     */
+    public function twig(): Environment
+    {
+        $this->twig = View::getTwig();
+
+        if (View::$connection) {
+            $this->twig->addGlobal(
+                'queryLog',
+                View::$connection
+                    ->connection('default')
+                    ->getQueryLog()
+            );
+            $this->twig->addGlobal('optTime', (microtime(true) - View::$beginTime) * 1000);
+        }
+
+        return $this->twig;
+    }
 }

src/Controllers/OAuthController.php

@@ -54,7 +54,7 @@ final class OAuthController extends BaseController
     public function slack(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $user = $this->user;
-        $redis = Cache::initRedis();
+        $redis = (new Cache())->initRedis();
 
         if ($request->getParam('code') === null) {
             $state = Tools::genRandomChar(16);
@@ -108,7 +108,7 @@ final class OAuthController extends BaseController
 
         $slack_user_id = $id_token->claims()->get('https://slack.com/user_id');
 
-        if (User::where('im_type', 1)->where('im_value', $slack_user_id)->first() !== null ||
+        if ((new User())->where('im_type', 1)->where('im_value', $slack_user_id)->first() !== null ||
             ($user->im_type === 1 && $user->im_value === $slack_user_id)) {
             return ResponseHelper::error($response, 'Slack 账户已绑定');
         }
@@ -127,7 +127,7 @@ final class OAuthController extends BaseController
     public function discord(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $user = $this->user;
-        $redis = Cache::initRedis();
+        $redis = (new Cache())->initRedis();
 
         if ($request->getParam('code') === null) {
             $state = Tools::genRandomChar(16);
@@ -193,7 +193,7 @@ final class OAuthController extends BaseController
 
         $discord_user_id = json_decode($user_response->getBody()->getContents(), true)['id'];
 
-        if (User::where('im_type', 2)->where('im_value', $discord_user_id)->first() !== null ||
+        if ((new User())->where('im_type', 2)->where('im_value', $discord_user_id)->first() !== null ||
             ($user->im_type === 2 && $user->im_value === $discord_user_id)) {
             return ResponseHelper::error($response, 'Discord 账户已绑定');
         }
@@ -250,7 +250,7 @@ final class OAuthController extends BaseController
         $telegram_id = $antiXss->xss_clean($user_auth['id']);
         $user = $this->user;
 
-        if (User::where('im_type', 4)->where('im_value', $telegram_id)->first() !== null ||
+        if ((new User())->where('im_type', 4)->where('im_value', $telegram_id)->first() !== null ||
             ($user->im_type === 4 && $user->im_value === $telegram_id)) {
             return ResponseHelper::error($response, 'Telegram 账户已绑定');
         }

src/Controllers/PasswordController.php

@@ -67,7 +67,7 @@ final class PasswordController extends BaseController
             return ResponseHelper::error($response, '你的请求过于频繁，请稍后再试');
         }
 
-        $user = User::where('email', $email)->first();
+        $user = (new User())->where('email', $email)->first();
         $msg = '如果你的账户存在于我们的数据库中，那么重置密码的链接将会发送到你账户所对应的邮箱。';
 
         if ($user !== null) {
@@ -88,7 +88,7 @@ final class PasswordController extends BaseController
     {
         $antiXss = new AntiXSS();
         $token = $antiXss->xss_clean($args['token']);
-        $redis = Cache::initRedis();
+        $redis = (new Cache())->initRedis();
         $email = $redis->get('password_reset:' . $token);
 
         if (! $email) {
@@ -118,14 +118,14 @@ final class PasswordController extends BaseController
             return ResponseHelper::error($response, '密码过短');
         }
 
-        $redis = Cache::initRedis();
+        $redis = (new Cache())->initRedis();
         $email = $redis->get('password_reset:' . $token);
 
         if (! $email) {
             return ResponseHelper::error($response, '链接无效');
         }
 
-        $user = User::where('email', $email)->first();
+        $user = (new User())->where('email', $email)->first();
 
         if ($user === null) {
             return ResponseHelper::error($response, '链接无效');

src/Controllers/SubController.php

@@ -58,7 +58,7 @@ final class SubController extends BaseController
             return ResponseHelper::error($response, $err_msg);
         }
 
-        $link = Link::where('token', $token)->first();
+        $link = (new Link())->where('token', $token)->first();
 
         if ($link === null || ! $link->isValid()) {
             return ResponseHelper::error($response, $err_msg);
@@ -90,7 +90,7 @@ final class SubController extends BaseController
     public static function getUniversalSubLink($user): string
     {
         $userid = $user->id;
-        $token = Link::where('userid', $userid)->first();
+        $token = (new Link())->where('userid', $userid)->first();
 
         if ($token === null) {
             $token = new Link();

src/Controllers/User/CouponController.php

@@ -33,7 +33,7 @@ final class CouponController extends BaseController
             ]);
         }
 
-        $coupon = UserCoupon::where('code', $coupon_raw)->first();
+        $coupon = (new UserCoupon())->where('code', $coupon_raw)->first();
 
         if ($coupon === null || ($coupon->expire_time !== 0 && $coupon->expire_time < time())) {
             return $response->withJson([
@@ -42,7 +42,7 @@ final class CouponController extends BaseController
             ]);
         }
 
-        $product = Product::where('id', $product_id)->first();
+        $product = (new Product())->where('id', $product_id)->first();
 
         if ($product === null) {
             return $response->withJson([
@@ -71,7 +71,7 @@ final class CouponController extends BaseController
         $use_limit = $limit->use_time;
 
         if ($use_limit > 0) {
-            $user_use_count = Order::where('user_id', $user->id)->where('coupon', $coupon->code)->count();
+            $user_use_count = (new Order())->where('user_id', $user->id)->where('coupon', $coupon->code)->count();
             if ($user_use_count >= $use_limit) {
                 return $response->withJson([
                     'ret' => 0,

src/Controllers/User/DetectLogController.php

@@ -21,7 +21,7 @@ final class DetectLogController extends BaseController
      */
     public function index(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $logs = DetectLog::orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
+        $logs = (new DetectLog())->orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
 
         foreach ($logs as $log) {
             $log->node_name = $log->nodeName();

src/Controllers/User/DetectRuleController.php

@@ -18,7 +18,7 @@ final class DetectRuleController extends BaseController
      */
     public function index(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $rules = DetectRule::get();
+        $rules = (new DetectRule())->get();
 
         return $response->write($this->view()
             ->assign('rules', $rules)

src/Controllers/User/DocsController.php

@@ -24,7 +24,7 @@ final class DocsController extends BaseController
             return $response->withRedirect('/user');
         }
 
-        $docs = Docs::orderBy('id', 'desc')->get();
+        $docs = (new Docs())->orderBy('id', 'desc')->get();
 
         return $response->write(
             $this->view()
@@ -44,7 +44,7 @@ final class DocsController extends BaseController
         }
 
         $id = $args['id'];
-        $doc = Docs::find($id);
+        $doc = (new Docs())->find($id);
 
         return $response->write(
             $this->view()

src/Controllers/User/InfoController.php

@@ -68,7 +68,7 @@ final class InfoController extends BaseController
             return $response->withJson($check_res);
         }
 
-        $exist_user = User::where('email', $new_email)->first();
+        $exist_user = (new User())->where('email', $new_email)->first();
 
         if ($exist_user !== null) {
             return ResponseHelper::error($response, '邮箱已经被使用了');
@@ -79,7 +79,7 @@ final class InfoController extends BaseController
         }
 
         if (Config::obtain('reg_email_verify')) {
-            $redis = Cache::initRedis();
+            $redis = (new Cache())->initRedis();
             $email_verify_code = $request->getParam('emailcode');
             $email_verify = $redis->get('email_verify:' . $email_verify_code);
 

src/Controllers/User/InvoiceController.php

@@ -53,7 +53,7 @@ final class InvoiceController extends BaseController
         $antiXss = new AntiXSS();
         $id = $antiXss->xss_clean($args['id']);
 
-        $invoice = Invoice::where('user_id', $this->user->id)->where('id', $id)->first();
+        $invoice = (new Invoice())->where('user_id', $this->user->id)->where('id', $id)->first();
 
         if ($invoice === null) {
             return $response->withRedirect('/user/invoice');
@@ -62,7 +62,7 @@ final class InvoiceController extends BaseController
         $paylist = [];
 
         if ($invoice->status === 'paid_gateway') {
-            $paylist = Paylist::where('invoice_id', $invoice->id)->where('status', 1)->first();
+            $paylist = (new Paylist())->where('invoice_id', $invoice->id)->where('status', 1)->first();
         }
 
         $invoice->status_text = $invoice->status();
@@ -86,7 +86,7 @@ final class InvoiceController extends BaseController
         $antiXss = new AntiXSS();
         $invoice_id = $antiXss->xss_clean($request->getParam('invoice_id'));
 
-        $invoice = Invoice::where('user_id', $this->user->id)->where('id', $invoice_id)->first();
+        $invoice = (new Invoice())->where('user_id', $this->user->id)->where('id', $invoice_id)->first();
 
         if ($invoice === null) {
             return $response->withJson([
@@ -117,7 +117,7 @@ final class InvoiceController extends BaseController
 
         (new UserMoneyLog())->add(
             $user->id,
-            (float) $money_before,
+            $money_before,
             (float) $user->money,
             -$invoice->price,
             '支付账单 #' . $invoice->id
@@ -136,7 +136,7 @@ final class InvoiceController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $invoices = Invoice::orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
+        $invoices = (new Invoice())->orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
 
         foreach ($invoices as $invoice) {
             $invoice->op = '<a class="btn btn-blue" href="/user/invoice/' . $invoice->id . '/view">查看</a>';

src/Controllers/User/MoneyController.php

@@ -23,7 +23,7 @@ final class MoneyController extends BaseController
     public function index(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $user = $this->user;
-        $moneylogs = UserMoneyLog::where('user_id', $user->id)->orderBy('id', 'desc')->get();
+        $moneylogs = (new UserMoneyLog())->where('user_id', $user->id)->orderBy('id', 'desc')->get();
 
         foreach ($moneylogs as $moneylog) {
             $moneylog->create_time = Tools::toDateTime($moneylog->create_time);
@@ -43,7 +43,7 @@ final class MoneyController extends BaseController
     {
         $antiXss = new AntiXSS();
         $giftcard_raw = $antiXss->xss_clean($request->getParam('giftcard'));
-        $giftcard = GiftCard::where('card', $giftcard_raw)->first();
+        $giftcard = (new GiftCard())->where('card', $giftcard_raw)->first();
 
         if ($giftcard === null || $giftcard->status !== 0) {
             return $response->withJson([
@@ -72,7 +72,7 @@ final class MoneyController extends BaseController
 
         (new UserMoneyLog())->add(
             $user->id,
-            (float) $money_before,
+            $money_before,
             (float) $user->money,
             $giftcard->balance,
             '礼品卡充值 ' . $giftcard->card

src/Controllers/User/OrderController.php

@@ -71,7 +71,7 @@ final class OrderController extends BaseController
             return $response->withRedirect('/user/product');
         }
 
-        $product = Product::where('id', $product_id)->first();
+        $product = (new Product())->where('id', $product_id)->first();
         $product->type_text = $product->type();
         $product->content = json_decode($product->content);
 
@@ -90,7 +90,7 @@ final class OrderController extends BaseController
         $antiXss = new AntiXSS();
         $id = $antiXss->xss_clean($args['id']);
 
-        $order = Order::where('user_id', $this->user->id)->where('id', $id)->first();
+        $order = (new Order())->where('user_id', $this->user->id)->where('id', $id)->first();
 
         if ($order === null) {
             return $response->withRedirect('/user/order');
@@ -102,7 +102,7 @@ final class OrderController extends BaseController
         $order->update_time = Tools::toDateTime($order->update_time);
         $order->content = json_decode($order->product_content);
 
-        $invoice = Invoice::where('order_id', $id)->first();
+        $invoice = (new Invoice())->where('order_id', $id)->first();
         $invoice->status = $invoice->status();
         $invoice->create_time = Tools::toDateTime($invoice->create_time);
         $invoice->update_time = Tools::toDateTime($invoice->update_time);
@@ -123,7 +123,7 @@ final class OrderController extends BaseController
         $coupon_raw = $antiXss->xss_clean($request->getParam('coupon'));
         $product_id = $antiXss->xss_clean($request->getParam('product_id'));
 
-        $product = Product::find($product_id);
+        $product = (new Product())->find($product_id);
 
         if ($product === null || $product->stock === 0) {
             return $response->withJson([
@@ -143,7 +143,7 @@ final class OrderController extends BaseController
         }
 
         if ($coupon_raw !== '') {
-            $coupon = UserCoupon::where('code', $coupon_raw)->first();
+            $coupon = (new UserCoupon())->where('code', $coupon_raw)->first();
 
             if ($coupon === null || ($coupon->expire_time !== 0 && $coupon->expire_time < time())) {
                 return $response->withJson([
@@ -171,7 +171,7 @@ final class OrderController extends BaseController
             $coupon_use_limit = $coupon_limit->use_time;
 
             if ($coupon_use_limit > 0) {
-                $user_use_count = Order::where('user_id', $user->id)->where('coupon', $coupon->code)->count();
+                $user_use_count = (new Order())->where('user_id', $user->id)->where('coupon', $coupon->code)->count();
                 if ($user_use_count >= $coupon_use_limit) {
                     return $response->withJson([
                         'ret' => 0,
@@ -206,7 +206,7 @@ final class OrderController extends BaseController
 
         $product_limit = json_decode($product->limit);
 
-        if ($product_limit->class_required !== '' && (int) $user->class < (int) $product_limit->class_required) {
+        if ($product_limit->class_required !== '' && $user->class < (int) $product_limit->class_required) {
             return $response->withJson([
                 'ret' => 0,
                 'msg' => self::$err_msg,
@@ -214,7 +214,7 @@ final class OrderController extends BaseController
         }
 
         if ($product_limit->node_group_required !== ''
-            && (int) $user->node_group !== (int) $product_limit->node_group_required) {
+            && $user->node_group !== (int) $product_limit->node_group_required) {
             return $response->withJson([
                 'ret' => 0,
                 'msg' => self::$err_msg,
@@ -222,7 +222,7 @@ final class OrderController extends BaseController
         }
 
         if ($product_limit->new_user_required !== 0) {
-            $order_count = Order::where('user_id', $user->id)->count();
+            $order_count = (new Order())->where('user_id', $user->id)->count();
             if ($order_count > 0) {
                 return $response->withJson([
                     'ret' => 0,
@@ -291,13 +291,13 @@ final class OrderController extends BaseController
 
     public function ajax(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $orders = Order::orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
+        $orders = (new Order())->orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
 
         foreach ($orders as $order) {
             $order->op = '<a class="btn btn-blue" href="/user/order/' . $order->id . '/view">查看</a>';
 
             if ($order->status === 'pending_payment') {
-                $invoice_id = Invoice::where('order_id', $order->id)->first()->id;
+                $invoice_id = (new Invoice())->where('order_id', $order->id)->first()->id;
                 $order->op .= '
                 <a class="btn btn-red" href="/user/invoice/' . $invoice_id . '/view">支付</a>';
             }

src/Controllers/User/ProductController.php

@@ -19,19 +19,19 @@ final class ProductController extends BaseController
      */
     public function index(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $tabps = Product::where('status', '1')
+        $tabps = (new Product())->where('status', '1')
             ->where('type', 'tabp')
-            ->orderBy('id', 'asc')
+            ->orderBy('id')
             ->get();
 
-        $bandwidths = Product::where('status', '1')
+        $bandwidths = (new Product())->where('status', '1')
             ->where('type', 'bandwidth')
-            ->orderBy('id', 'asc')
+            ->orderBy('id')
             ->get();
 
-        $times = Product::where('status', '1')
+        $times = (new Product())->where('status', '1')
             ->where('type', 'time')
-            ->orderBy('id', 'asc')
+            ->orderBy('id')
             ->get();
 
         foreach ($tabps as $tabp) {

src/Controllers/User/SubLogController.php

@@ -21,7 +21,7 @@ final class SubLogController extends BaseController
      */
     public function index(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $logs = SubscribeLog::orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
+        $logs = (new SubscribeLog())->orderBy('id', 'desc')->where('user_id', $this->user->id)->get();
 
         foreach ($logs as $log) {
             $log->request_time = Tools::toDateTime($log->request_time);

src/Controllers/User/TicketController.php

@@ -38,7 +38,7 @@ final class TicketController extends BaseController
             return $response->withRedirect('/user');
         }
 
-        $tickets = Ticket::where('userid', $this->user->id)->orderBy('datetime', 'desc')->get();
+        $tickets = (new Ticket())->where('userid', $this->user->id)->orderBy('datetime', 'desc')->get();
 
         foreach ($tickets as $ticket) {
             $ticket->status = $ticket->status();
@@ -131,7 +131,7 @@ final class TicketController extends BaseController
             ]);
         }
 
-        $ticket = Ticket::where('id', $id)->where('userid', $this->user->id)->first();
+        $ticket = (new Ticket())->where('id', $id)->where('userid', $this->user->id)->first();
 
         if ($ticket === null) {
             return $response->withJson([
@@ -181,7 +181,7 @@ final class TicketController extends BaseController
         }
 
         $id = $args['id'];
-        $ticket = Ticket::where('id', '=', $id)->where('userid', $this->user->id)->first();
+        $ticket = (new Ticket())->where('id', '=', $id)->where('userid', $this->user->id)->first();
 
         if ($ticket === null) {
             return $response->withRedirect('/user/ticket');

src/Controllers/UserController.php

@@ -40,7 +40,7 @@ final class UserController extends BaseController
 
         return $response->write(
             $this->view()
-                ->assign('ann', Ann::orderBy('date', 'desc')->first())
+                ->assign('ann', (new Ann())->orderBy('date', 'desc')->first())
                 ->assign('captcha', $captcha)
                 ->assign('class_expire_days', $class_expire_days)
                 ->assign('UniversalSub', SubController::getUniversalSubLink($this->user))
@@ -54,9 +54,9 @@ final class UserController extends BaseController
     public function profile(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         // 登录IP
-        $logins = LoginIp::where('userid', $this->user->id)
+        $logins = (new LoginIp())->where('userid', $this->user->id)
             ->where('type', '=', 0)->orderBy('datetime', 'desc')->take(10)->get();
-        $ips = OnlineLog::where('user_id', $this->user->id)
+        $ips = (new OnlineLog())->where('user_id', $this->user->id)
             ->where('last_time', '>', time() - 90)->orderByDesc('last_time')->get();
 
         foreach ($logins as $login) {
@@ -72,7 +72,7 @@ final class UserController extends BaseController
         foreach ($ips as $ip) {
             $ip->ip = str_replace('::ffff:', '', $ip->ip);
             $ip->location = Tools::getIpLocation($ip->ip);
-            $ip->node_name = Node::where('id', $ip->node_id)->first()->name;
+            $ip->node_name = (new Node())->where('id', $ip->node_id)->first()->name;
             $ip->last_time = Tools::toDateTime((int) $ip->last_time);
         }
 
@@ -89,7 +89,7 @@ final class UserController extends BaseController
      */
     public function announcement(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $anns = Ann::orderBy('date', 'desc')->get();
+        $anns = (new Ann())->orderBy('date', 'desc')->get();
 
         return $response->write(
             $this->view()
@@ -103,13 +103,13 @@ final class UserController extends BaseController
      */
     public function invite(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
-        $code = InviteCode::where('user_id', $this->user->id)->first()?->code;
+        $code = (new InviteCode())->where('user_id', $this->user->id)->first()?->code;
 
         if ($code === null) {
             $code = $this->user->addInviteCode();
         }
 
-        $paybacks = Payback::where('ref_by', $this->user->id)
+        $paybacks = (new Payback())->where('ref_by', $this->user->id)
             ->orderBy('id', 'desc')
             ->get();
 
@@ -117,7 +117,7 @@ final class UserController extends BaseController
             $payback->datetime = Tools::toDateTime($payback->datetime);
         }
 
-        $paybacks_sum = Payback::where('ref_by', $this->user->id)->sum('ref_get');
+        $paybacks_sum = (new Payback())->where('ref_by', $this->user->id)->sum('ref_get');
 
         if (! $paybacks_sum) {
             $paybacks_sum = 0;

src/Controllers/WebAPI/NodeController.php

@@ -18,7 +18,7 @@ final class NodeController extends BaseController
     public function getInfo(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $node_id = $args['id'];
-        $node = Node::find($node_id);
+        $node = (new Node())->find($node_id);
 
         if ($node === null) {
             return $response->withJson([

src/Controllers/WebAPI/UserController.php

@@ -33,7 +33,7 @@ final class UserController extends BaseController
     public function index(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $node_id = $request->getQueryParam('node_id');
-        $node = Node::find($node_id);
+        $node = (new Node())->find($node_id);
 
         if ($node === null) {
             return $response->withJson([
@@ -86,7 +86,7 @@ final class UserController extends BaseController
                 )
         ', [$node->node_class, $node->node_group, $node->node_group]);
 
-        $keys_unset = match ((int) $node->sort) {
+        $keys_unset = match ($node->sort) {
             14, 11 => ['u', 'd', 'transfer_enable', 'method', 'port', 'passwd'],
             2 => ['u', 'd', 'transfer_enable', 'method', 'port'],
             1 => ['u', 'd', 'transfer_enable', 'method', 'port', 'uuid'],
@@ -151,7 +151,7 @@ final class UserController extends BaseController
 
         $data = $data->data;
         $node_id = $request->getQueryParam('node_id');
-        $node = Node::find($node_id);
+        $node = (new Node())->find($node_id);
 
         if ($node === null) {
             return $response->withJson([
@@ -179,7 +179,7 @@ final class UserController extends BaseController
                 (int) date('H')
             );
         } else {
-            $rate = (float) $node->traffic_rate;
+            $rate = $node->traffic_rate;
         }
 
         $sum = 0;
@@ -229,7 +229,7 @@ final class UserController extends BaseController
         $data = $data->data;
         $node_id = $request->getQueryParam('node_id');
 
-        if ($node_id === null || ! Node::where('id', $node_id)->exists()) {
+        if ($node_id === null || ! (new Node())->where('id', $node_id)->exists()) {
             return $response->withJson([
                 'ret' => 0,
                 'msg' => 'Node not found.',
@@ -286,7 +286,7 @@ final class UserController extends BaseController
         $data = $data->data;
         $node_id = $request->getQueryParam('node_id');
 
-        if ($node_id === null || ! Node::where('id', $node_id)->exists()) {
+        if ($node_id === null || ! (new Node())->where('id', $node_id)->exists()) {
             return $response->withJson([
                 'ret' => 0,
                 'msg' => 'Node not found.',
@@ -297,7 +297,7 @@ final class UserController extends BaseController
             $list_id = (int) $log?->list_id;
             $user_id = (int) $log?->user_id;
 
-            DetectLog::insert([
+            (new DetectLog())->insert([
                 'user_id' => $user_id,
                 'list_id' => $list_id,
                 'node_id' => $node_id,

src/Middleware/NodeToken.php

@@ -55,7 +55,7 @@ final class NodeToken implements MiddlewareInterface
         if ($_ENV['checkNodeIp']) {
             $ip = $request->getServerParam('REMOTE_ADDR');
 
-            if ($ip !== '127.0.0.1' && ! Node::where('node_ip', $ip)->exists()) {
+            if ($ip !== '127.0.0.1' && ! (new Node())->where('node_ip', $ip)->exists()) {
                 return AppFactory::determineResponseFactory()->createResponse(401)->withJson([
                     'ret' => 0,
                     'msg' => 'Invalid request IP.',

src/Models/Config.php

@@ -24,7 +24,7 @@ final class Config extends Model
 
     public static function obtain($item): bool|int|string
     {
-        $config = self::where('item', $item)->first();
+        $config = (new Config())->where('item', $item)->first();
 
         return match ($config->type) {
             'bool' => (bool) $config->value,
@@ -36,7 +36,7 @@ final class Config extends Model
     public static function getClass($class): array
     {
         $configs = [];
-        $all_configs = self::where('class', $class)->get();
+        $all_configs = (new Config())->where('class', $class)->get();
 
         foreach ($all_configs as $config) {
             if ($config->type === 'bool') {
@@ -54,7 +54,7 @@ final class Config extends Model
     public static function getPublicConfig(): array
     {
         $configs = [];
-        $all_configs = self::where('is_public', '1')->get();
+        $all_configs = (new Config())->where('is_public', '1')->get();
 
         foreach ($all_configs as $config) {
             if ($config->type === 'bool') {
@@ -71,7 +71,7 @@ final class Config extends Model
 
     public static function set($item, $value): bool
     {
-        $config = self::where('item', $item)->first();
+        $config = (new Config())->where('item', $item)->first();
 
         if ($config->tpye === 'array') {
             $config->value = json_encode($value);

src/Models/DetectBanLog.php

@@ -28,7 +28,7 @@ final class DetectBanLog extends Model
      */
     public function user(): ?User
     {
-        return User::find($this->user_id);
+        return (new User())->find($this->user_id);
     }
 
     /**

src/Models/DetectLog.php

@@ -27,7 +27,7 @@ final class DetectLog extends Model
      */
     public function user(): ?User
     {
-        return User::find($this->user_id);
+        return (new User())->find($this->user_id);
     }
 
     /**
@@ -43,7 +43,7 @@ final class DetectLog extends Model
      */
     public function node(): ?Node
     {
-        return Node::find($this->node_id);
+        return (new Node())->find($this->node_id);
     }
 
     /**
@@ -59,7 +59,7 @@ final class DetectLog extends Model
      */
     public function rule(): ?DetectRule
     {
-        return DetectRule::find($this->list_id);
+        return (new DetectRule())->find($this->list_id);
     }
 
     /**

src/Models/InviteCode.php

@@ -21,7 +21,7 @@ final class InviteCode extends Model
 
     public function reward(): void
     {
-        $user = User::where('id', $this->user_id)
+        $user = (new User())->where('id', $this->user_id)
             ->where('is_banned', 0)
             ->where('is_shadow_banned', 0)
             ->first();

src/Models/Link.php

@@ -20,7 +20,7 @@ final class Link extends Model
 
     public function user(): ?User
     {
-        return User::find($this->attributes['userid']);
+        return (new User())->find($this->attributes['userid']);
     }
 
     public function isValid(): bool

src/Models/LoginIp.php

@@ -31,7 +31,7 @@ final class LoginIp extends Model
      */
     public function user(): ?User
     {
-        return User::find($this->userid);
+        return (new User())->find($this->userid);
     }
 
     /**
@@ -58,10 +58,6 @@ final class LoginIp extends Model
      * @param int $user_id User ID
      *
      * @return void
-     *
-     * @throws GuzzleException
-     * @throws ClientExceptionInterface
-     * @throws TelegramSDKException
      */
     public function collectLoginIP(string $ip, int $type = 0, int $user_id = 0): void
     {
@@ -73,11 +69,11 @@ final class LoginIp extends Model
 
             if (Config::obtain('notify_new_login') &&
                 $user_id !== 0 &&
-                LoginIp::where('userid', $user_id)->where('ip', $this->ip)->count() === 0
+                (new LoginIp())->where('userid', $user_id)->where('ip', $this->ip)->count() === 0
             ) {
                 try {
                     Notification::notifyUser(
-                        User::where('id', $user_id)->first(),
+                        (new User())->where('id', $user_id)->first(),
                         $_ENV['appName'] . '-新登录通知',
                         '你的账号于 ' . date('Y-m-d H:i:s') . ' 通过 ' . $this->ip . ' 地址登录了用户面板',
                     );

src/Models/OnlineLog.php

@@ -48,11 +48,11 @@ final class OnlineLog extends Model
 
     public function userName(): string
     {
-        return User::where('id', $this->user_id)->value('user_name');
+        return (new User())->where('id', $this->user_id)->value('user_name');
     }
 
     public function nodeName(): string
     {
-        return Node::where('id', $this->node_id)->value('name');
+        return (new Node())->where('id', $this->node_id)->value('name');
     }
 }

src/Models/Payback.php

@@ -22,32 +22,32 @@ final class Payback extends Model
     protected $connection = 'default';
     protected $table = 'payback';
 
-    public function user()
+    public function user(): \Illuminate\Database\Eloquent\Model|User|null
     {
-        return User::where('id', $this->userid)->first();
+        return (new User())->where('id', $this->userid)->first();
     }
 
     public function getUserNameAttribute(): string
     {
-        return User::where('id', $this->userid)->first() === null ? '已注销' :
-            User::where('id', $this->userid)->first()->user_name;
+        return (new User())->where('id', $this->userid)->first() === null ? '已注销' :
+            (new User())->where('id', $this->userid)->first()->user_name;
     }
 
-    public function refUser()
+    public function refUser(): \Illuminate\Database\Eloquent\Model|User|null
     {
-        return User::where('id', $this->ref_by)->first();
+        return (new User())->where('id', $this->ref_by)->first();
     }
 
     public function getRefUserNameAttribute(): string
     {
-        return User::where('id', $this->ref_by)->first() === null ? '已注销' :
-            User::where('id', $this->ref_by)->first()->user_name;
+        return (new User())->where('id', $this->ref_by)->first() === null ? '已注销' :
+            (new User())->where('id', $this->ref_by)->first()->user_name;
     }
 
     public function rebate($user_id, $order_amount): void
     {
         $configs = Config::getClass('ref');
-        $user = User::where('id', $user_id)->first();
+        $user = (new User())->where('id', $user_id)->first();
         $gift_user_id = $user->ref_by;
         // 判断
         $invite_rebate_mode = (string) $configs['invite_rebate_mode'];
@@ -88,7 +88,7 @@ final class Payback extends Model
 
     public function execute($user_id, $gift_user_id, $order_amount, $adjust_rebate = null): void
     {
-        $gift_user = User::where('id', $gift_user_id)
+        $gift_user = (new User())->where('id', $gift_user_id)
             ->where('is_banned', 0)
             ->where('is_shadow_banned', 0)
             ->first();

src/Models/SubscribeLog.php

@@ -34,7 +34,7 @@ final class SubscribeLog extends Model
      */
     public function user(): ?User
     {
-        return User::find($this->user_id);
+        return (new User())->find($this->user_id);
     }
 
     /**
@@ -61,7 +61,7 @@ final class SubscribeLog extends Model
         $this->request_time = time();
 
         if (Config::obtain('notify_new_subscribe') &&
-            SubscribeLog::where('user_id', $this->user_id)
+            (new SubscribeLog())->where('user_id', $this->user_id)
                 ->where('request_ip', 'like', '%' . $this->request_ip . '%')
                 ->count() === 0
         ) {

src/Models/User.php

@@ -310,7 +310,7 @@ final class User extends Model
      */
     public function cleanLink(): void
     {
-        Link::where('userid', $this->id)->delete();
+        (new Link())->where('userid', $this->id)->delete();
     }
 
     /**
@@ -318,7 +318,7 @@ final class User extends Model
      */
     public function clearInviteCodes(): void
     {
-        InviteCode::where('user_id', $this->id)->delete();
+        (new InviteCode())->where('user_id', $this->id)->delete();
     }
 
     /**
@@ -326,7 +326,7 @@ final class User extends Model
      */
     public function getTopUp(): float
     {
-        $number = Paylist::where('userid', $this->id)->sum('number');
+        $number = (new Paylist())->where('userid', $this->id)->sum('number');
         return is_null($number) ? 0.00 : round((float) $number, 2);
     }
 
@@ -335,7 +335,7 @@ final class User extends Model
      */
     public function onlineIpCount(): int
     {
-        return OnlineLog::where('user_id', $this->id)
+        return (new OnlineLog())->where('user_id', $this->id)
             ->where('last_time', '>', time() - 90)
             ->count();
     }
@@ -347,13 +347,13 @@ final class User extends Model
     {
         $uid = $this->id;
 
-        DetectBanLog::where('user_id', $uid)->delete();
-        DetectLog::where('user_id', $uid)->delete();
-        InviteCode::where('user_id', $uid)->delete();
-        OnlineLog::where('user_id', $uid)->delete();
-        Link::where('userid', $uid)->delete();
-        LoginIp::where('userid', $uid)->delete();
-        SubscribeLog::where('user_id', $uid)->delete();
+        (new DetectBanLog())->where('user_id', $uid)->delete();
+        (new DetectLog())->where('user_id', $uid)->delete();
+        (new InviteCode())->where('user_id', $uid)->delete();
+        (new OnlineLog())->where('user_id', $uid)->delete();
+        (new Link())->where('userid', $uid)->delete();
+        (new LoginIp())->where('userid', $uid)->delete();
+        (new SubscribeLog())->where('user_id', $uid)->delete();
 
         return $this->delete();
     }

src/Services/Analytics.php

@@ -26,119 +26,120 @@ final class Analytics
     public static function getIncome(string $req): float
     {
         $today = strtotime('00:00:00');
+        $paylist = new Paylist();
         $number = match ($req) {
-            'today' => Paylist::where('status', 1)
+            'today' => $paylist->where('status', 1)
                 ->whereBetween('datetime', [$today, time()])
                 ->sum('total'),
-            'yesterday' => Paylist::where('status', 1)
+            'yesterday' => $paylist->where('status', 1)
                 ->whereBetween('datetime', [strtotime('-1 day', $today), $today])
                 ->sum('total'),
-            'this month' => Paylist::where('status', 1)
+            'this month' => $paylist->where('status', 1)
                 ->whereBetween('datetime', [strtotime('first day of this month 00:00:00'), time()])
                 ->sum('total'),
-            default => Paylist::where('status', 1)->sum('total'),
+            default => $paylist->where('status', 1)->sum('total'),
         };
 
         return is_null($number) ? 0.00 : round(floatval($number), 2);
     }
 
-    public static function getTotalUser()
+    public static function getTotalUser(): int
     {
-        return User::count();
+        return (new User())->count();
     }
 
-    public static function getCheckinUser()
+    public static function getCheckinUser(): int
     {
-        return User::where('last_check_in_time', '>', 0)->count();
+        return (new User())->where('last_check_in_time', '>', 0)->count();
     }
 
-    public static function getTodayCheckinUser()
+    public static function getTodayCheckinUser(): int
     {
-        return User::where('last_check_in_time', '>', strtotime('today'))->count();
+        return (new User())->where('last_check_in_time', '>', strtotime('today'))->count();
     }
 
     public static function getTrafficUsage(): string
     {
-        return Tools::autoBytes(User::sum('u') + User::sum('d'));
+        return Tools::autoBytes((new User())->sum('u') + (new User())->sum('d'));
     }
 
     public static function getTodayTrafficUsage(): string
     {
-        return Tools::autoBytes(User::sum('transfer_today'));
+        return Tools::autoBytes((new User())->sum('transfer_today'));
     }
 
     public static function getRawTodayTrafficUsage()
     {
-        return User::sum('transfer_today');
+        return (new User())->sum('transfer_today');
     }
 
     public static function getRawGbTodayTrafficUsage(): float
     {
-        return Tools::flowToGB(User::sum('transfer_today'));
+        return Tools::flowToGB((new User())->sum('transfer_today'));
     }
 
     public static function getLastTrafficUsage(): string
     {
-        return Tools::autoBytes(User::sum('u') + User::sum('d') - User::sum('transfer_today'));
+        return Tools::autoBytes((new User())->sum('u') + (new User())->sum('d') - (new User())->sum('transfer_today'));
     }
 
     public static function getRawLastTrafficUsage()
     {
-        return User::sum('u') + User::sum('d') - User::sum('transfer_today');
+        return (new User())->sum('u') + (new User())->sum('d') - (new User())->sum('transfer_today');
     }
 
     public static function getRawGbLastTrafficUsage(): float
     {
-        return Tools::flowToGB(User::sum('u') + User::sum('d') - User::sum('transfer_today'));
+        return Tools::flowToGB((new User())->sum('u') + (new User())->sum('d') - (new User())->sum('transfer_today'));
     }
 
     public static function getUnusedTrafficUsage(): string
     {
-        return Tools::autoBytes(User::sum('transfer_enable') - User::sum('u') - User::sum('d'));
+        return Tools::autoBytes((new User())->sum('transfer_enable') - (new User())->sum('u') - (new User())->sum('d'));
     }
 
     public static function getRawUnusedTrafficUsage()
     {
-        return User::sum('transfer_enable') - User::sum('u') - User::sum('d');
+        return (new User())->sum('transfer_enable') - (new User())->sum('u') - (new User())->sum('d');
     }
 
     public static function getRawGbUnusedTrafficUsage(): float
     {
-        return Tools::flowToGB(User::sum('transfer_enable') - User::sum('u') - User::sum('d'));
+        return Tools::flowToGB((new User())->sum('transfer_enable') - (new User())->sum('u') - (new User())->sum('d'));
     }
 
     public static function getTotalTraffic(): string
     {
-        return Tools::autoBytes(User::sum('transfer_enable'));
+        return Tools::autoBytes((new User())->sum('transfer_enable'));
     }
 
     public static function getRawTotalTraffic()
     {
-        return User::sum('transfer_enable');
+        return (new User())->sum('transfer_enable');
     }
 
     public static function getRawGbTotalTraffic(): float
     {
-        return Tools::flowToGB(User::sum('transfer_enable'));
+        return Tools::flowToGB((new User())->sum('transfer_enable'));
     }
 
-    public static function getTotalNode()
+    public static function getTotalNode(): int
     {
-        return Node::where('node_heartbeat', '>', 0)->count();
+        return (new Node())->where('node_heartbeat', '>', 0)->count();
     }
 
-    public static function getAliveNode()
+    public static function getAliveNode(): int
     {
-        return Node::where('node_heartbeat', '>', time() - 90)->count();
+        return (new Node())->where('node_heartbeat', '>', time() - 90)->count();
     }
 
-    public static function getInactiveUser()
+    public static function getInactiveUser(): int
     {
-        return User::where('is_inactive', 1)->count();
+        return (new User())->where('is_inactive', 1)->count();
     }
 
-    public static function getActiveUser()
+    public static function getActiveUser(): int
     {
-        return User::where('is_inactive', 0)->count();
+        return (new User())->where('is_inactive', 0)->count();
     }
 }

src/Services/Auth/Cookie.php

@@ -14,7 +14,7 @@ final class Cookie extends Base
 {
     public function login($uid, $time): void
     {
-        $user = User::find($uid);
+        $user = (new User())->find($uid);
         $expire_in = $time + time();
 
         CookieUtils::setWithDomain([
@@ -55,7 +55,7 @@ final class Cookie extends Base
 
         if ($_ENV['enable_login_bind_ip']) {
             $remote_ip = $_SERVER['REMOTE_ADDR'];
-            $node = Node::where('node_ip', $remote_ip)->first();
+            $node = (new Node())->where('node_ip', $remote_ip)->first();
 
             if ($node === null && $ipHash !== Hash::ipHash($remote_ip, $uid, $expire_in)) {
                 return $user;
@@ -70,7 +70,7 @@ final class Cookie extends Base
             }
         }
 
-        $user = User::find($uid);
+        $user = (new User())->find($uid);
 
         if ($user === null) {
             $user = new User();

src/Services/Bot/Telegram/Callback.php

@@ -11,8 +11,10 @@ use App\Models\LoginIp;
 use App\Models\OnlineLog;
 use App\Models\Payback;
 use App\Models\SubscribeLog;
+use App\Models\User;
 use App\Utils\Tools;
 use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use MaxMind\Db\Reader\InvalidDatabaseException;
 use Telegram\Bot\Api;
@@ -38,7 +40,7 @@ final class Callback
     /**
      * 触发用户
      */
-    private $user;
+    private null|Model|User $user;
 
     /**
      * 触发用户TG信息
@@ -331,7 +333,7 @@ final class Callback
         switch ($OpEnd) {
             case 'login_log':
                 // 登录记录
-                $total = LoginIp::where('userid', $this->user->id)
+                $total = (new LoginIp())->where('userid', $this->user->id)
                     ->where('type', '=', 0)
                     ->orderBy('datetime', 'desc')
                     ->take(10)
@@ -359,7 +361,7 @@ final class Callback
                 break;
             case 'usage_log':
                 // 使用记录
-                $logs = OnlineLog::where('user_id', $this->user->id)
+                $logs = (new OnlineLog())->where('user_id', $this->user->id)
                     ->where('last_time', '>', time() - 90)->orderByDesc('last_time')->get('ip');
                 $text = '<strong>以下是你账户在线 IP 和地理位置：</strong>' . PHP_EOL . PHP_EOL;
 
@@ -385,7 +387,7 @@ final class Callback
                 break;
             case 'rebate_log':
                 // 返利记录
-                $paybacks = Payback::where('ref_by', $this->user->id)->orderBy('datetime', 'desc')->take(10)->get();
+                $paybacks = (new Payback())->where('ref_by', $this->user->id)->orderBy('datetime', 'desc')->take(10)->get();
                 $text = '<strong>以下是你最近 10 次返利记录：</strong>' . PHP_EOL . PHP_EOL;
 
                 foreach ($paybacks as $payback) {
@@ -410,7 +412,7 @@ final class Callback
             case 'subscribe_log':
                 // 订阅记录
                 if (Config::obtain('subscribe_log')) {
-                    $logs = SubscribeLog::orderBy('id', 'desc')->where('user_id', $this->user->id)->take(10)->get();
+                    $logs = (new SubscribeLog())->orderBy('id', 'desc')->where('user_id', $this->user->id)->take(10)->get();
                     $text = '<strong>以下是你最近 10 次订阅记录：</strong>' . PHP_EOL . PHP_EOL;
 
                     foreach ($logs as $log) {
@@ -873,7 +875,7 @@ final class Callback
 
     public function getUserInviteKeyboard(): array
     {
-        $paybacks_sum = Payback::where('ref_by', $this->user->id)->sum('ref_get');
+        $paybacks_sum = (new Payback())->where('ref_by', $this->user->id)->sum('ref_get');
 
         if (is_null($paybacks_sum)) {
             $paybacks_sum = 0;
@@ -925,11 +927,11 @@ final class Callback
 
         if ($OpEnd === 'get') {
             $this->allow_edit_message = false;
-            $code = InviteCode::where('user_id', $this->user->id)->first();
+            $code = (new InviteCode())->where('user_id', $this->user->id)->first();
 
             if ($code === null) {
                 $this->user->addInviteCode();
-                $code = InviteCode::where('user_id', $this->user->id)->first();
+                $code = (new InviteCode())->where('user_id', $this->user->id)->first();
             }
 
             $inviteUrl = $_ENV['baseUrl'] . '/auth/register?code=' . $code->code;

src/Services/Bot/Telegram/Commands/MyCommand.php

@@ -60,7 +60,7 @@ final class MyCommand extends Command
             'username' => $message->getFrom()->getUsername(),
         ];
 
-        $user = User::where('im_type', 4)->where('im_value', $send_user['id'])->first();
+        $user = (new User())->where('im_type', 4)->where('im_value', $send_user['id'])->first();
 
         if ($user === null) {
             // 回送信息

src/Services/Bot/Telegram/Commands/UnbindCommand.php

@@ -8,6 +8,7 @@ use App\Models\Config;
 use App\Services\Bot\Telegram\Message;
 use Telegram\Bot\Actions;
 use Telegram\Bot\Commands\Command;
+use Telegram\Bot\Exceptions\TelegramSDKException;
 use function array_splice;
 use function explode;
 use function trim;
@@ -28,6 +29,9 @@ final class UnbindCommand extends Command
      */
     protected string $description = '[私聊]     解除账户绑定.';
 
+    /**
+     * @throws TelegramSDKException
+     */
     public function handle(): void
     {
         $update = $this->getUpdate();
@@ -61,8 +65,19 @@ final class UnbindCommand extends Command
             $text = '';
 
             if ($message_key === $user->email) {
-                $temp = $user->unbindIM();
-                $text = $temp['msg'];
+                if ($user->unbindIM()) {
+                    $text = '账户解绑成功。';
+                    if (Config::obtain('telegram_unbind_kick_member')) {
+                        $this->telegram->banChatMember(
+                            [
+                                'chat_id' => Config::obtain('telegram_chatid'),
+                                'user_id' => $send_user['id'],
+                            ]
+                        );
+                    }
+                } else {
+                    $text = '账户解绑失败。';
+                }
                 // 回送信息
                 $this->replyWithMessage(
                     [
@@ -70,6 +85,7 @@ final class UnbindCommand extends Command
                         'parse_mode' => 'Markdown',
                     ]
                 );
+
                 return;
             }
 

src/Services/Bot/Telegram/Message.php

@@ -8,6 +8,7 @@ use App\Models\Config;
 use App\Models\User;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
 use Telegram\Bot\Api;
 use Telegram\Bot\Exceptions\TelegramSDKException;
@@ -239,8 +240,8 @@ final class Message
      * @param int $value  搜索值
      * @param string $method 查找列
      */
-    public static function getUser(int $value, string $method = 'im_value')
+    public static function getUser(int $value, string $method = 'im_value'): null|Model|User
     {
-        return User::where('im_type', 4)->where($method, $value)->first();
+        return (new User())->where('im_type', 4)->where($method, $value)->first();
     }
 }

src/Services/Cache.php

@@ -12,7 +12,7 @@ final class Cache
     /**
      * @throws RedisException
      */
-    public static function initRedis(): Redis
+    public function initRedis(): Redis
     {
         $redis = new Redis();
         $redis->connect($_ENV['redis_host'], $_ENV['redis_port']);

src/Services/Cron.php

@@ -40,7 +40,7 @@ final class Cron
 
         foreach ($users as $user) {
             $transfer_total = $user->transfer_total;
-            $transfer_total_last = UserHourlyUsage::where('user_id', $user->id)->orderBy('id', 'desc')->first();
+            $transfer_total_last = (new UserHourlyUsage())->where('user_id', $user->id)->orderBy('id', 'desc')->first();
 
             if ($transfer_total_last === null) {
                 $transfer_total_last = 0;
@@ -61,15 +61,15 @@ final class Cron
 
     public static function cleanDb(): void
     {
-        SubscribeLog::where(
+        (new SubscribeLog())->where(
             'request_time',
             '<',
             time() - 86400 * Config::obtain('subscribe_log_retention_days')
         )->delete();
-        UserHourlyUsage::where('datetime', '<', time() - 86400 * Config::obtain('traffic_log_retention_days'))->delete();
-        DetectLog::where('datetime', '<', time() - 86400 * 3)->delete();
-        EmailQueue::where('time', '<', time() - 86400)->delete();
-        OnlineLog::where('last_time', '<', time() - 86400)->delete();
+        (new UserHourlyUsage())->where('datetime', '<', time() - 86400 * Config::obtain('traffic_log_retention_days'))->delete();
+        (new DetectLog())->where('datetime', '<', time() - 86400 * 3)->delete();
+        (new EmailQueue())->where('time', '<', time() - 86400)->delete();
+        (new OnlineLog())->where('last_time', '<', time() - 86400)->delete();
 
         echo Tools::toDateTime(time()) . ' 数据库清理完成' . PHP_EOL;
     }
@@ -80,14 +80,14 @@ final class Cron
         $login_days = Config::obtain('detect_inactive_user_login_days');
         $use_days = Config::obtain('detect_inactive_user_use_days');
 
-        User::where('is_admin', 0)
+        (new User())->where('is_admin', 0)
             ->where('is_inactive', 0)
             ->where('last_check_in_time', '<', time() - 86400 * $checkin_days)
             ->where('last_login_time', '<', time() - 86400 * $login_days)
             ->where('last_use_time', '<', time() - 86400 * $use_days)
             ->update(['is_inactive' => 1]);
 
-        User::where('is_admin', 0)
+        (new User())->where('is_admin', 0)
             ->where('is_inactive', 1)
             ->where('last_check_in_time', '>', time() - 86400 * $checkin_days)
             ->where('last_login_time', '>', time() - 86400 * $login_days)
@@ -95,12 +95,12 @@ final class Cron
             ->update(['is_inactive' => 0]);
 
         echo Tools::toDateTime(time()) .
-            ' 检测到 ' . User::where('is_inactive', 1)->count() . ' 个账户处于闲置状态' . PHP_EOL;
+            ' 检测到 ' . (new User())->where('is_inactive', 1)->count() . ' 个账户处于闲置状态' . PHP_EOL;
     }
 
     public static function detectNodeOffline(): void
     {
-        $nodes = Node::where('type', 1)->get();
+        $nodes = (new Node())->where('type', 1)->get();
 
         foreach ($nodes as $node) {
             if ($node->getNodeOnlineStatus() >= 0 && $node->online === 1) {
@@ -175,7 +175,7 @@ final class Cron
 
     public static function expirePaidUserAccount(): void
     {
-        $paidUsers = User::where('class', '>', 0)->get();
+        $paidUsers = (new User())->where('class', '>', 0)->get();
 
         foreach ($paidUsers as $user) {
             if (strtotime($user->class_expire) < time()) {
@@ -258,16 +258,16 @@ final class Cron
         foreach ($users as $user) {
             $user_id = $user->id;
             // 获取用户账户等待激活的TABP订单
-            $pending_activation_orders = Order::where('user_id', $user_id)
+            $pending_activation_orders = (new Order())->where('user_id', $user_id)
                 ->where('status', 'pending_activation')
                 ->where('product_type', 'tabp')
-                ->orderBy('id', 'asc')
+                ->orderBy('id')
                 ->get();
             // 获取用户账户已激活的TABP订单，一个用户同时只能有一个已激活的TABP订单
-            $activated_order = Order::where('user_id', $user_id)
+            $activated_order = (new Order())->where('user_id', $user_id)
                 ->where('status', 'activated')
                 ->where('product_type', 'tabp')
-                ->orderBy('id', 'asc')
+                ->orderBy('id')
                 ->first();
             // 如果用户账户中没有已激活的TABP订单，且有等待激活的TABP订单，则激活最早的等待激活TABP订单
             if ($activated_order === null && count($pending_activation_orders) > 0) {
@@ -316,10 +316,10 @@ final class Cron
         foreach ($users as $user) {
             $user_id = $user->id;
             // 获取用户账户等待激活的流量包订单
-            $order = Order::where('user_id', $user_id)
+            $order = (new Order())->where('user_id', $user_id)
                 ->where('status', 'pending_activation')
                 ->where('product_type', 'bandwidth')
-                ->orderBy('id', 'asc')
+                ->orderBy('id')
                 ->first();
 
             if ($order !== null) {
@@ -348,10 +348,10 @@ final class Cron
         foreach ($users as $user) {
             $user_id = $user->id;
             // 获取用户账户等待激活的时间包订单
-            $order = Order::where('user_id', $user_id)
+            $order = (new Order())->where('user_id', $user_id)
                 ->where('status', 'pending_activation')
                 ->where('product_type', 'time')
-                ->orderBy('id', 'asc')
+                ->orderBy('id')
                 ->first();
 
             if ($order !== null) {
@@ -381,11 +381,11 @@ final class Cron
 
     public static function processPendingOrder(): void
     {
-        $pending_payment_orders = Order::where('status', 'pending_payment')->get();
+        $pending_payment_orders = (new Order())->where('status', 'pending_payment')->get();
 
         foreach ($pending_payment_orders as $order) {
             // 检查账单支付状态
-            $invoice = Invoice::where('order_id', $order->id)->first();
+            $invoice = (new Invoice())->where('order_id', $order->id)->first();
 
             if ($invoice === null) {
                 continue;
@@ -416,7 +416,7 @@ final class Cron
 
     public static function resetNodeBandwidth(): void
     {
-        Node::where('bandwidthlimit_resetday', date('d'))->update(['node_bandwidth' => 0]);
+        (new Node())->where('bandwidthlimit_resetday', date('d'))->update(['node_bandwidth' => 0]);
 
         echo Tools::toDateTime(time()) . ' 重设节点流量完成' . PHP_EOL;
     }
@@ -430,7 +430,7 @@ final class Cron
 
     public static function resetFreeUserTraffic(): void
     {
-        $freeUsers = User::where('class', 0)->where('auto_reset_day', date('d'))->get();
+        $freeUsers = (new User())->where('class', 0)->where('auto_reset_day', date('d'))->get();
 
         foreach ($freeUsers as $user) {
             try {
@@ -455,14 +455,14 @@ final class Cron
     public static function sendDailyFinanceMail(): void
     {
         $today = strtotime('00:00:00');
-        $paylists = Paylist::where('status', 1)->whereBetween('datetime', [strtotime('-1 day', $today), $today])->get();
+        $paylists = (new Paylist())->where('status', 1)->whereBetween('datetime', [strtotime('-1 day', $today), $today])->get();
         $text_html = '<table border=1><tr><td>金额</td><td>用户ID</td><td>用户名</td><td>充值时间</td>';
 
         foreach ($paylists as $paylist) {
             $text_html .= '<tr>';
             $text_html .= '<td>' . $paylist->total . '</td>';
             $text_html .= '<td>' . $paylist->userid . '</td>';
-            $text_html .= '<td>' . User::find($paylist->userid)->user_name . '</td>';
+            $text_html .= '<td>' . (new User())->find($paylist->userid)->user_name . '</td>';
             $text_html .= '<td>' . Tools::toDateTime((int) $paylist->datetime) . '</td>';
             $text_html .= '</tr>';
         }
@@ -487,7 +487,7 @@ final class Cron
     public static function sendWeeklyFinanceMail(): void
     {
         $today = strtotime('00:00:00');
-        $paylists = Paylist::where('status', 1)
+        $paylists = (new Paylist())->where('status', 1)
             ->whereBetween('datetime', [strtotime('-1 week', $today), $today])
             ->get();
 
@@ -510,7 +510,7 @@ final class Cron
     public static function sendMonthlyFinanceMail(): void
     {
         $today = strtotime('00:00:00');
-        $paylists = Paylist::where('status', 1)
+        $paylists = (new Paylist())->where('status', 1)
             ->whereBetween('datetime', [strtotime('-1 month', $today), $today])
             ->get();
 
@@ -532,7 +532,7 @@ final class Cron
 
     public static function sendPaidUserUsageLimitNotification(): void
     {
-        $paidUsers = User::where('class', '>', 0)->get();
+        $paidUsers = (new User())->where('class', '>', 0)->get();
 
         foreach ($paidUsers as $user) {
             $user_traffic_left = $user->transfer_enable - $user->u - $user->d;
@@ -577,8 +577,8 @@ final class Cron
 
     public static function sendDailyTrafficReport(): void
     {
-        $users = User::whereIn('daily_mail_enable', [1, 2])->get();
-        $ann_latest_raw = Ann::orderBy('date', 'desc')->first();
+        $users = (new User())->whereIn('daily_mail_enable', [1, 2])->get();
+        $ann_latest_raw = (new Ann())->orderBy('date', 'desc')->first();
 
         if ($ann_latest_raw === null) {
             $ann_latest = '<br><br>';
@@ -628,7 +628,7 @@ final class Cron
 
     public static function updateNodeIp(): void
     {
-        $nodes = Node::where('type', 1)->get();
+        $nodes = (new Node())->where('type', 1)->get();
 
         foreach ($nodes as $node) {
             $node->updateNodeIp();

src/Services/Detect.php

@@ -29,7 +29,7 @@ final class Detect
      */
     public static function gfw(): void
     {
-        $nodes = Node::where('type', 1)->where('node_ip', '!=', '')->where('online', 1)->get();
+        $nodes = (new Node())->where('type', 1)->where('node_ip', '!=', '')->where('online', 1)->get();
 
         foreach ($nodes as $node) {
             $api_url = str_replace(
@@ -106,7 +106,7 @@ final class Detect
 
     public static function ban(): void
     {
-        $new_logs = DetectLog::where('status', '=', 0)->orderBy('id', 'asc')->get();
+        $new_logs = (new DetectLog())->where('status', '=', 0)->orderBy('id')->get();
         $user_logs = [];
 
         foreach ($new_logs as $log) {
@@ -119,7 +119,7 @@ final class Detect
 
         foreach ($user_logs as $userid => $value) {
             // 执行封禁
-            $user = User::find($userid);
+            $user = (new User())->find($userid);
 
             if ($user === null) {
                 continue;
@@ -134,7 +134,7 @@ final class Detect
             $user->all_detect_number += $value;
             $user->save();
 
-            $last_DetectBanLog = DetectBanLog::where('user_id', $userid)->orderBy('id', 'desc')->first();
+            $last_DetectBanLog = (new DetectBanLog())->where('user_id', $userid)->orderBy('id', 'desc')->first();
             $last_all_detect_number = ((int) $last_DetectBanLog?->all_detect_number);
             $detect_number = $user->all_detect_number - $last_all_detect_number;
 
@@ -158,10 +158,10 @@ final class Detect
         echo Tools::toDateTime(time()) . ' 审计封禁检查结束' . PHP_EOL;
 
         // 审计封禁解封
-        $banned_users = User::where('is_banned', 1)->where('banned_reason', 'DetectBan')->get();
+        $banned_users = (new User())->where('is_banned', 1)->where('banned_reason', 'DetectBan')->get();
 
         foreach ($banned_users as $user) {
-            $logs = DetectBanLog::where('user_id', $user->id)->orderBy('id', 'desc')->first();
+            $logs = (new DetectBanLog())->where('user_id', $user->id)->orderBy('id', 'desc')->first();
             if ($logs !== null && ($logs->end_time + $logs->ban_time * 60) <= time()) {
                 $user->is_banned = 0;
                 $user->banned_reason = '';

src/Services/Exchange.php

@@ -16,7 +16,7 @@ final class Exchange
      * @throws GuzzleException
      * @throws RedisException
      */
-    public static function exchange(float $amount, string $from, string $to): float
+    public function exchange(float $amount, string $from, string $to): float
     {
         return round($amount * self::getExchangeRate($from, $to), 2);
     }
@@ -25,9 +25,9 @@ final class Exchange
      * @throws GuzzleException
      * @throws RedisException
      */
-    public static function getExchangeRate(string $from, string $to): float
+    public function getExchangeRate(string $from, string $to): float
     {
-        $redis = Cache::initRedis();
+        $redis = (new Cache())->initRedis();
         $rate = $redis->get('exchange_rate:' . $from . '_' . $to);
 
         if (! $rate) {

src/Services/Gateway/Base.php

@@ -46,7 +46,7 @@ abstract class Base
 
     public function getStatus(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
-        $p = Paylist::where('tradeno', $_POST['pid'])->first();
+        $p = (new Paylist())->where('tradeno', $_POST['pid'])->first();
 
         return $response->withJson([
             'ret' => 1,
@@ -58,7 +58,7 @@ abstract class Base
 
     public function postPayment($trade_no): void
     {
-        $paylist = Paylist::where('tradeno', $trade_no)->first();
+        $paylist = (new Paylist())->where('tradeno', $trade_no)->first();
 
         if ($paylist?->status === 0) {
             $paylist->datetime = time();
@@ -66,7 +66,7 @@ abstract class Base
             $paylist->save();
         }
 
-        $invoice = Invoice::where('id', $paylist?->invoice_id)->first();
+        $invoice = (new Invoice())->where('id', $paylist?->invoice_id)->first();
 
         if ($invoice?->status === 'unpaid' && (int) $invoice?->price === (int) $paylist?->total) {
             $invoice->status = 'paid_gateway';
@@ -75,7 +75,7 @@ abstract class Base
             $invoice->save();
         }
 
-        $user = User::find($paylist?->userid);
+        $user = (new User())->find($paylist?->userid);
         // 返利
         if ($user !== null && $user->ref_by > 0 && Config::obtain('invitation_mode') === 'after_paid') {
             (new Payback())->rebate($user->id, $paylist->total);
@@ -99,7 +99,7 @@ abstract class Base
 
     protected static function getActiveGateway($key): bool
     {
-        $payment_gateways = Config::where('item', 'payment_gateway')->first();
+        $payment_gateways = (new Config())->where('item', 'payment_gateway')->first();
         $active_gateways = json_decode($payment_gateways->value);
         if (in_array($key, $active_gateways)) {
             return true;

src/Services/Gateway/PayPal.php

@@ -82,7 +82,7 @@ final class PayPal extends Base
             ]);
         }
 
-        $exchange_amount = Exchange::exchange($price, 'CNY', Config::obtain('paypal_currency'));
+        $exchange_amount = (new Exchange())->exchange($price, 'CNY', Config::obtain('paypal_currency'));
 
         $order_data = [
             'intent' => 'CAPTURE',

src/Services/Gateway/StripeCard.php

@@ -68,7 +68,7 @@ final class StripeCard extends Base
         $pl->tradeno = $trade_no;
         $pl->save();
 
-        $exchange_amount = Exchange::exchange($price, 'CNY', Config::obtain('stripe_currency'));
+        $exchange_amount = (new Exchange())->exchange($price, 'CNY', Config::obtain('stripe_currency'));
 
         Stripe::setApiKey(Config::obtain('stripe_sk'));
         $session = null;

src/Services/Notification.php

@@ -10,9 +10,6 @@ use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Telegram\Bot\Exceptions\TelegramSDKException;
 
-/*
- * Notification Service
- */
 final class Notification
 {
     /**
@@ -22,7 +19,7 @@ final class Notification
      */
     public static function notifyAdmin($title = '', $msg = '', $template = 'warn.tpl'): void
     {
-        $admins = User::where('is_admin', 1)->get();
+        $admins = (new User())->where('is_admin', 1)->get();
 
         foreach ($admins as $admin) {
             if ($admin->contact_method === 1 || $admin->im_type === 0) {

src/Services/Password.php

@@ -17,7 +17,7 @@ final class Password
      */
     public static function sendResetEmail($email): void
     {
-        $redis = Cache::initRedis();
+        $redis = (new Cache())->initRedis();
         $token = Tools::genRandomChar(64);
 
         $redis->setex('password_reset:' . $token, Config::obtain('email_password_reset_ttl'), $email);

src/Services/RateLimit.php

@@ -19,7 +19,7 @@ final class RateLimit
     {
         $ip_limiter = new RedisRateLimiter(
             Rate::perMinute($_ENV['rate_limit_ip']),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {
@@ -38,7 +38,7 @@ final class RateLimit
     {
         $sub_limiter = new RedisRateLimiter(
             Rate::perMinute($_ENV['rate_limit_sub']),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {
@@ -57,7 +57,7 @@ final class RateLimit
     {
         $webapi_limiter = new RedisRateLimiter(
             Rate::perMinute($_ENV['rate_limit_webapi']),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {
@@ -76,7 +76,7 @@ final class RateLimit
     {
         $user_api_limiter = new RedisRateLimiter(
             Rate::perMinute($_ENV['rate_limit_user_api']),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {
@@ -95,7 +95,7 @@ final class RateLimit
     {
         $admin_api_limiter = new RedisRateLimiter(
             Rate::perMinute($_ENV['rate_limit_admin_api']),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {
@@ -114,7 +114,7 @@ final class RateLimit
     {
         $email_ip_limiter = new RedisRateLimiter(
             Rate::perHour(Config::obtain('email_request_ip_limit')),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {
@@ -133,7 +133,7 @@ final class RateLimit
     {
         $email_address_limiter = new RedisRateLimiter(
             Rate::perHour(Config::obtain('email_request_address_limit')),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {
@@ -152,7 +152,7 @@ final class RateLimit
     {
         $ticket_limiter = new RedisRateLimiter(
             Rate::custom(Config::obtain('ticket_limit'), 2592000),
-            Cache::initRedis()
+            (new Cache())->initRedis()
         );
 
         try {

src/Services/View.php

@@ -7,6 +7,8 @@ namespace App\Services;
 use App\Models\Config;
 use Illuminate\Database\DatabaseManager;
 use Smarty;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
 
 final class View
 {
@@ -16,16 +18,9 @@ final class View
     public static function getSmarty(): Smarty
     {
         $smarty = new Smarty(); //实例化smarty
-
         $user = Auth::getUser();
 
-        if ($user->isLogin) {
-            $theme = $user->theme;
-        } else {
-            $theme = $_ENV['theme'];
-        }
-
-        $smarty->settemplatedir(BASE_PATH . '/resources/views/' . $theme . '/'); //设置模板文件存放目录
+        $smarty->settemplatedir(BASE_PATH . '/resources/views/' . self::getTheme($user) . '/'); //设置模板文件存放目录
         $smarty->setcompiledir(BASE_PATH . '/storage/framework/smarty/compile/'); //设置生成文件存放目录
         $smarty->setcachedir(BASE_PATH . '/storage/framework/smarty/cache/'); //设置缓存文件存放目录
         // add config
@@ -36,6 +31,32 @@ final class View
         return $smarty;
     }
 
+    public static function getTwig(): Environment
+    {
+        $loader = new FilesystemLoader(BASE_PATH . '/resources/views/' . self::getTheme($user) . '/');
+
+        $twig = new Environment($loader, [
+            'cache' => BASE_PATH . '/storage/framework/twig/cache/',
+        ]);
+
+        $twig->addGlobal('config', self::getConfig());
+        $twig->addGlobal('public_setting', Config::getPublicConfig());
+        $twig->addGlobal('user', $user);
+
+        return $twig;
+    }
+
+    public static function getTheme($user): string
+    {
+        if ($user->isLogin) {
+            $theme = $user->theme;
+        } else {
+            $theme = $_ENV['theme'];
+        }
+
+        return $theme;
+    }
+
     public static function getConfig(): array
     {
         return [

src/Utils/Tools.php

@@ -206,7 +206,7 @@ final class Tools
     public static function genSubToken(): string
     {
         $token = self::genRandomChar($_ENV['sub_token_len']);
-        $is_token_used = Link::where('token', $token)->first();
+        $is_token_used = (new Link())->where('token', $token)->first();
 
         if ($is_token_used === null) {
             return $token;
@@ -252,7 +252,7 @@ final class Tools
             return 0;
         }
 
-        $det = User::pluck('port')->toArray();
+        $det = (new User())->pluck('port')->toArray();
         $port = array_diff(range(Config::obtain('min_port'), Config::obtain('max_port')), $det);
         shuffle($port);
 

tests/App/Services/MFATest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services;
 
+use Exception;
 use PHPUnit\Framework\TestCase;
 use function strlen;
 
@@ -11,6 +12,7 @@ class MFATest extends TestCase
 {
     /**
      * @covers App\Services\MFA::generateGaToken
+     * @throws Exception
      */
     public function testGenerateGaToken()
     {

tests/App/Utils/ResponseHelperTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Utils;
 
+use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 use GuzzleHttp\Psr7\HttpFactory;
 use Slim\Http\Factory\DecoratedResponseFactory;
@@ -83,6 +84,7 @@ class ResponseHelperTest extends TestCase
 
     /**
      * @covers App\Utils\ResponseHelper::successWithDataEtag
+     * @throws Exception
      */
     public function testSuccessWithDataEtag()
     {

tests/App/Utils/ToolsTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Utils;
 
+use MaxMind\Db\Reader\InvalidDatabaseException;
 use PHPUnit\Framework\TestCase;
 use function date_default_timezone_set;
 
@@ -11,6 +12,7 @@ class ToolsTest extends TestCase
 {
     /**
      * @covers App\Utils\Tools::getIpLocation
+     * @throws InvalidDatabaseException
      */
     public function testGetIpLocation()
     {