From 4fa80f9124ee986068952b89158b034d9624ae15 Mon Sep 17 00:00:00 2001
From: M1Screw <14369594+M1Screw@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:05:59 +0800
Subject: [PATCH 1/5] refactor: replace jquery ajax with htmx in /user

---
 app/routes.php                                |   2 +-
 composer.lock                                 |  93 ++--
 resources/views/tabler/user/edit.tpl          | 477 ++++--------------
 resources/views/tabler/user/footer.tpl        |  61 +--
 resources/views/tabler/user/header.tpl        |  12 +-
 resources/views/tabler/user/index.tpl         |  48 +-
 resources/views/tabler/user/invite.tpl        |  34 +-
 resources/views/tabler/user/invoice/index.tpl |   2 +-
 resources/views/tabler/user/money.tpl         |  28 +-
 resources/views/tabler/user/order/create.tpl  |   6 +-
 resources/views/tabler/user/order/index.tpl   |   2 +-
 resources/views/tabler/user/rate.tpl          |  21 +-
 resources/views/tabler/user/ticket/index.tpl  |  33 +-
 resources/views/tabler/user/ticket/view.tpl   |  33 +-
 src/Controllers/User/InfoController.php       |  10 +-
 src/Controllers/User/RateController.php       |  12 +-
 src/Controllers/UserController.php            |  44 +-
 src/Models/User.php                           |   1 +
 18 files changed, 259 insertions(+), 660 deletions(-)

diff --git a/app/routes.php b/app/routes.php
index ad12a2f2fc..bdba86889e 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -27,7 +27,7 @@
         $group->get('', App\Controllers\UserController::class . ':index');
         $group->get('/', App\Controllers\UserController::class . ':index');
         // 签到
-        $group->post('/checkin', App\Controllers\UserController::class . ':doCheckin');
+        $group->post('/checkin', App\Controllers\UserController::class . ':checkin');
         // 公告
         $group->get('/announcement', App\Controllers\UserController::class . ':announcement');
         // 文档
diff --git a/composer.lock b/composer.lock
index c4f3d113ca..f12f9d68cc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -69,16 +69,16 @@
         },
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.2",
+            "version": "v1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9"
+                "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/2f1dc7b7eda080498be96a4a6d683a41583030e9",
-                "reference": "2f1dc7b7eda080498be96a4a6d683a41583030e9",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/5545a4fa310aec39f54279fdacebcce33b3ff382",
+                "reference": "5545a4fa310aec39f54279fdacebcce33b3ff382",
                 "shasum": ""
             },
             "require": {
@@ -117,26 +117,26 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.2"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.3"
             },
-            "time": "2023-07-20T16:49:55+00:00"
+            "time": "2023-10-16T20:10:06+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.283.9",
+            "version": "3.283.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "0233b9f3f2155dac35c829ce4fc1b7cdb6ff8c0a"
+                "reference": "348b68edcc83062c329cf7540c4c92d061d27d9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0233b9f3f2155dac35c829ce4fc1b7cdb6ff8c0a",
-                "reference": "0233b9f3f2155dac35c829ce4fc1b7cdb6ff8c0a",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/348b68edcc83062c329cf7540c4c92d061d27d9c",
+                "reference": "348b68edcc83062c329cf7540c4c92d061d27d9c",
                 "shasum": ""
             },
             "require": {
-                "aws/aws-crt-php": "^1.0.4",
+                "aws/aws-crt-php": "^1.2.3",
                 "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
@@ -212,9 +212,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.9"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.11"
             },
-            "time": "2023-10-20T20:03:26+00:00"
+            "time": "2023-10-24T18:10:38+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1237,7 +1237,7 @@
         },
         {
             "name": "illuminate/collections",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
@@ -1292,7 +1292,7 @@
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -1338,7 +1338,7 @@
         },
         {
             "name": "illuminate/container",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
@@ -1389,7 +1389,7 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
@@ -1437,16 +1437,16 @@
         },
         {
             "name": "illuminate/database",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/database.git",
-                "reference": "7b82234921a80bfc7a8fe67ff3ba3043c384fc04"
+                "reference": "bfe1d2bcd955db6325709c36d098b2d9bd4d7c5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/database/zipball/7b82234921a80bfc7a8fe67ff3ba3043c384fc04",
-                "reference": "7b82234921a80bfc7a8fe67ff3ba3043c384fc04",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/bfe1d2bcd955db6325709c36d098b2d9bd4d7c5d",
+                "reference": "bfe1d2bcd955db6325709c36d098b2d9bd4d7c5d",
                 "shasum": ""
             },
             "require": {
@@ -1502,11 +1502,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-10-09T18:36:56+00:00"
+            "time": "2023-10-20T10:10:54+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -1552,7 +1552,7 @@
         },
         {
             "name": "illuminate/pagination",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/pagination.git",
@@ -1602,16 +1602,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v10.28.0",
+            "version": "v10.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "dd3b3275a9dbd30736363f232e6bc2970d7681e9"
+                "reference": "e46e5864314d59fa690637e51d6cd2113acb2e7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/dd3b3275a9dbd30736363f232e6bc2970d7681e9",
-                "reference": "dd3b3275a9dbd30736363f232e6bc2970d7681e9",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/e46e5864314d59fa690637e51d6cd2113acb2e7b",
+                "reference": "e46e5864314d59fa690637e51d6cd2113acb2e7b",
                 "shasum": ""
             },
             "require": {
@@ -1669,7 +1669,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-10-06T13:41:04+00:00"
+            "time": "2023-10-18T14:12:13+00:00"
         },
         {
             "name": "irazasyed/telegram-bot-sdk",
@@ -3241,31 +3241,26 @@
         },
         {
             "name": "php-http/promise",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-http/promise.git",
-                "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88"
+                "reference": "ef4905bfb492ff389eb7f12e26925a0f20073050"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88",
-                "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/ef4905bfb492ff389eb7f12e26925a0f20073050",
+                "reference": "ef4905bfb492ff389eb7f12e26925a0f20073050",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "friends-of-phpspec/phpspec-code-coverage": "^4.3.2",
-                "phpspec/phpspec": "^5.1.2 || ^6.2"
+                "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3",
+                "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Http\\Promise\\": "src/"
@@ -3292,9 +3287,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-http/promise/issues",
-                "source": "https://github.com/php-http/promise/tree/1.1.0"
+                "source": "https://github.com/php-http/promise/tree/1.2.0"
             },
-            "time": "2020-07-07T09:29:14+00:00"
+            "time": "2023-10-24T09:20:26+00:00"
         },
         {
             "name": "phpmailer/phpmailer",
@@ -4373,16 +4368,16 @@
         },
         {
             "name": "sentry/sentry",
-            "version": "3.21.0",
+            "version": "3.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-php.git",
-                "reference": "624aafc22b84b089ffa43b71fb01e0096505ec4f"
+                "reference": "c0e3df5a5c1d133cd9461e7672568ff07042c19d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/624aafc22b84b089ffa43b71fb01e0096505ec4f",
-                "reference": "624aafc22b84b089ffa43b71fb01e0096505ec4f",
+                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/c0e3df5a5c1d133cd9461e7672568ff07042c19d",
+                "reference": "c0e3df5a5c1d133cd9461e7672568ff07042c19d",
                 "shasum": ""
             },
             "require": {
@@ -4400,7 +4395,7 @@
                 "psr/http-factory": "^1.0",
                 "psr/http-factory-implementation": "^1.0",
                 "psr/log": "^1.0|^2.0|^3.0",
-                "symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0",
+                "symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0|^7.0",
                 "symfony/polyfill-php80": "^1.17"
             },
             "conflict": {
@@ -4457,7 +4452,7 @@
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-php/issues",
-                "source": "https://github.com/getsentry/sentry-php/tree/3.21.0"
+                "source": "https://github.com/getsentry/sentry-php/tree/3.22.0"
             },
             "funding": [
                 {
@@ -4469,7 +4464,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-07-31T15:31:24+00:00"
+            "time": "2023-10-23T20:34:53+00:00"
         },
         {
             "name": "slim/http",
diff --git a/resources/views/tabler/user/edit.tpl b/resources/views/tabler/user/edit.tpl
index f07a733635..394eb5ba73 100644
--- a/resources/views/tabler/user/edit.tpl
+++ b/resources/views/tabler/user/edit.tpl
@@ -74,13 +74,24 @@
                                                 <div class="card-footer">
                                                     <div class="d-flex">
                                                         {if $public_setting['reg_email_verify'] && $config['enable_change_email']}
-                                                            <a id="email-verify" class="btn btn-link">获取验证码</a>
-                                                            <button id="modify-email"
-                                                                    class="btn btn-primary ms-auto">修改
+                                                            <button id="email-verify" class="btn btn-link"
+                                                                    hx-post="/user/send" hx-swap="none"
+                                                                    hx-vals='js:{ email: document.getElementById("newemail").value }'>
+                                                                获取验证码
+                                                            </button>
+                                                            <button id="modify-email" class="btn btn-primary ms-auto"
+                                                                    hx-post="/user/email" hx-swap="none"
+                                                                    hx-vals='js:{
+                                                                        newemail: document.getElementById("new-email").value,
+                                                                        emailcode: document.getElementById("email-code").value
+                                                                    }'>
+                                                                修改
                                                             </button>
                                                         {elseif $config['enable_change_email']}
-                                                            <button id="modify-email"
-                                                                    class="btn btn-primary ms-auto">修改
+                                                            <button id="modify-email" class="btn btn-primary ms-auto"
+                                                                    hx-post="/user/email" hx-swap="none"
+                                                                    hx-vals='js:{ newemail: document.getElementById("new-email").value }'>
+                                                                修改
                                                             </button>
                                                         {else}
                                                             <button id="modify-email" class="btn btn-primary ms-auto"
@@ -97,13 +108,17 @@
                                                     <h3 class="card-title">用戶名</h3>
                                                     <p>当前用戶名：<code>{$user->user_name}</code></p>
                                                     <div class="mb-3">
-                                                        <input id="new-nickname" type="text" class="form-control"
+                                                        <input id="new-username" type="text" class="form-control"
                                                                placeholder="新用戶名" autocomplete="off">
                                                     </div>
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="modify-username" class="btn btn-primary ms-auto">修改</a>
+                                                        <button id="modify-username" class="btn btn-primary ms-auto"
+                                                           hx-post="/user/username" hx-swap="none"
+                                                           hx-vals='js:{ newusername: document.getElementById("new-username").value }'>
+                                                            修改
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -157,7 +172,8 @@
                                                 {if $user->im_type !== 0}
                                                     <div class="card-footer">
                                                         <div class="d-flex">
-                                                            <button id="unbind-im" class="btn btn-red ms-auto">
+                                                            <button id="unbind-im" class="btn btn-red ms-auto"
+                                                                    hx-post="/user/unbind_im" hx-swap="none">
                                                                 解绑
                                                             </button>
                                                         </div>
@@ -204,7 +220,7 @@
                                                                 </select>
                                                             </div>
                                                             <div class="mb-3">
-                                                                <input id="2fa-test-code" type="text"
+                                                                <input id="ga-test-code" type="text"
                                                                        class="form-control"
                                                                        placeholder="测试两步认证验证码">
                                                             </div>
@@ -216,9 +232,20 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="reset-2fa" class="btn btn-link">重置</a>
-                                                        <a id="test-2fa" class="btn btn-link">测试</a>
-                                                        <a id="save-2fa" class="btn btn-primary ms-auto">设置</a>
+                                                        <button id="reset-2fa" class="btn btn-link"
+                                                                hx-post="/user/ga_reset" hx-swap="none">
+                                                            重置
+                                                        </button>
+                                                        <button id="test-2fa" class="btn btn-link"
+                                                                hx-post="/user/ga_check" hx-swap="none"
+                                                                hx-vals='js:{ code: document.getElementById("ga-test-code").value }'>
+                                                            测试
+                                                        </button>
+                                                        <button id="save-2fa" class="btn btn-primary ms-auto"
+                                                                hx-post="/user/ga_set" hx-swap="none"
+                                                                hx-vals='js:{ enable: document.getElementById("ga-enable").value }'>
+                                                            设置
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -242,7 +269,7 @@
                                                     </div>
                                                     <div class="mb-3">
                                                         <form>
-                                                            <input id="again-new-password" type="password"
+                                                            <input id="repeat-new-password" type="password"
                                                                    class="form-control" placeholder="再次输入新密码"
                                                                    autocomplete="off">
                                                         </form>
@@ -250,8 +277,14 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="modify-login-passwd"
-                                                           class="btn btn-primary ms-auto">修改</a>
+                                                        <button id="modify-login-passwd" class="btn btn-primary ms-auto"
+                                                                hx-post="/user/password" hx-swap="none"
+                                                                hx-vals='js:{
+                                                                pwd: document.getElementById("new-password").value
+                                                                repwd: document.getElementById("repeat-new-password").value
+                                                                oldpwd: document.getElementById("password").value }'>
+                                                            修改
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -279,8 +312,11 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="modify-user-method"
-                                                           class="btn btn-primary ms-auto">修改</a>
+                                                        <button id="modify-user-method" class="btn btn-primary ms-auto"
+                                                                hx-post="/user/method" hx-swap="none"
+                                                                hx-vals='js:{ method: document.getElementById("user-method").value }'>
+                                                            修改
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -294,8 +330,10 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="reset-sub-url"
-                                                           class="btn btn-primary ms-auto bg-red">重置</a>
+                                                        <button id="reset-sub-url" class="btn btn-primary ms-auto bg-red"
+                                                                hx-post="/user/url_reset" hx-swap="none">
+                                                            重置
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -310,8 +348,10 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="reset-passwd"
-                                                           class="btn btn-primary ms-auto bg-red">重置</a>
+                                                        <button id="reset-passwd" class="btn btn-primary ms-auto bg-red"
+                                                                hx-post="/user/passwd_reset" hx-swap="none">
+                                                            重置
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -325,7 +365,7 @@
                                                 <div class="card-body">
                                                     <h3 class="card-title">每日流量报告</h3>
                                                     <div class="mb-3">
-                                                        <select id="daily-report" class="form-select">
+                                                        <select id="daily-mail" class="form-select">
                                                             <option value="0"
                                                                     {if $user->daily_mail_enable === 0}selected{/if}>
                                                                 不接收
@@ -343,8 +383,11 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="modify-daily-report"
-                                                           class="btn btn-primary ms-auto">修改</a>
+                                                        <button id="modify-daily-mail" class="btn btn-primary ms-auto"
+                                                                hx-post="/user/daily_mail" hx-swap="none"
+                                                                hx-vals='js:{ mail: document.getElementById("daily-mail").value }'>
+                                                            修改
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -369,8 +412,11 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="modify-contact-method"
-                                                           class="btn btn-primary ms-auto">修改</a>
+                                                        <button id="modify-contact-method" class="btn btn-primary ms-auto"
+                                                                hx-post="/user/contact_method" hx-swap="none"
+                                                                hx-vals='js:{ contact: document.getElementById("contact-method").value }'>
+                                                            修改
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -391,8 +437,11 @@
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
-                                                        <a id="modify-user-theme"
-                                                           class="btn btn-primary ms-auto">修改</a>
+                                                        <button id="modify-user-theme" class="btn btn-primary ms-auto"
+                                                                hx-post="/user/theme" hx-swap="none"
+                                                                hx-vals='js:{ theme: document.getElementById("user-theme").value }'>
+                                                            修改
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -409,11 +458,11 @@
                                                         <h3 class="card-title">删除账户数据</h3>
                                                     </div>
                                                     <div class="card-footer">
-                                                        <a href="#" class="btn btn-red" data-bs-toggle="modal"
+                                                        <button class="btn btn-red" data-bs-toggle="modal"
                                                            data-bs-target="#destroy-account">
                                                             <i class="ti ti-trash icon"></i>
                                                             确认删除
-                                                        </a>
+                                                        </button>
                                                     </div>
                                                 </div>
                                             </div>
@@ -432,7 +481,7 @@
         <div class="modal modal-blur fade" id="destroy-account" tabindex="-1" role="dialog" aria-hidden="true">
             <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
                 <div class="modal-content">
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    <button class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                     <div class="modal-status bg-danger"></div>
                     <div class="modal-body text-center py-4">
                         <i class="ti ti-alert-circle icon mb-2 text-danger icon-lg" style="font-size:3.5rem;"></i>
@@ -443,8 +492,7 @@
                         <div class="py-3">
                             <form>
                                 <input id="confirm-passwd" type="password" class="form-control"
-                                       placeholder="输入登录密码"
-                                       autocomplete="off">
+                                       placeholder="输入登录密码" autocomplete="off">
                             </form>
                         </div>
                     </div>
@@ -452,63 +500,16 @@
                         <div class="w-100">
                             <div class="row">
                                 <div class="col">
-                                    <a href="#" class="btn w-100" data-bs-dismiss="modal">
+                                    <button class="btn w-100" data-bs-dismiss="modal">
                                         取消
-                                    </a>
-                                </div>
-                                <div class="col">
-                                    <a href="#" id="confirm-destroy" class="btn btn-danger w-100"
-                                       data-bs-dismiss="modal">
-                                        确认
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="modal modal-blur fade" id="destroy-account-success" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    <div class="modal-status bg-success"></div>
-                    <div class="modal-body text-center py-4">
-                        <i class="ti ti-circle-check icon mb-2 text-green icon-lg" style="font-size:3.5rem;"></i>
-                        <h3>删除成功</h3>
-                        <p id="success-message" class="text-secondary">删除成功</p>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="w-100">
-                            <div class="row">
-                                <div class="col">
-                                    <a href="#" class="btn w-100" data-bs-dismiss="modal">
-                                        好
-                                    </a>
+                                    </button>
                                 </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="modal modal-blur fade" id="destroy-account-fail" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
-                <div class="modal-content">
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    <div class="modal-status bg-danger"></div>
-                    <div class="modal-body text-center py-4">
-                        <i class="ti ti-circle-x icon mb-2 text-danger icon-lg" style="font-size:3.5rem;"></i>
-                        <h3>删除失败</h3>
-                        <p id="error-message" class="text-secondary">删除失败</p>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="w-100">
-                            <div class="row">
                                 <div class="col">
-                                    <a href="#" class="btn btn-danger w-100" data-bs-dismiss="modal">
+                                    <button href="#" id="confirm-kill" class="btn btn-danger w-100" data-bs-dismiss="modal"
+                                            hx-post="/user/kill" hx-swap="none"
+                                            hx-vals='js:{ passwd: document.getElementById("confirm-passwd").value }'>
                                         确认
-                                    </a>
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -519,7 +520,7 @@
     {/if}
 
     <script>
-        var qrcode = new QRCode('qrcode', {
+        let qrcode = new QRCode('qrcode', {
             text: "{$gaurl}",
             width: 128,
             height: 128,
@@ -528,308 +529,6 @@
             correctLevel: QRCode.CorrectLevel.H
         });
 
-        var clipboard = new ClipboardJS('.copy');
-        clipboard.on('success', function (e) {
-            $('#success-noreload-message').text('已复制到剪切板');
-            $('#success-noreload-dialog').modal('show');
-        });
-
-        $("#modify-email").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/email",
-                dataType: "json",
-                data: {
-                    {if $public_setting['reg_email_verify']}
-                    emailcode: $('#email-code').val(),
-                    {/if}
-                    newemail: $('#new-email').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#email-verify").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/send",
-                dataType: "json",
-                data: {
-                    email: $('#new-email').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#modify-username").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/username",
-                dataType: "json",
-                data: {
-                    newusername: $('#new-nickname').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#modify-user-method").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/method",
-                dataType: "json",
-                data: {
-                    method: $('#user-method').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#reset-sub-url").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/url_reset",
-                dataType: "json",
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#reset-passwd").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/passwd_reset",
-                dataType: "json",
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#modify-login-passwd").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/password",
-                dataType: "json",
-                data: {
-                    pwd: $('#new-password').val(),
-                    repwd: $('#again-new-password').val(),
-                    oldpwd: $('#password').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#unbind-im").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/unbind_im",
-                dataType: "json",
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#reset-2fa").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/ga_reset",
-                dataType: "json",
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#test-2fa").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/ga_check",
-                dataType: "json",
-                data: {
-                    code: $('#2fa-test-code').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#save-2fa").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/ga_set",
-                dataType: "json",
-                data: {
-                    enable: $('#ga-enable').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#modify-daily-report").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/daily_mail",
-                dataType: "json",
-                data: {
-                    mail: $('#daily-report').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#modify-contact-method").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/contact_method",
-                dataType: "json",
-                data: {
-                    contact: $('#contact-method').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        $("#modify-user-theme").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/theme",
-                dataType: "json",
-                data: {
-                    theme: $('#user-theme').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                        window.setTimeout("location.reload()", {$config['jump_delay']});
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-
-        {if $config['enable_kill']}
-        $("#confirm-destroy").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/kill",
-                dataType: "json",
-                data: {
-                    passwd: $('#confirm-passwd').val(),
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#destroy-account-success').modal('show');
-                    } else {
-                        $('#error-message').text(data.msg);
-                        $('#destroy-account-fail').modal('show');
-                    }
-                }
-            })
-        });
-        {/if}
-
         {if $user->im_type === 0 && $user->im_value === ''}
         $("#imtype").on('change', function () {
             if ($(this).val() === '0') {
diff --git a/resources/views/tabler/user/footer.tpl b/resources/views/tabler/user/footer.tpl
index e042601833..c851087fd4 100644
--- a/resources/views/tabler/user/footer.tpl
+++ b/resources/views/tabler/user/footer.tpl
@@ -22,30 +22,6 @@
     </div>
 </div>
 
-<div class="modal modal-blur fade" id="success-noreload-dialog" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
-        <div class="modal-content">
-            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            <div class="modal-status bg-success"></div>
-            <div class="modal-body text-center py-4">
-                <i class="ti ti-circle-check icon mb-2 text-green icon-lg" style="font-size:3.5rem;"></i>
-                <p id="success-noreload-message" class="text-secondary">成功</p>
-            </div>
-            <div class="modal-footer">
-                <div class="w-100">
-                    <div class="row">
-                        <div class="col">
-                            <a id="success-noreload-confirm" href="" class="btn w-100" data-bs-dismiss="modal">
-                                好
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
 <div class="modal modal-blur fade" id="fail-dialog" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
         <div class="modal-content">
@@ -95,28 +71,27 @@
 </div>
 <!-- js -->
 <script>
-    $("#switch_theme_mode").click(function () {
-        $.ajax({
-            type: "POST",
-            url: "/user/switch_theme_mode",
-            dataType: "json",
-            success: function (data) {
-                if (data.ret === 1) {
-                    $('#success-message').text(data.msg);
-                    $('#success-dialog').modal('show');
-                    window.setTimeout("location.reload()", {$config['jump_delay']});
-                } else {
-                    $('#fail-message').text(data.msg);
-                    $('#fail-dialog').modal('show');
-                }
-            }
-        })
-    });
+    htmx.on("htmx:afterRequest", function(evt) {
+        if (evt.detail.xhr.getResponseHeader('HX-Refresh') === 'true' ||
+            typeof evt.detail.xhr.getResponseHeader('HX-Trigger') !== 'undefined')
+        {
+            return;
+        }
+
+        let data = JSON.parse(evt.detail.xhr.response);
+        let successDialog = new bootstrap.Modal(document.getElementById('success-dialog'));
+        let failDialog = new bootstrap.Modal(document.getElementById('fail-dialog'));
 
-    $("#success-confirm").click(function () {
-        location.reload();
+        if (data.ret === 1) {
+            document.getElementById("success-message").innerHTML = data.msg;
+            successDialog.show();
+        } else {
+            document.getElementById("fail-message").innerHTML = data.msg;
+            failDialog.show();
+        }
     });
 </script>
+
 <script src="//{$config['jsdelivr_url']}/npm/@tabler/core@latest/dist/js/tabler.min.js"></script>
 <script>console.table([['数据库查询', '执行时间'], ['{count($queryLog)} 次', '{$optTime} ms']])</script>
 
diff --git a/resources/views/tabler/user/header.tpl b/resources/views/tabler/user/header.tpl
index b5a58f5983..827a0f6694 100644
--- a/resources/views/tabler/user/header.tpl
+++ b/resources/views/tabler/user/header.tpl
@@ -14,8 +14,8 @@
     <!-- JS files -->
     <script src="/assets/js/fuck.min.js"></script>
     <script src="//{$config['jsdelivr_url']}/npm/qrcode_js@latest/qrcode.min.js"></script>
-    <script src="//{$config['jsdelivr_url']}/npm/clipboard@latest/dist/clipboard.min.js"></script>
     <script src="//{$config['jsdelivr_url']}/npm/jquery/dist/jquery.min.js"></script>
+    <script src="//{$config['jsdelivr_url']}/npm/htmx.org@latest/dist/htmx.min.js"></script>
     <style>
         .home-subtitle {
             font-size: 14px;
@@ -55,9 +55,15 @@
                     </a>
                     <div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow">
                         {if $user->is_dark_mode}
-                            <a id="switch_theme_mode" class="dropdown-item">浅色模式</a>
+                            <a id="switch-theme-mode" class="dropdown-item"
+                               hx-post="/user/switch_theme_mode" hx-swap="none">
+                                浅色模式
+                            </a>
                         {else}
-                            <a id="switch_theme_mode" class="dropdown-item">深色模式</a>
+                            <a id="switch_theme_mode" class="dropdown-item"
+                               hx-post="/user/switch_theme_mode" hx-swap="none">
+                                深色模式
+                            </a>
                         {/if}
                         <a href="/user/logout" class="dropdown-item">登出</a>
                     </div>
diff --git a/resources/views/tabler/user/index.tpl b/resources/views/tabler/user/index.tpl
index 7ef92b6190..303e008a59 100644
--- a/resources/views/tabler/user/index.tpl
+++ b/resources/views/tabler/user/index.tpl
@@ -1,5 +1,7 @@
 {include file='user/header.tpl'}
 
+<script src="//{$config['jsdelivr_url']}/npm/clipboard@latest/dist/clipboard.min.js"></script>
+
 <div class="page-wrapper">
     <div class="container-xl">
         <div class="page-header d-print-none text-white">
@@ -574,7 +576,16 @@
                                                 <div id="geetest"></div>
                                             {/if}
                                         {/if}
-                                        <button id="check-in" class="btn btn-primary ms-auto">签到</button>
+                                        <button id="check-in" class="btn btn-primary ms-auto"
+                                                hx-post="/user/checkin" hx-swap="none"
+                                                {if $public_setting['captcha_provider'] === 'turnstile'}
+                                                    hx-vals='js:{ turnstile: document.querySelector("[name=cf-turnstile-response]").value }'
+                                                {/if}
+                                                {if $public_setting['captcha_provider'] === 'geetest'}
+                                                    hx-vals='js:{ geetest: geetest_result }'
+                                                {/if}>
+                                            签到
+                                        </button>
                                     {/if}
                                 </div>
                             </div>
@@ -586,37 +597,10 @@
     </div>
 
     <script>
-        var clipboard = new ClipboardJS('.copy');
+        let clipboard = new ClipboardJS('.copy');
         clipboard.on('success', function (e) {
-            $('#success-noreload-message').text('已复制到剪切板');
-            $('#success-noreload-dialog').modal('show');
-        });
-
-        $("#check-in").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/checkin",
-                dataType: "json",
-                data: {
-                    {if $public_setting['enable_checkin_captcha'] && $user->isAbleToCheckin()}
-                    {if $public_setting['captcha_provider'] === 'turnstile'}
-                    turnstile: $('input[name=cf-turnstile-response]').val(),
-                    {/if}
-                    {if $public_setting['captcha_provider'] === 'geetest'}
-                    geetest: geetest_result,
-                    {/if}
-                    {/if}
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
+            $('#success-message').text('已复制到剪切板');
+            $('#success-dialog').modal('show');
         });
     </script>
 
@@ -627,7 +611,7 @@
     {if $public_setting['captcha_provider'] === 'geetest'}
         <script src="https://static.geetest.com/v4/gt4.js"></script>
         <script>
-            var geetest_result = '';
+            let geetest_result = '';
             initGeetest4({
                 captchaId: '{$captcha['geetest_id']}',
                 product: 'float',
diff --git a/resources/views/tabler/user/invite.tpl b/resources/views/tabler/user/invite.tpl
index 20148361a4..b3d4c72d9a 100644
--- a/resources/views/tabler/user/invite.tpl
+++ b/resources/views/tabler/user/invite.tpl
@@ -1,5 +1,7 @@
 {include file='user/header.tpl'}
 
+<script src="//{$config['jsdelivr_url']}/npm/clipboard@latest/dist/clipboard.min.js"></script>
+
 <div class="page-wrapper">
     <div class="container-xl">
         <div class="page-header d-print-none text-white">
@@ -43,9 +45,12 @@
                                 </div>
                                 <div class="card-footer">
                                     <div class="d-flex">
-                                        <a id="reset-url" class="btn text-red btn-link">重置</a>
-                                        <a data-clipboard-text="{$invite_url}"
-                                           class="copy btn btn-primary ms-auto">复制</a>
+                                        <button id="reset-url" class="btn text-red btn-link"
+                                                hx-post="/user/invite_reset" hx-swap="none">
+                                            重置
+                                        </button>
+                                        <button data-clipboard-text="{$invite_url}"
+                                           class="copy btn btn-primary ms-auto">复制</button>
                                     </div>
                                 </div>
                             </div>
@@ -88,27 +93,10 @@
     </div>
 
     <script>
-        var clipboard = new ClipboardJS('.copy');
+        let clipboard = new ClipboardJS('.copy');
         clipboard.on('success', function (e) {
-            $('#success-noreload-message').text('已复制到剪切板');
-            $('#success-noreload-dialog').modal('show');
-        });
-
-        $("#reset-url").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/invite_reset",
-                dataType: "json",
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
+            $('#success-message').text('已复制到剪切板');
+            $('#success-dialog').modal('show');
         });
     </script>
 
diff --git a/resources/views/tabler/user/invoice/index.tpl b/resources/views/tabler/user/invoice/index.tpl
index 6e3803e750..1a94c48d41 100644
--- a/resources/views/tabler/user/invoice/index.tpl
+++ b/resources/views/tabler/user/invoice/index.tpl
@@ -41,7 +41,7 @@
     </div>
 
     <script>
-        var table = $('#data_table').DataTable({
+        let table = $('#data_table').DataTable({
             ajax: {
                 url: '/user/invoice/ajax',
                 type: 'POST',
diff --git a/resources/views/tabler/user/money.tpl b/resources/views/tabler/user/money.tpl
index 5041a99c49..9d72dc7335 100644
--- a/resources/views/tabler/user/money.tpl
+++ b/resources/views/tabler/user/money.tpl
@@ -78,34 +78,14 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn me-auto" data-bs-dismiss="modal">取消</button>
-                    <button id="apply-giftcard"
-                            type="button" class="btn btn-primary" data-bs-dismiss="modal">兑换
+                    <button id="apply-giftcard" class="btn btn-primary" data-bs-dismiss="modal"
+                            hx-post="/user/giftcard" hx-swap="none"
+                            hx-vals='js:{ giftcard: document.getElementById("giftcard").value }'>
+                        兑换
                     </button>
                 </div>
             </div>
         </div>
     </div>
 
-    <script>
-        $("#apply-giftcard").click(function () {
-            $.ajax({
-                url: '/user/giftcard',
-                type: 'POST',
-                dataType: "json",
-                data: {
-                    giftcard: $('#giftcard').val(),
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-    </script>
-
 {include file='user/footer.tpl'}
diff --git a/resources/views/tabler/user/order/create.tpl b/resources/views/tabler/user/order/create.tpl
index 1d20920526..03b086db9e 100644
--- a/resources/views/tabler/user/order/create.tpl
+++ b/resources/views/tabler/user/order/create.tpl
@@ -165,11 +165,11 @@
                 },
                 success: function (data) {
                     if (data.ret === 1) {
-                        $('#success-noreload-message').text(data.msg);
-                        $('#success-noreload-dialog').modal('show');
+                        $('#success-message').text(data.msg);
+                        $('#success-dialog').modal('show');
                         setTimeout(function () {
                             $(location).attr('href', '/user/invoice/' + data.invoice_id + '/view');
-                        }, 1500);
+                        }, $config['jump_delay']);
                     } else {
                         $('#fail-message').text(data.msg);
                         $('#fail-dialog').modal('show');
diff --git a/resources/views/tabler/user/order/index.tpl b/resources/views/tabler/user/order/index.tpl
index af45782d85..e16202961b 100644
--- a/resources/views/tabler/user/order/index.tpl
+++ b/resources/views/tabler/user/order/index.tpl
@@ -41,7 +41,7 @@
     </div>
 
     <script>
-        var table = $('#data_table').DataTable({
+        let table = $('#data_table').DataTable({
             ajax: {
                 url: '/user/order/ajax',
                 type: 'POST',
diff --git a/resources/views/tabler/user/rate.tpl b/resources/views/tabler/user/rate.tpl
index 5394572d5f..e55e838b67 100644
--- a/resources/views/tabler/user/rate.tpl
+++ b/resources/views/tabler/user/rate.tpl
@@ -1,7 +1,5 @@
 {include file='user/header.tpl'}
 
-<script src="//{$config['jsdelivr_url']}/npm/htmx.org@latest/dist/htmx.min.js"></script>
-
 <div class="page-wrapper">
     <div class="container-xl">
         <div class="page-header d-print-none text-white">
@@ -32,11 +30,9 @@
                                         <div class="dropdown-menu dropdown-menu-end">
                                             {foreach $nodes as $node}
                                             <a class="dropdown-item" hx-post="/user/rate" hx-swap="none"
-                                               hx-vals='
-                                                {
-                                                   "node_id": "{$node['id']}"
-                                                }
-                                            '>{$node['name']}</a>
+                                                hx-vals='{ "node_id": "{$node['id']}" }'>
+                                                {$node['name']}
+                                            </a>
                                             {/foreach}
                                         </div>
                                     </div>
@@ -51,7 +47,7 @@
     </div>
 
     <script>
-        htmx.on("htmx:afterRequest", function(evt) {
+        document.body.addEventListener("drawChart", function(evt){
             var chart = window.ApexCharts && new ApexCharts(document.getElementById('rate-chart'), {
                 chart: {
                     type: "bar",
@@ -112,7 +108,8 @@
                     axisBorder: {
                         show: false,
                     },
-                    categories: ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23'],
+                    categories: ['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12',
+                        '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23'],
                 },
                 yaxis: {
                     title: {
@@ -128,15 +125,15 @@
                     show: false,
                 },
             });
-            document.getElementById('dropdown-toggle').innerHTML = JSON.parse(evt.detail.xhr.response).msg;
+            document.getElementById('dropdown-toggle').innerHTML = evt.detail.msg;
             chart.render();
             chart.updateOptions({
                 series: [{
                     name: "倍率",
-                    data: JSON.parse(evt.detail.xhr.response).data
+                    data: evt.detail.data
                 }],
             });
-        });
+        })
     </script>
 
     <script src="//{$config['jsdelivr_url']}/npm/@tabler/core@latest/dist/libs/apexcharts/dist/apexcharts.min.js"></script>
diff --git a/resources/views/tabler/user/ticket/index.tpl b/resources/views/tabler/user/ticket/index.tpl
index c4297d2b10..949567d5d8 100644
--- a/resources/views/tabler/user/ticket/index.tpl
+++ b/resources/views/tabler/user/ticket/index.tpl
@@ -106,36 +106,17 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn me-auto" data-bs-dismiss="modal">取消</button>
-                    <button id="create-ticket-button" type="button" class="btn btn-primary"
-                            data-bs-dismiss="modal">创建
+                    <button id="create-ticket-button" class="btn btn-primary" data-bs-dismiss="modal"
+                            hx-post="/user/ticket" hx-swap="none"
+                            hx-vals='js:{
+                            title: document.getElementById("ticket-title").value
+                            comment: document.getElementById("ticket-comment").value
+                            type: document.getElementById("ticket-type").value }'>
+                        创建
                     </button>
                 </div>
             </div>
         </div>
     </div>
 
-    <script>
-        $("#create-ticket-button").click(function () {
-            $.ajax({
-                type: "POST",
-                url: "/user/ticket",
-                dataType: "json",
-                data: {
-                    title: $('#ticket-title').val(),
-                    comment: $('#ticket-comment').val(),
-                    type: $('#ticket-type').val(),
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-    </script>
-
 {include file='user/footer.tpl'}
diff --git a/resources/views/tabler/user/ticket/view.tpl b/resources/views/tabler/user/ticket/view.tpl
index b2a9a5d016..293a676578 100644
--- a/resources/views/tabler/user/ticket/view.tpl
+++ b/resources/views/tabler/user/ticket/view.tpl
@@ -107,42 +107,23 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">添加回复</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    <button class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">
                     <div class="mb-3">
-                        <textarea id="reply-comment" class="form-control" rows="10"
-                                  placeholder="请输入回复内容"></textarea>
+                        <textarea id="reply-comment" class="form-control" rows="15" placeholder="请输入回复内容"></textarea>
                     </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn me-auto" data-bs-dismiss="modal">取消</button>
-                    <button id="reply" type="button" class="btn btn-primary" data-bs-dismiss="modal">回复</button>
+                    <button id="reply" class="btn btn-primary" data-bs-dismiss="modal"
+                            hx-put="/user/ticket/{$ticket->id}" hx-swap="none"
+                            hx-vals='js:{ comment: document.getElementById("reply-comment").value }'>
+                        回复
+                    </button>
                 </div>
             </div>
         </div>
     </div>
 
-    <script>
-        $("#reply").click(function () {
-            $.ajax({
-                url: "/user/ticket/{$ticket->id}",
-                type: 'PUT',
-                dataType: "json",
-                data: {
-                    comment: $('#reply-comment').val()
-                },
-                success: function (data) {
-                    if (data.ret === 1) {
-                        $('#success-message').text(data.msg);
-                        $('#success-dialog').modal('show');
-                    } else {
-                        $('#fail-message').text(data.msg);
-                        $('#fail-dialog').modal('show');
-                    }
-                }
-            })
-        });
-    </script>
-
     {include file='user/footer.tpl'}
diff --git a/src/Controllers/User/InfoController.php b/src/Controllers/User/InfoController.php
index 2a394eb388..fdc38b908d 100644
--- a/src/Controllers/User/InfoController.php
+++ b/src/Controllers/User/InfoController.php
@@ -284,7 +284,10 @@ public function updateTheme(ServerRequest $request, Response $response, array $a
             return ResponseHelper::error($response, '修改失败');
         }
 
-        return ResponseHelper::success($response, '修改成功');
+        return $response->withHeader('HX-Refresh', 'true')->withJson([
+            'ret' => 1,
+            'msg' => '修改成功',
+        ]);
     }
 
     public function sendToGulag(ServerRequest $request, Response $response, array $args): ResponseInterface
@@ -304,7 +307,10 @@ public function sendToGulag(ServerRequest $request, Response $response, array $a
             Auth::logout();
             $user->kill();
 
-            return ResponseHelper::success($response, '你的帐号已被送去古拉格劳动改造，再见');
+            return $response->withHeader('HX-Refresh', 'true')->withJson([
+                'ret' => 1,
+                'msg' => '你的帐号已被送去古拉格劳动改造，再见',
+            ]);
         }
 
         return ResponseHelper::error($response, '自助账号删除未启用');
diff --git a/src/Controllers/User/RateController.php b/src/Controllers/User/RateController.php
index f5fa5a02f2..52ca3dd36c 100644
--- a/src/Controllers/User/RateController.php
+++ b/src/Controllers/User/RateController.php
@@ -14,6 +14,7 @@
 use Slim\Http\ServerRequest;
 use voku\helper\AntiXSS;
 use function array_fill;
+use function json_encode;
 
 final class RateController extends BaseController
 {
@@ -74,6 +75,15 @@ public function ajax(ServerRequest $request, Response $response, array $args): R
             $rates = array_fill(0, 24, $node->traffic_rate);
         }
 
-        return ResponseHelper::successWithData($response, $node->name, $rates);
+        $event = json_encode([
+            'drawChart' => [
+                'msg' => $node->name,
+                'data' => $rates,
+            ],
+        ]);
+
+        return $response->withHeader('HX-Trigger', $event)->withJson([
+            'ret' => 1,
+        ]);
     }
 }
diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php
index cfdb28b9f5..751fb17d52 100644
--- a/src/Controllers/UserController.php
+++ b/src/Controllers/UserController.php
@@ -138,14 +138,7 @@ public function invite(ServerRequest $request, Response $response, array $args):
             ->fetch('user/invite.tpl'));
     }
 
-    public function logout(ServerRequest $request, Response $response, array $args): Response
-    {
-        Auth::logout();
-
-        return $response->withStatus(302)->withHeader('Location', '/');
-    }
-
-    public function doCheckIn(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
+    public function checkin(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
         if (! $_ENV['enable_checkin']) {
             return ResponseHelper::error($response, '暂时还不能签到');
@@ -165,19 +158,27 @@ public function doCheckIn(ServerRequest $request, Response $response, array $arg
             return ResponseHelper::error($response, (string) $checkin['msg']);
         }
 
-        return $response->withJson([
+        return $response->withHeader('HX-Refresh', 'true')->withJson([
             'ret' => 1,
-            'trafficInfo' => [
-                'todayUsedTraffic' => $this->user->todayUsedTraffic(),
-                'lastUsedTraffic' => $this->user->lastUsedTraffic(),
-                'unUsedTraffic' => $this->user->unusedTraffic(),
-            ],
-            'traffic' => Tools::autoBytes($this->user->transfer_enable),
-            'unflowtraffic' => $this->user->transfer_enable,
             'msg' => $checkin['msg'],
         ]);
     }
 
+    public function switchThemeMode(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
+    {
+        $user = $this->user;
+        $user->is_dark_mode = $user->is_dark_mode === 1 ? 0 : 1;
+
+        if (! $user->save()) {
+            return ResponseHelper::error($response, '切换失败');
+        }
+
+        return $response->withHeader('HX-Refresh', 'true')->withJson([
+            'ret' => 1,
+            'msg' => '切换成功',
+        ]);
+    }
+
     /**
      * @throws Exception
      */
@@ -190,15 +191,10 @@ public function banned(ServerRequest $request, Response $response, array $args):
             ->fetch('user/banned.tpl'));
     }
 
-    public function switchThemeMode(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
+    public function logout(ServerRequest $request, Response $response, array $args): Response
     {
-        $user = $this->user;
-        $user->is_dark_mode = $user->is_dark_mode === 1 ? 0 : 1;
-
-        if (! $user->save()) {
-            return ResponseHelper::error($response, '切换失败');
-        }
+        Auth::logout();
 
-        return ResponseHelper::success($response, '切换成功');
+        return $response->withStatus(302)->withHeader('Location', '/');
     }
 }
diff --git a/src/Models/User.php b/src/Models/User.php
index b4e552bd2e..dd37531c1e 100644
--- a/src/Models/User.php
+++ b/src/Models/User.php
@@ -301,6 +301,7 @@ public function checkin(): array
             } catch (Exception $e) {
                 $traffic = 0;
             }
+
             $this->transfer_enable += Tools::toMB($traffic);
             $this->last_check_in_time = time();
             $this->save();

From b885bce9e38ed7adc9c1266cd7480b7fad1d98db Mon Sep 17 00:00:00 2001
From: M1Screw <14369594+M1Screw@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:43:42 +0800
Subject: [PATCH 2/5] feat: dynamically update page content in /user

---
 resources/views/tabler/user/edit.tpl    | 18 +++++----
 resources/views/tabler/user/footer.tpl  | 29 +++++++++++---
 resources/views/tabler/user/invite.tpl  |  2 +-
 resources/views/tabler/user/rate.tpl    |  2 +-
 src/Controllers/User/InfoController.php | 52 +++++++++++++++++++------
 src/Controllers/User/MFAController.php  |  4 ++
 6 files changed, 81 insertions(+), 26 deletions(-)

diff --git a/resources/views/tabler/user/edit.tpl b/resources/views/tabler/user/edit.tpl
index 394eb5ba73..bf28f0ef8e 100644
--- a/resources/views/tabler/user/edit.tpl
+++ b/resources/views/tabler/user/edit.tpl
@@ -58,7 +58,7 @@
                                             <div class="card">
                                                 <div class="card-body">
                                                     <h3 class="card-title">登录邮箱</h3>
-                                                    <p>当前邮箱：<code>{$user->email}</code></p>
+                                                    <p>当前邮箱：<code id="email">{$user->email}</code></p>
                                                     <div class="mb-3">
                                                         <input id="new-email" type="email" class="form-control"
                                                                placeholder="新邮箱"
@@ -106,7 +106,7 @@
                                             <div class="card">
                                                 <div class="card-body">
                                                     <h3 class="card-title">用戶名</h3>
-                                                    <p>当前用戶名：<code>{$user->user_name}</code></p>
+                                                    <p>当前用戶名：<code id="username">{$user->user_name}</code></p>
                                                     <div class="mb-3">
                                                         <input id="new-username" type="text" class="form-control"
                                                                placeholder="新用戶名" autocomplete="off">
@@ -225,7 +225,11 @@
                                                                        placeholder="测试两步认证验证码">
                                                             </div>
                                                             <div class="col-md-12">
-                                                                <p>密钥：<code>{$user->ga_token}</code></p>
+                                                                <p>密钥：
+                                                                    <code id="ga-token">
+                                                                        {$user->ga_token}
+                                                                    </code>
+                                                                </p>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -233,7 +237,7 @@
                                                 <div class="card-footer">
                                                     <div class="d-flex">
                                                         <button id="reset-2fa" class="btn btn-link"
-                                                                hx-post="/user/ga_reset" hx-swap="none">
+                                                                hx-post="/user/ga_reset" hx-swap="none" >
                                                             重置
                                                         </button>
                                                         <button id="test-2fa" class="btn btn-link"
@@ -343,8 +347,8 @@
                                                 <div class="card-body">
                                                     <h3 class="card-title">重置连接密码</h3>
                                                     <p>重置连接密码与UUID ，重置后需更新订阅，才能继续使用</p>
-                                                    <p>当前连接密码：<code>{$user->passwd}</code></p>
-                                                    <p>当前UUID：<code>{$user->uuid}</code></p>
+                                                    <p>当前连接密码：<code id="passwd">{$user->passwd}</code></p>
+                                                    <p>当前UUID：<code id="uuid">{$user->uuid}</code></p>
                                                 </div>
                                                 <div class="card-footer">
                                                     <div class="d-flex">
@@ -521,7 +525,7 @@
 
     <script>
         let qrcode = new QRCode('qrcode', {
-            text: "{$gaurl}",
+            text: "{$ga_url}",
             width: 128,
             height: 128,
             colorDark: '#000000',
diff --git a/resources/views/tabler/user/footer.tpl b/resources/views/tabler/user/footer.tpl
index c851087fd4..47d51006a2 100644
--- a/resources/views/tabler/user/footer.tpl
+++ b/resources/views/tabler/user/footer.tpl
@@ -73,23 +73,42 @@
 <script>
     htmx.on("htmx:afterRequest", function(evt) {
         if (evt.detail.xhr.getResponseHeader('HX-Refresh') === 'true' ||
-            typeof evt.detail.xhr.getResponseHeader('HX-Trigger') !== 'undefined')
+            evt.detail.xhr.getResponseHeader('HX-Trigger'))
         {
             return;
         }
 
-        let data = JSON.parse(evt.detail.xhr.response);
+        let res = JSON.parse(evt.detail.xhr.response);
+
+        if (typeof res.data !== 'undefined') {
+            for (let key in res.data) {
+                if (res.data.hasOwnProperty(key)) {
+                    if (key === "ga-url") {
+                        qrcode.clear();
+                        qrcode.makeCode(res.data[key]);
+                    }
+
+                    let element = document.getElementById(key);
+
+                    if (element) {
+                        element.innerHTML = res.data[key];
+                    }
+                }
+            }
+        }
+
         let successDialog = new bootstrap.Modal(document.getElementById('success-dialog'));
         let failDialog = new bootstrap.Modal(document.getElementById('fail-dialog'));
 
-        if (data.ret === 1) {
-            document.getElementById("success-message").innerHTML = data.msg;
+        if (res.ret === 1) {
+            document.getElementById("success-message").innerHTML = res.msg;
             successDialog.show();
         } else {
-            document.getElementById("fail-message").innerHTML = data.msg;
+            document.getElementById("fail-message").innerHTML = res.msg;
             failDialog.show();
         }
     });
+
 </script>
 
 <script src="//{$config['jsdelivr_url']}/npm/@tabler/core@latest/dist/js/tabler.min.js"></script>
diff --git a/resources/views/tabler/user/invite.tpl b/resources/views/tabler/user/invite.tpl
index b3d4c72d9a..134dc1cee4 100644
--- a/resources/views/tabler/user/invite.tpl
+++ b/resources/views/tabler/user/invite.tpl
@@ -41,7 +41,7 @@
                             <div class="card">
                                 <div class="card-body">
                                     <h3 class="card-title">邀请链接</h3>
-                                    <input class="form-control" value="{$invite_url}" disabled/>
+                                    <input class="form-control" id="invite-url" value="{$invite_url}" disabled/>
                                 </div>
                                 <div class="card-footer">
                                     <div class="d-flex">
diff --git a/resources/views/tabler/user/rate.tpl b/resources/views/tabler/user/rate.tpl
index e55e838b67..159c3f1c64 100644
--- a/resources/views/tabler/user/rate.tpl
+++ b/resources/views/tabler/user/rate.tpl
@@ -47,7 +47,7 @@
     </div>
 
     <script>
-        document.body.addEventListener("drawChart", function(evt){
+        document.body.addEventListener("drawChart", function(evt) {
             var chart = window.ApexCharts && new ApexCharts(document.getElementById('rate-chart'), {
                 chart: {
                     type: "bar",
diff --git a/src/Controllers/User/InfoController.php b/src/Controllers/User/InfoController.php
index fdc38b908d..047680897d 100644
--- a/src/Controllers/User/InfoController.php
+++ b/src/Controllers/User/InfoController.php
@@ -38,14 +38,13 @@ public function index(ServerRequest $request, Response $response, array $args):
     {
         $themes = Tools::getDir(BASE_PATH . '/resources/views');
         $methods = Config::getSupportParam('method');
-        $gaurl = MFA::getGaUrl($this->user);
+        $ga_url = MFA::getGaUrl($this->user);
 
         return $response->write($this->view()
             ->assign('user', $this->user)
             ->assign('themes', $themes)
             ->assign('methods', $methods)
-            ->assign('gaurl', $gaurl)
-            ->registerClass('Config', Config::class)
+            ->assign('ga_url', $ga_url)
             ->fetch('user/edit.tpl'));
     }
 
@@ -101,7 +100,13 @@ public function updateEmail(ServerRequest $request, Response $response, array $a
             return ResponseHelper::error($response, '修改失败');
         }
 
-        return ResponseHelper::success($response, '修改成功');
+        return $response->withJson([
+            'ret' => 1,
+            'msg' => '修改成功',
+            'data' => [
+                'email' => $user->email,
+            ],
+        ]);
     }
 
     public function updateUsername(ServerRequest $request, Response $response, array $args): ResponseInterface
@@ -120,7 +125,13 @@ public function updateUsername(ServerRequest $request, Response $response, array
             return ResponseHelper::error($response, '修改失败');
         }
 
-        return ResponseHelper::success($response, '修改成功');
+        return $response->withJson([
+            'ret' => 1,
+            'msg' => '修改成功',
+            'data' => [
+                'username' => $user->user_name,
+            ],
+        ]);
     }
 
     public function unbindIM(ServerRequest $request, Response $response, array $args): ResponseInterface
@@ -131,7 +142,10 @@ public function unbindIM(ServerRequest $request, Response $response, array $args
             return ResponseHelper::error($response, '解绑失败');
         }
 
-        return ResponseHelper::success($response, '解绑成功');
+        return $response->withHeader('HX-Refresh', 'true')->withJson([
+            'ret' => 1,
+            'msg' => '解绑成功',
+        ]);
     }
 
     public function updatePassword(ServerRequest $request, Response $response, array $args): ResponseInterface
@@ -171,14 +185,21 @@ public function updatePassword(ServerRequest $request, Response $response, array
     public function resetPasswd(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $user = $this->user;
-        $user->uuid = Uuid::uuid4();
         $user->passwd = Tools::genRandomChar(16);
+        $user->uuid = Uuid::uuid4();
 
         if (! $user->save()) {
-            return ResponseHelper::error($response, '修改失败');
+            return ResponseHelper::error($response, '重置失败');
         }
 
-        return ResponseHelper::success($response, '修改成功');
+        return $response->withJson([
+            'ret' => 1,
+            'msg' => '重置成功',
+            'data' => [
+                'passwd' => $user->passwd,
+                'uuid' => $user->uuid,
+            ],
+        ]);
     }
 
     public function resetApiToken(ServerRequest $request, Response $response, array $args): ResponseInterface
@@ -187,10 +208,10 @@ public function resetApiToken(ServerRequest $request, Response $response, array
         $user->api_token = Uuid::uuid4();
 
         if (! $user->save()) {
-            return ResponseHelper::error($response, '修改失败');
+            return ResponseHelper::error($response, '重置失败');
         }
 
-        return ResponseHelper::success($response, '修改成功');
+        return ResponseHelper::success($response, '重置成功');
     }
 
     public function updateMethod(ServerRequest $request, Response $response, array $args): ResponseInterface
@@ -228,8 +249,15 @@ public function resetInviteURL(ServerRequest $request, Response $response, array
     {
         $user = $this->user;
         $user->clearInviteCodes();
+        $code = $this->user->addInviteCode();
 
-        return ResponseHelper::success($response, '重置成功');
+        return $response->withJson([
+            'ret' => 1,
+            'msg' => '重置成功',
+            'data' => [
+                'invite-url' => $_ENV['baseUrl'] . '/auth/register?code=' . $code,
+            ],
+        ]);
     }
 
     public function updateDailyMail(ServerRequest $request, Response $response, array $args): ResponseInterface
diff --git a/src/Controllers/User/MFAController.php b/src/Controllers/User/MFAController.php
index 55f6298ac8..91b0a3f7b2 100644
--- a/src/Controllers/User/MFAController.php
+++ b/src/Controllers/User/MFAController.php
@@ -80,6 +80,10 @@ public function resetGa(ServerRequest $request, Response $response, array $args)
             return $response->withJson([
                 'ret' => 1,
                 'msg' => '重置成功',
+                'data' => [
+                    'ga-token' => $user->ga_token,
+                    'ga-url' => MFA::getGaUrl($user),
+                ],
             ]);
         }
 

From 4d86bd5f42c29843abf376a5071e3eb9a6a2553e Mon Sep 17 00:00:00 2001
From: M1Screw <14369594+M1Screw@users.noreply.github.com>
Date: Thu, 26 Oct 2023 15:39:25 +0800
Subject: [PATCH 3/5] ci: add php 8.1 & 8.3 unit test

---
 .github/workflows/unit.yaml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 7823014077..b0ba03cc24 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -8,6 +8,17 @@ on:
   workflow_dispatch:
 
 jobs:
+  unit-test-php81:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+      - run: |
+          composer install --no-interaction --no-progress --no-suggest
+          php vendor/bin/phpunit
+
   unit-test-php82:
     runs-on: ubuntu-latest
     steps:
@@ -18,3 +29,15 @@ jobs:
     - run: |
         composer install --no-interaction --no-progress --no-suggest
         php vendor/bin/phpunit
+
+  unit-test-php83:
+    if: ${{ false }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+      - run: |
+          composer install --no-interaction --no-progress --no-suggest
+          php vendor/bin/phpunit

From f5894f076eb36008c998ab3e9552fc9bb6ef072d Mon Sep 17 00:00:00 2001
From: M1Screw <14369594+M1Screw@users.noreply.github.com>
Date: Fri, 27 Oct 2023 23:45:53 +0800
Subject: [PATCH 4/5] feat: add device binding option to cookie auth

---
 README.md                                |  7 +++
 composer.lock                            | 66 ++++++++++++------------
 config/.config.example.php               | 18 ++++---
 src/Controllers/Admin/UserController.php | 13 ++++-
 src/Middleware/Auth.php                  |  4 +-
 src/Middleware/Guest.php                 |  1 +
 src/Middleware/NodeToken.php             |  2 +-
 src/Services/Auth/Cookie.php             | 40 +++++++++-----
 src/Services/Cloudflare.php              | 37 ++++---------
 src/Utils/Cookie.php                     |  2 +-
 src/Utils/Hash.php                       | 29 ++++++-----
 tests/App/Utils/HashTest.php             | 15 ++++++
 12 files changed, 137 insertions(+), 97 deletions(-)

diff --git a/README.md b/README.md
index 3171be9bf8..e92539514b 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,13 @@ SSPanel UIM 欢迎各种贡献，包括但不限于改进，新功能，文档
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/O5O850UEH)
 
+<a href="https://www.vultr.com/?ref=8941355-8H">
+<img src="https://www.vultr.com/media/logo_onwhite.png" alt="Vultr" width="200" align="left" />
+</a>    
+
+<br/>
+<br/>
+
 ## Sponsor / 赞助商
 
 [![](.github/jetbrains.png)](https://www.jetbrains.com/?from=SSPanel-UIM)
diff --git a/composer.lock b/composer.lock
index f12f9d68cc..dab4353278 100644
--- a/composer.lock
+++ b/composer.lock
@@ -123,16 +123,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.283.11",
+            "version": "3.283.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "348b68edcc83062c329cf7540c4c92d061d27d9c"
+                "reference": "853eecfb21e8d623fa1b32e597b0a75912e8a404"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/348b68edcc83062c329cf7540c4c92d061d27d9c",
-                "reference": "348b68edcc83062c329cf7540c4c92d061d27d9c",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/853eecfb21e8d623fa1b32e597b0a75912e8a404",
+                "reference": "853eecfb21e8d623fa1b32e597b0a75912e8a404",
                 "shasum": ""
             },
             "require": {
@@ -212,9 +212,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.11"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.283.13"
             },
-            "time": "2023-10-24T18:10:38+00:00"
+            "time": "2023-10-26T18:14:40+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -2012,24 +2012,24 @@
         },
         {
             "name": "mailgun/mailgun-php",
-            "version": "v3.6.0",
+            "version": "v3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mailgun/mailgun-php.git",
-                "reference": "02d8b5c7e082a64fb8e9bf9aea557501bf69fa41"
+                "reference": "c5162d1f569ade72aa9f80f10ba2b5e63ff2e221"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mailgun/mailgun-php/zipball/02d8b5c7e082a64fb8e9bf9aea557501bf69fa41",
-                "reference": "02d8b5c7e082a64fb8e9bf9aea557501bf69fa41",
+                "url": "https://api.github.com/repos/mailgun/mailgun-php/zipball/c5162d1f569ade72aa9f80f10ba2b5e63ff2e221",
+                "reference": "c5162d1f569ade72aa9f80f10ba2b5e63ff2e221",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3 || ^8.0",
                 "php-http/client-common": "^2.2.1",
-                "php-http/discovery": "^1.9.1",
+                "php-http/discovery": "^1.19",
                 "php-http/multipart-stream-builder": "^1.1.2",
-                "psr/http-client": "^1.0.1",
+                "psr/http-client": "^1.0",
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
@@ -2037,7 +2037,7 @@
                 "nyholm/psr7": "^1.3.1",
                 "phpunit/phpunit": "^9.3",
                 "squizlabs/php_codesniffer": "^3.7",
-                "symfony/http-client": "^5.3"
+                "symfony/http-client": "^5.4 || ^6.3"
             },
             "suggest": {
                 "nyholm/psr7": "PSR-7 message implementation",
@@ -2067,9 +2067,9 @@
             "description": "The Mailgun SDK provides methods for all API functions.",
             "support": {
                 "issues": "https://github.com/mailgun/mailgun-php/issues",
-                "source": "https://github.com/mailgun/mailgun-php/tree/v3.6.0"
+                "source": "https://github.com/mailgun/mailgun-php/tree/v3.6.1"
             },
-            "time": "2023-08-13T13:48:52+00:00"
+            "time": "2023-10-27T12:22:03+00:00"
         },
         {
             "name": "maxmind-db/reader",
@@ -6254,16 +6254,16 @@
         },
         {
             "name": "tronovav/geoip2-update",
-            "version": "v2.2.4",
+            "version": "v2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tronovav/geoip2-update.git",
-                "reference": "60dc374c21e97ca16cadfbb418a4bbd6045b581e"
+                "reference": "86fddebc2bd277832846c8d6bb3b059fd093db06"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tronovav/geoip2-update/zipball/60dc374c21e97ca16cadfbb418a4bbd6045b581e",
-                "reference": "60dc374c21e97ca16cadfbb418a4bbd6045b581e",
+                "url": "https://api.github.com/repos/tronovav/geoip2-update/zipball/86fddebc2bd277832846c8d6bb3b059fd093db06",
+                "reference": "86fddebc2bd277832846c8d6bb3b059fd093db06",
                 "shasum": ""
             },
             "require": {
@@ -6301,9 +6301,9 @@
             "support": {
                 "email": "newtronov@gmail.com",
                 "issues": "https://github.com/tronovav/geoip2-update/issues",
-                "source": "https://github.com/tronovav/geoip2-update/tree/v2.2.4"
+                "source": "https://github.com/tronovav/geoip2-update/tree/v2.3.1"
             },
-            "time": "2023-09-21T16:52:07+00:00"
+            "time": "2023-10-25T22:16:50+00:00"
         },
         {
             "name": "vectorface/googleauthenticator",
@@ -7045,16 +7045,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.35.1",
+            "version": "v3.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "ec1ccc264994b6764882669973ca435cf05bab08"
+                "reference": "e889301f276c6ce2c391d6aafae9a162e785b064"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ec1ccc264994b6764882669973ca435cf05bab08",
-                "reference": "ec1ccc264994b6764882669973ca435cf05bab08",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e889301f276c6ce2c391d6aafae9a162e785b064",
+                "reference": "e889301f276c6ce2c391d6aafae9a162e785b064",
                 "shasum": ""
             },
             "require": {
@@ -7126,7 +7126,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.35.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.36.0"
             },
             "funding": [
                 {
@@ -7134,7 +7134,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-10-12T13:47:26+00:00"
+            "time": "2023-10-27T10:12:29+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -8047,16 +8047,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.4.1",
+            "version": "10.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "62bd7af13d282deeb95650077d28ba3600ca321c"
+                "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/62bd7af13d282deeb95650077d28ba3600ca321c",
-                "reference": "62bd7af13d282deeb95650077d28ba3600ca321c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/cacd8b9dd224efa8eb28beb69004126c7ca1a1a1",
+                "reference": "cacd8b9dd224efa8eb28beb69004126c7ca1a1a1",
                 "shasum": ""
             },
             "require": {
@@ -8128,7 +8128,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.4.1"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.4.2"
             },
             "funding": [
                 {
@@ -8144,7 +8144,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-08T05:01:11+00:00"
+            "time": "2023-10-26T07:21:45+00:00"
         },
         {
             "name": "psr/cache",
diff --git a/config/.config.example.php b/config/.config.example.php
index 097b374764..88d1b87ea1 100644
--- a/config/.config.example.php
+++ b/config/.config.example.php
@@ -11,7 +11,7 @@
 
 // WebAPI
 $_ENV['webAPI']      = true;               //是否开启WebAPI功能
-$_ENV['webAPIUrl']   = $_ENV['baseUrl'];   //WebAPI地址，如需和站点名称相同，请不要修改
+$_ENV['webAPIUrl']   = $_ENV['baseUrl'];   //WebAPI地址，如需和站点地址相同，请不要修改
 $_ENV['muKey']       = 'ChangeMe';         //WebAPI密钥，用于节点服务端与面板通信，请务必修改此key为随机字符串
 $_ENV['checkNodeIp'] = true;               //是否webapi验证节点ip
 
@@ -85,13 +85,15 @@
 #离线检测
 $_ENV['enable_detect_offline']  = true;
 
-$_ENV['enable_login_bind_ip']   = false;            //是否将登陆线程和IP绑定
-$_ENV['rememberMeDuration']     = 7;                //登录时记住账号时长天数
-$_ENV['timeZone']               = 'Asia/Taipei';    //需使用 PHP 兼容的时区格式
-$_ENV['theme']                  = 'tabler';         //默认主题
-$_ENV['locale']                 = 'zh-TW';          //默认语言
-$_ENV['jump_delay']             = 1200;             //跳转延时，单位ms
-$_ENV['keep_connect']           = false;            // 流量耗尽用户限速至 1Mbps
+//高级设置-----------------------------------------------------------------------------------------------
+$_ENV['enable_login_bind_ip']     = true;             //是否将登陆线程和IP绑定
+$_ENV['enable_login_bind_device'] = true;             //是否将登陆线程和设备绑定
+$_ENV['rememberMeDuration']       = 7;                //登录时记住账号时长天数
+$_ENV['timeZone']                 = 'Asia/Taipei';    //需使用 PHP 兼容的时区格式
+$_ENV['theme']                    = 'tabler';         //默认主题
+$_ENV['locale']                   = 'zh-TW';          //默认语言
+$_ENV['jump_delay']               = 1200;             //跳转延时，单位ms
+$_ENV['keep_connect']             = false;            // 流量耗尽用户限速至 1Mbps
 
 // cdn.jsdelivr.net / fastly.jsdelivr.net / gcore.jsdelivr.net / testingcf.jsdelivr.net
 $_ENV['jsdelivr_url'] = 'fastly.jsdelivr.net';
diff --git a/src/Controllers/Admin/UserController.php b/src/Controllers/Admin/UserController.php
index e7babd1e2a..3990cdc401 100644
--- a/src/Controllers/Admin/UserController.php
+++ b/src/Controllers/Admin/UserController.php
@@ -11,9 +11,12 @@
 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;
 
@@ -105,7 +108,15 @@ public function index(ServerRequest $request, Response $response, array $args):
     }
 
     /**
-     * @throws Exception
+     * @param ServerRequest $request
+     * @param Response $response
+     * @param array $args
+     *
+     * @return Response|ResponseInterface
+     *
+     * @throws GuzzleException
+     * @throws ClientExceptionInterface
+     * @throws TelegramSDKException
      */
     public function createNewUser(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
     {
diff --git a/src/Middleware/Auth.php b/src/Middleware/Auth.php
index 942dba8e3a..8dc051b36c 100644
--- a/src/Middleware/Auth.php
+++ b/src/Middleware/Auth.php
@@ -13,6 +13,7 @@
 use Slim\Factory\AppFactory;
 use function in_array;
 use function str_contains;
+use function time;
 
 final class Auth implements MiddlewareInterface
 {
@@ -25,12 +26,13 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             if (str_contains($path, '/user/order/create')) {
                 Cookie::set(['redir' => $path . '?' . $request->getUri()->getQuery()], time() + 3600);
             }
+
             return AppFactory::determineResponseFactory()->createResponse(302)->withHeader('Location', '/auth/login');
         }
 
         $enablePages = ['/user/banned', '/user/logout'];
 
-        if ($user->is_banned === 1 && ! in_array($path, $enablePages)) {
+        if ($user->is_banned && ! in_array($path, $enablePages)) {
             return AppFactory::determineResponseFactory()->createResponse(302)->withHeader('Location', '/user/banned');
         }
 
diff --git a/src/Middleware/Guest.php b/src/Middleware/Guest.php
index efed5d9e5e..ed36e81121 100644
--- a/src/Middleware/Guest.php
+++ b/src/Middleware/Guest.php
@@ -19,6 +19,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         if ($user->isLogin) {
             $response = AppFactory::determineResponseFactory()->createResponse(302);
+
             return $response->withHeader('Location', '/user');
         }
 
diff --git a/src/Middleware/NodeToken.php b/src/Middleware/NodeToken.php
index d4df894e97..cb53639636 100644
--- a/src/Middleware/NodeToken.php
+++ b/src/Middleware/NodeToken.php
@@ -34,7 +34,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         if ($_ENV['enable_rate_limit'] &&
             (! RateLimit::checkIPLimit($request->getServerParam('REMOTE_ADDR')) ||
-            ! RateLimit::checkWebAPILimit($antiXss->xss_clean($key)))
+                ! RateLimit::checkWebAPILimit($antiXss->xss_clean($key)))
         ) {
             return AppFactory::determineResponseFactory()->createResponse(401)->withJson([
                 'ret' => 0,
diff --git a/src/Services/Auth/Cookie.php b/src/Services/Auth/Cookie.php
index 848f35cff7..735a6ce7fd 100644
--- a/src/Services/Auth/Cookie.php
+++ b/src/Services/Auth/Cookie.php
@@ -8,7 +8,6 @@
 use App\Models\User;
 use App\Utils\Cookie as CookieUtils;
 use App\Utils\Hash;
-use function strval;
 use function time;
 
 final class Cookie extends Base
@@ -18,13 +17,14 @@ public function login($uid, $time): void
         $user = User::find($uid);
         $expire_in = $time + time();
 
-        CookieUtils::set([
-            'uid' => strval($uid),
+        CookieUtils::setWithDomain([
+            'uid' => (string) $uid,
             'email' => $user->email,
             'key' => Hash::cookieHash($user->pass, $expire_in),
             'ip' => Hash::ipHash($_SERVER['REMOTE_ADDR'], $uid, $expire_in),
-            'expire_in' => strval($expire_in),
-        ], $expire_in);
+            'device' => Hash::deviceHash($_SERVER['HTTP_USER_AGENT'], $uid, $expire_in),
+            'expire_in' => (string) $expire_in,
+        ], $expire_in, $_SERVER['HTTP_HOST']);
     }
 
     public function getUser(): User
@@ -33,12 +33,19 @@ public function getUser(): User
         $email = CookieUtils::get('email');
         $key = CookieUtils::get('key');
         $ipHash = CookieUtils::get('ip');
+        $deviceHash = CookieUtils::get('device');
         $expire_in = CookieUtils::get('expire_in');
 
         $user = new User();
         $user->isLogin = false;
 
-        if ($uid === null) {
+        if ($uid === null ||
+            $email === null ||
+            $key === null ||
+            $ipHash === null ||
+            $deviceHash === null ||
+            $expire_in === null
+        ) {
             return $user;
         }
 
@@ -47,9 +54,18 @@ public function getUser(): User
         }
 
         if ($_ENV['enable_login_bind_ip']) {
-            $nodes = Node::where('node_ip', $_SERVER['REMOTE_ADDR'])->first();
+            $remote_ip = $_SERVER['REMOTE_ADDR'];
+            $node = Node::where('node_ip', $remote_ip)->first();
 
-            if (($nodes === null) && $ipHash !== Hash::ipHash($_SERVER['REMOTE_ADDR'], $uid, $expire_in)) {
+            if ($node === null && $ipHash !== Hash::ipHash($remote_ip, $uid, $expire_in)) {
+                return $user;
+            }
+        }
+
+        if ($_ENV['enable_login_bind_device']) {
+            $ua = $_SERVER['HTTP_USER_AGENT'];
+
+            if ($deviceHash !== Hash::deviceHash($ua, $uid, $expire_in)) {
                 return $user;
             }
         }
@@ -65,6 +81,7 @@ public function getUser(): User
         if ($user->email !== $email) {
             $user = new User();
             $user->isLogin = false;
+            return $user;
         }
 
         if (Hash::cookieHash($user->pass, $expire_in) !== $key) {
@@ -80,14 +97,13 @@ public function getUser(): User
 
     public function logout(): void
     {
-        $time = time() - 1000;
-
-        CookieUtils::set([
+        CookieUtils::setWithDomain([
             'uid' => '',
             'email' => '',
             'key' => '',
             'ip' => '',
+            'device' => '',
             'expire_in' => '',
-        ], $time);
+        ], 0, $_SERVER['HTTP_HOST']);
     }
 }
diff --git a/src/Services/Cloudflare.php b/src/Services/Cloudflare.php
index 73d59e2f92..8c3b454987 100644
--- a/src/Services/Cloudflare.php
+++ b/src/Services/Cloudflare.php
@@ -15,23 +15,6 @@
 
 final class Cloudflare
 {
-    public static function modifyRecord(DNS $dns, $zoneID, $recordID, $name, $content, $proxied = false): int
-    {
-        $details = ['type' => 'A', 'name' => $name, 'content' => $content, 'proxied' => $proxied];
-        if ($dns->updateRecordDetails($zoneID, $recordID, $details)->success) {
-            return 1;
-        }
-        return 0;
-    }
-
-    public static function addRecord(DNS $dns, $zoneID, $type, $name, $content, $ttl = 120, $proxied = false): int
-    {
-        if ($dns->addRecord($zoneID, $type, $name, $content, $ttl, $proxied)) {
-            return 1;
-        }
-        return 0;
-    }
-
     /**
      * @throws EndpointException
      */
@@ -40,22 +23,20 @@ public static function updateRecord($name, $content, $proxied = false): void
         $key = new APIKey($_ENV['cloudflare_email'], $_ENV['cloudflare_key']);
         $adapter = new Guzzle($key);
         $zones = new Zones($adapter);
-        $zoneID = null;
-
-        $zoneID = $zones->getZoneID($_ENV['cloudflare_name']);
-
         $dns = new DNS($adapter);
 
+        $zoneID = $zones->getZoneID($_ENV['cloudflare_name']);
         $r = $dns->listRecords($zoneID, '', $name);
         $recordCount = $r->result_info->count;
         $records = $r->result;
 
         if ($recordCount === 0) {
-            self::addRecord($dns, $zoneID, 'A', $name, $content);
+            $dns->addRecord($zoneID, $type, $name, $content, $ttl, $proxied);
         } elseif ($recordCount >= 1) {
             foreach ($records as $record) {
                 $recordID = $record->id;
-                self::modifyRecord($dns, $zoneID, $recordID, $name, $content, $proxied);
+                $details = ['type' => 'A', 'name' => $name, 'content' => $content, 'proxied' => $proxied];
+                $dns->updateRecordDetails($zoneID, $recordID, $details);
             }
         }
     }
@@ -76,10 +57,10 @@ public static function initR2(): S3Client
 
     public static function uploadR2($name, $file): void
     {
-        $s3 = self::initR2();
+        $r2 = self::initR2();
 
         try {
-            $s3->upload(
+            $r2->upload(
                 $_ENV['r2_bucket_name'],
                 $name,
                 $file,
@@ -91,14 +72,14 @@ public static function uploadR2($name, $file): void
 
     public static function genR2PresignedUrl($fileName): string
     {
-        $s3 = self::initR2();
+        $r2 = self::initR2();
 
-        $cmd = $s3->getCommand('GetObject', [
+        $cmd = $r2->getCommand('GetObject', [
             'Bucket' => $_ENV['r2_bucket_name'],
             'Key' => $fileName,
         ]);
 
-        return (string) $s3->createPresignedRequest(
+        return (string) $r2->createPresignedRequest(
             $cmd,
             '+' . $_ENV['r2_client_download_timeout'] . ' minutes'
         )->getUri();
diff --git a/src/Utils/Cookie.php b/src/Utils/Cookie.php
index 39ea1f649a..b7aff676f3 100644
--- a/src/Utils/Cookie.php
+++ b/src/Utils/Cookie.php
@@ -13,7 +13,7 @@ public static function set($arg, $time): void
         }
     }
 
-    public static function setwithdomain($arg, $time, $domain): void
+    public static function setWithDomain($arg, $time, $domain): void
     {
         foreach ($arg as $key => $value) {
             setcookie((string) $key, (string) $value, (int) $time, '/', (string) $domain, true, true);
diff --git a/src/Utils/Hash.php b/src/Utils/Hash.php
index f69e35a3fe..4bf875c43d 100644
--- a/src/Utils/Hash.php
+++ b/src/Utils/Hash.php
@@ -6,18 +6,29 @@
 
 use function hash;
 use function in_array;
+use function md5;
 use function password_hash;
+use function password_verify;
+use function substr;
+use const PASSWORD_ARGON2I;
+use const PASSWORD_ARGON2ID;
+use const PASSWORD_BCRYPT;
 
 final class Hash
 {
-    public static function cookieHash($passHash, $expire_in): string
+    public static function cookieHash($pass, $expire_in): string
     {
-        return substr(hash('sha256', $passHash . $_ENV['key'] . $expire_in), 5, 45);
+        return substr(hash('sha3-256', $pass . $_ENV['key'] . $expire_in), 5, 45);
     }
 
     public static function ipHash($ip, $uid, $expire_in): string
     {
-        return substr(hash('sha256', $ip . $_ENV['key'] . $uid . $expire_in), 5, 45);
+        return substr(hash('sha3-256', $ip . $_ENV['key'] . $uid . $expire_in), 5, 45);
+    }
+
+    public static function deviceHash($ua, $uid, $expire_in): string
+    {
+        return substr(hash('sha3-256', $ua . $_ENV['key'] . $uid . $expire_in), 5, 45);
     }
 
     public static function checkPassword($hashedPassword, $password): bool
@@ -45,22 +56,16 @@ public static function passwordHash($pass): string
 
     public static function md5WithSalt($pwd): string
     {
-        $salt = $_ENV['salt'];
-
-        return md5($pwd . $salt);
+        return md5($pwd . $_ENV['salt']);
     }
 
     public static function sha256WithSalt($pwd): string
     {
-        $salt = $_ENV['salt'];
-
-        return hash('sha256', $pwd . $salt);
+        return hash('sha256', $pwd . $_ENV['salt']);
     }
 
     public static function sha3WithSalt($pwd): string
     {
-        $salt = $_ENV['salt'];
-
-        return hash('sha3-256', $pwd . $salt);
+        return hash('sha3-256', $pwd . $_ENV['salt']);
     }
 }
diff --git a/tests/App/Utils/HashTest.php b/tests/App/Utils/HashTest.php
index 4f39ed6dc6..11d93cad1b 100644
--- a/tests/App/Utils/HashTest.php
+++ b/tests/App/Utils/HashTest.php
@@ -5,6 +5,7 @@
 namespace App\Utils;
 
 use PHPUnit\Framework\TestCase;
+use function strlen;
 
 class HashTest extends TestCase
 {
@@ -35,6 +36,20 @@ public function testIpHash()
         $this->assertEquals(45, strlen($result));
     }
 
+    /**
+     * @covers App\Utils\Hash::deviceHash
+     */
+    public function testDeviceHash()
+    {
+        $_ENV['key'] = 'cookie_key';
+        $device = 'Firefox/119.0';
+        $uid = 'user_id';
+        $expire_in = '1 hour';
+        $result = Hash::deviceHash($device, $uid, $expire_in);
+        $this->assertIsString($result);
+        $this->assertEquals(45, strlen($result));
+    }
+
     /**
      * @covers App\Utils\Hash::checkPassword
      * @covers App\Utils\Hash::passwordHash

From 87e6ee49684140422df0b786a5f21af04fb09de7 Mon Sep 17 00:00:00 2001
From: M1Screw <14369594+M1Screw@users.noreply.github.com>
Date: Fri, 27 Oct 2023 23:46:38 +0800
Subject: [PATCH 5/5] test: mfa & dynamic rate unit test

---
 tests/App/Services/DynamicRateTest.php | 117 +++++++++++++++++++++++++
 tests/App/Services/MFATest.php         |  46 ++++++++++
 tests/App/Utils/ToolsTest.php          |  20 ++++-
 3 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 tests/App/Services/DynamicRateTest.php
 create mode 100644 tests/App/Services/MFATest.php

diff --git a/tests/App/Services/DynamicRateTest.php b/tests/App/Services/DynamicRateTest.php
new file mode 100644
index 0000000000..2d12310b4a
--- /dev/null
+++ b/tests/App/Services/DynamicRateTest.php
@@ -0,0 +1,117 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services;
+
+use PHPUnit\Framework\TestCase;
+
+class DynamicRateTest extends TestCase
+{
+    /**
+     * @covers App\Services\DynamicRate::getFullDayRates
+     */
+    public function testGetFullDayRates(): void
+    {
+        $max_rate = 3;
+        $max_rate_time = 22;
+        $min_rate = 0.5;
+        $min_rate_time = 3;
+        $method = 'logistic';
+
+        $expected_rates = [
+            2.14, 1.36, 0.81, 0.5, 0.51, 0.51, 0.53, 0.55, 0.6, 0.7, 0.87, 1.15,
+            1.53, 1.97, 2.35, 2.63, 2.8, 2.9, 2.95, 2.97, 2.99, 2.99, 3.0, 2.69,
+        ];
+
+        $rates = DynamicRate::getFullDayRates($max_rate, $max_rate_time, $min_rate, $min_rate_time, $method);
+
+        $this->assertSame($expected_rates, $rates);
+    }
+
+    /**
+     * @covers App\Services\DynamicRate::getRateByTime
+     */
+    public function testGetRateByTime(): void
+    {
+        $max_rate = 3;
+        $max_rate_time = 22;
+        $min_rate = 0.5;
+        $min_rate_time = 3;
+        $method = 'logistic';
+
+        $expected_rate = 2.69;
+
+        $rate = DynamicRate::getRateByTime($max_rate, $max_rate_time, $min_rate, $min_rate_time, -1, $method);
+
+        $this->assertSame($expected_rate, $rate);
+    }
+
+    /**
+     * @covers App\Services\DynamicRate::validateData
+     */
+    public function testValidateData(): void
+    {
+        $max_rate = 3;
+        $max_rate_time = 22;
+        $min_rate = 0.5;
+        $min_rate_time = 3;
+
+        $this->assertTrue(DynamicRate::validateData($max_rate, $max_rate_time, $min_rate, $min_rate_time));
+
+        $max_rate = -1;
+
+        $this->assertFalse(DynamicRate::validateData($max_rate, $max_rate_time, $min_rate, $min_rate_time));
+
+        $max_rate = 3;
+        $max_rate_time = 25;
+
+        $this->assertFalse(DynamicRate::validateData($max_rate, $max_rate_time, $min_rate, $min_rate_time));
+
+        $max_rate_time = 22;
+        $min_rate = -1;
+
+        $this->assertFalse(DynamicRate::validateData($max_rate, $max_rate_time, $min_rate, $min_rate_time));
+
+        $min_rate = 0.5;
+        $min_rate_time = -1;
+
+        $this->assertFalse(DynamicRate::validateData($max_rate, $max_rate_time, $min_rate, $min_rate_time));
+    }
+
+    /**
+     * @covers App\Services\DynamicRate::logistic
+     */
+    public function testLogistic(): void
+    {
+        $max_rate = 3;
+        $max_rate_time = 22;
+        $min_rate = 0.5;
+        $min_rate_time = 3;
+        $time = 6;
+
+        $expected_rate = 0.53;
+
+        $rate = DynamicRate::logistic($max_rate, $max_rate_time, $min_rate, $min_rate_time, $time);
+
+        $this->assertSame($expected_rate, $rate);
+    }
+
+    /**
+     * @covers App\Services\DynamicRate::linear
+     */
+    public function testLinear(): void
+    {
+        $max_rate = 3;
+        $max_rate_time = 22;
+        $min_rate = 0.5;
+        $min_rate_time = 3;
+        $time = 6;
+
+        $expected_rate = 0.89;
+
+        $rate = DynamicRate::linear($max_rate, $max_rate_time, $min_rate, $min_rate_time, $time);
+
+        $this->assertSame($expected_rate, $rate);
+    }
+}
diff --git a/tests/App/Services/MFATest.php b/tests/App/Services/MFATest.php
new file mode 100644
index 0000000000..e3649ca339
--- /dev/null
+++ b/tests/App/Services/MFATest.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Services;
+
+use PHPUnit\Framework\TestCase;
+use function strlen;
+
+class MFATest extends TestCase
+{
+    /**
+     * @covers App\Services\MFA::generateGaToken
+     */
+    public function testGenerateGaToken()
+    {
+        $token = MFA::generateGaToken();
+        $this->assertIsString($token);
+        $this->assertGreaterThan(0, strlen($token));
+        $this->assertEquals(16, strlen($token));
+    }
+
+    /**
+     * @covers App\Services\MFA::verifyGa
+     */
+    public function testVerifyGa()
+    {
+        $user = (object) ['ga_token' => 'SECRET'];
+        $this->assertFalse(MFA::verifyGa($user, '000000'));
+        $this->assertFalse(MFA::verifyGa($user, 'test'));
+        $this->assertFalse(MFA::verifyGa($user, '0'));
+    }
+
+    /**
+     * @covers App\Services\MFA::getGaUrl
+     */
+    public function testGetGaUrl()
+    {
+        $_ENV['appName'] = 'Test';
+        $user = (object) ['email' => 'test@example.com', 'ga_token' => 'SECRET'];
+        $url = MFA::getGaUrl($user);
+        $this->assertStringContainsString('otpauth://totp/', $url);
+        $this->assertStringContainsString(rawurlencode('Test' . ' (' . $user->email . ')'), $url);
+        $this->assertStringContainsString('secret=' . $user->ga_token, $url);
+    }
+}
diff --git a/tests/App/Utils/ToolsTest.php b/tests/App/Utils/ToolsTest.php
index d3b88c1a34..96d3277e5a 100644
--- a/tests/App/Utils/ToolsTest.php
+++ b/tests/App/Utils/ToolsTest.php
@@ -5,6 +5,7 @@
 namespace App\Utils;
 
 use PHPUnit\Framework\TestCase;
+use function date_default_timezone_set;
 
 class ToolsTest extends TestCase
 {
@@ -15,6 +16,7 @@ public function testGetIpLocation()
     {
         $_ENV['maxmind_license_key'] = '';
         $msg = Tools::getIpLocation('8.8.8.8');
+        $this->assertIsString($msg);
         $this->assertEquals('GeoIP2 服务未配置', $msg);
     }
 
@@ -25,6 +27,7 @@ public function testAutoBytes()
     {
         $size = 1024;
         $bytes = Tools::autoBytes($size);
+        $this->assertIsString($bytes);
         $this->assertEquals('1KB', $bytes);
     }
 
@@ -35,6 +38,7 @@ public function testAutoBytesR()
     {
         $size = '1KB';
         $bytes = Tools::autoBytesR($size);
+        $this->assertIsInt($bytes);
         $this->assertEquals(1024, $bytes);
     }
 
@@ -45,6 +49,7 @@ public function testAutoMbps()
     {
         $bandwidth = 1;
         $mbps = Tools::autoMbps($bandwidth);
+        $this->assertIsString($mbps);
         $this->assertEquals('1Mbps', $mbps);
     }
 
@@ -56,6 +61,7 @@ public function testToMB()
         $traffic = 1;
         $mb = 1048576;
         $result = Tools::toMB($traffic);
+        $this->assertIsInt($result);
         $this->assertEquals($traffic * $mb, $result);
     }
 
@@ -67,6 +73,7 @@ public function testToGB()
         $traffic = 1;
         $gb = 1048576 * 1024;
         $result = Tools::toGB($traffic);
+        $this->assertIsInt($result);
         $this->assertEquals($traffic * $gb, $result);
     }
 
@@ -78,6 +85,7 @@ public function testFlowToGB()
         $traffic = 1048576 * 1024;
         $gb = 1048576 * 1024;
         $result = Tools::flowToGB($traffic);
+        $this->assertIsFloat($result);
         $this->assertEquals($traffic / $gb, $result);
     }
 
@@ -89,6 +97,7 @@ public function testFlowToMB()
         $traffic = 1048576;
         $mb = 1048576;
         $result = Tools::flowToMB($traffic);
+        $this->assertIsFloat($result);
         $this->assertEquals($traffic / $mb, $result);
     }
 
@@ -99,6 +108,7 @@ public function testGenRandomChar()
     {
         $length = 10;
         $randomString = Tools::genRandomChar($length);
+        $this->assertIsString($randomString);
         $this->assertEquals($length, strlen($randomString));
     }
 
@@ -110,6 +120,7 @@ public function testGenSs2022UserPk()
         $passwd = 'password';
         $length = 16;
         $pk = Tools::genSs2022UserPk($passwd, $length);
+        $this->assertIsString($pk);
         $this->assertEquals('NWU4ODQ4OThkYTI4MDQ3MQ==', $pk);
     }
 
@@ -118,9 +129,12 @@ public function testGenSs2022UserPk()
      */
     public function testToDateTime()
     {
-        $time = 1630512000; // September 1, 2021 16:00:00
-        $expected = '2021-09-01 16:00:00';
-        $this->assertEquals($expected, Tools::toDateTime($time));
+        date_default_timezone_set('ROC'); // Use Asia/Shanghai or PRC will cause this test to fail
+        $time = 612907200; // 1989-06-04 04:00:00 UTC+8
+        $expected = '1989-06-04 04:00:00';
+        $result = Tools::toDateTime($time);
+        $this->assertIsString($result);
+        $this->assertEquals($expected, $result);
     }
 
     /**