chore: remove old detect tpl & change path

app/routes.php

@@ -42,8 +42,9 @@ return function (SlimApp $app): void {
 
         $this->get('/server', App\Controllers\User\ServerController::class . ':userServerPage');
 
-        $this->get('/detect', App\Controllers\User\DetectController::class . ':detectIndex');
-        $this->get('/detect/log', App\Controllers\User\DetectController::class . ':detectLog');
+        // 审计
+        $this->get('/detect', App\Controllers\User\DetectController::class . ':index');
+        $this->get('/detect/log', App\Controllers\User\DetectController::class . ':log');
 
         $this->get('/shop', App\Controllers\User\ShopController::class . ':shop');
         $this->post('/coupon_check', App\Controllers\User\ShopController::class . ':couponCheck');

resources/views/tabler/user/detect/index.tpl

@@ -1,15 +1,16 @@
 {include file='user/tabler_header.tpl'}
 
+<!-- 审计规则是用来防止DMCA和Spam，不是用来给用户建墙用的，不要以为把“违法网站”墙了，被抓了能少判哪怕一天的刑期 -->
 <div class="page-wrapper">
-    <div class="container-xl">     
+    <div class="container-xl">
         <div class="page-header d-print-none text-white">
             <div class="row align-items-center">
-                <div class="col">                   
+                <div class="col">
                     <h2 class="page-title">
                         <span class="home-title">审计规则</span>
                     </h2>
                     <div class="page-pretitle my-3">
-                        <span class="home-subtitle">当浏览的地址可以被下列规则匹配时，连接将强制中断</span>
+                        <span class="home-subtitle">目前站点中所使用的审计规则</span>
                     </div>
                 </div>
             </div>
@@ -18,26 +19,42 @@
     <div class="page-body">
         <div class="container-xl">
             <div class="row row-deck row-cards">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-body">
+                            <div class="m-0 my-2">
+                                <p>为了防止滥用与确保站点可以稳定运行，特制定了如下过滤规则，当您使用节点执行这些动作时，您的通信就会被截断。</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="col-12">
                     <div class="card">
                         <div class="table-responsive">
-                            <table id="data_table" class="table card-table table-vcenter text-nowrap datatable">
+                            <table class="table table-vcenter card-table">
                                 <thead>
                                     <tr>
-                                        <th>#</th>
-                                        <th>规则名称</th>
+                                        <th>ID</th>
+                                        <th>名称</th>
+                                        <th>描述</th>
                                         <th>正则表达式</th>
-                                        <th>匹配类型</th>
+                                        <th>类型</th>
                                     </tr>
                                 </thead>
                                 <tbody>
                                     {foreach $rules as $rule}
-                                        <tr>
-                                            <td>{$rule->id}</td>
-                                            <td>{$rule->name}</td>
-                                            <td>{$rule->regex}</td>
-                                            <td>{($rule->type == '1') ? '数据包明文匹配' : '数据包 hex 匹配'}</td>
-                                        </tr>
+                                    <tr>
+                                        <td>#{$rule->id}</td>
+                                        <td>{$rule->name}</td>
+                                        <td>{$rule->text}</td>
+                                        <td>{$rule->regex}</td>
+                                        {if $rule->type == 1}
+                                            <td>数据包明文匹配</td>
+                                        {/if}
+                                        {if $rule->type == 2}
+                                            <td>数据包 hex 匹配</td>
+                                        {/if}
+                                    </tr>
                                     {/foreach}
                                 </tbody>
                             </table>
@@ -47,42 +64,5 @@
             </div>
         </div>
     </div>
-
-    <script>
-        $('#data_table').DataTable({
-            'iDisplayLength': 25,
-            'scrollX': true,
-            'order': [
-                [0, 'desc']
-            ],
-            "dom": "<'row px-3 py-3'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" +
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row card-footer d-flex align-items-center'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
-            language: {
-                "sProcessing": "处理中...",
-                "sLengthMenu": "显示 _MENU_ 条",
-                "sZeroRecords": "没有匹配结果",
-                "sInfo": "显示第 _START_ 至 _END_ 项结果，共 _TOTAL_ 项",
-                "sInfoEmpty": "显示第 0 至 0 项结果，共 0 项",
-                "sInfoFiltered": "(由 _MAX_ 项结果过滤)",
-                "sInfoPostFix": "",
-                "sSearch": "<i class=\"ti ti-search\"></i> ",
-                "sUrl": "",
-                "sEmptyTable": "表中数据为空",
-                "sLoadingRecords": "载入中...",
-                "sInfoThousands": ",",
-                "oPaginate": {
-                    "sFirst": "首页",
-                    "sPrevious": "<i class=\"ti ti-arrow-left\"></i>",
-                    "sNext": "<i class=\"ti ti-arrow-right\"></i>",
-                    "sLast": "末页"
-                },
-                "oAria": {
-                    "sSortAscending": ": 以升序排列此列",
-                    "sSortDescending": ": 以降序排列此列"
-                }
-            }
-        });
-    </script>
-
-{include file='user/tabler_footer.tpl'}
+    
+{include file='user/tabler_footer.tpl'}

resources/views/tabler/user/detect/read.tpl

@@ -1,94 +0,0 @@
-{include file='user/tabler_header.tpl'}
-
-<div class="page-wrapper">
-    <div class="container-xl">       
-        <div class="page-header d-print-none text-white">
-            <div class="row align-items-center">
-                <div class="col">
-                    
-                    <h2 class="page-title">
-                        <span class="home-title">审计日志</span>
-                    </h2>
-                    <div class="page-pretitle my-3">
-                        <span class="home-subtitle">被审计规则匹配的近500条流量记录</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="page-body">
-        <div class="container-xl">
-            <div class="row row-deck row-cards">
-                <div class="col-12">
-                    <div class="card">
-                        <div class="table-responsive">
-                            <table id="data_table" class="table card-table table-vcenter text-nowrap datatable">
-                                <thead>
-                                    <tr>
-                                        <th>#</th>
-                                        <th>节点名称</th>
-                                        <th>规则名称</th>
-                                        <th>类型</th>
-                                        <th>时间</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {foreach $logs as $log}
-                                        {assign var="rule" value=$log->rule()}
-                                        {if $rule != null}
-                                            <tr>
-                                                <td>{$log->id}</td>
-                                                <td>{$log->Node()->name}</td>
-                                                <td>{$rule->name}</td>
-                                                <td>{($rule->type == '1') ? '数据包明文匹配' : '数据包 hex 匹配'}</td>
-                                                <td>{date('Y-m-d H:i:s',$log->datetime)}</td>
-                                            </tr>
-                                        {/if}
-                                    {/foreach}
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script>
-        $('#data_table').DataTable({
-            'iDisplayLength': 25,
-            'scrollX': true,
-            'order': [
-                [0, 'desc']
-            ],
-            "dom": "<'row px-3 py-3'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" +
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row card-footer d-flex align-items-center'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
-            language: {
-                "sProcessing": "处理中...",
-                "sLengthMenu": "显示 _MENU_ 条",
-                "sZeroRecords": "没有匹配结果",
-                "sInfo": "显示第 _START_ 至 _END_ 项结果，共 _TOTAL_ 项",
-                "sInfoEmpty": "显示第 0 至 0 项结果，共 0 项",
-                "sInfoFiltered": "(由 _MAX_ 项结果过滤)",
-                "sInfoPostFix": "",
-                "sSearch": "<i class=\"ti ti-search\"></i> ",
-                "sUrl": "",
-                "sEmptyTable": "表中数据为空",
-                "sLoadingRecords": "载入中...",
-                "sInfoThousands": ",",
-                "oPaginate": {
-                    "sFirst": "首页",
-                    "sPrevious": "<i class=\"ti ti-arrow-left\"></i>",
-                    "sNext": "<i class=\"ti ti-arrow-right\"></i>",
-                    "sLast": "末页"
-                },
-                "oAria": {
-                    "sSortAscending": ": 以升序排列此列",
-                    "sSortDescending": ": 以降序排列此列"
-                }
-            }
-        });
-    </script>
-
-{include file='user/tabler_footer.tpl'}

resources/views/tabler/user/detect_index.tpl

@@ -1,68 +0,0 @@
-{include file='user/tabler_header.tpl'}
-
-<!-- 审计规则是用来防止DMCA和Spam，不是用来给用户建墙用的，不要以为把“违法网站”墙了，被抓了能少判哪怕一天的刑期 -->
-<div class="page-wrapper">
-    <div class="container-xl">
-        <div class="page-header d-print-none text-white">
-            <div class="row align-items-center">
-                <div class="col">
-                    <h2 class="page-title">
-                        <span class="home-title">审计规则</span>
-                    </h2>
-                    <div class="page-pretitle my-3">
-                        <span class="home-subtitle">目前站点中所使用的审计规则</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="page-body">
-        <div class="container-xl">
-            <div class="row row-deck row-cards">
-                <div class="col-12">
-                    <div class="card">
-                        <div class="card-body">
-                            <div class="m-0 my-2">
-                                <p>为了防止滥用与确保站点可以稳定运行，特制定了如下过滤规则，当您使用节点执行这些动作时，您的通信就会被截断。</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12">
-                    <div class="card">
-                        <div class="table-responsive">
-                            <table class="table table-vcenter card-table">
-                                <thead>
-                                    <tr>
-                                        <th>ID</th>
-                                        <th>名称</th>
-                                        <th>描述</th>
-                                        <th>正则表达式</th>
-                                        <th>类型</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {foreach $rules as $rule}
-                                    <tr>
-                                        <td>#{$rule->id}</td>
-                                        <td>{$rule->name}</td>
-                                        <td>{$rule->text}</td>
-                                        <td>{$rule->regex}</td>
-                                        {if $rule->type == 1}
-                                            <td>数据包明文匹配</td>
-                                        {/if}
-                                        {if $rule->type == 2}
-                                            <td>数据包 hex 匹配</td>
-                                        {/if}
-                                    </tr>
-                                    {/foreach}
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    
-{include file='user/tabler_footer.tpl'}

src/Controllers/User/DetectController.php

@@ -16,7 +16,7 @@ final class DetectController extends BaseController
     /**
      * @param array     $args
      */
-    public function detectIndex(Request $request, Response $response, array $args)
+    public function index(Request $request, Response $response, array $args)
     {
         $pageNum = $request->getQueryParams()['page'] ?? 1;
         $logs = DetectRule::paginate(15, ['*'], 'page', $pageNum);
@@ -32,13 +32,13 @@ final class DetectController extends BaseController
         return $this->view()
             ->assign('rules', $logs)
             ->assign('render', $render)
-            ->display('user/detect_index.tpl');
+            ->display('user/detect/index.tpl');
     }
 
     /**
      * @param array     $args
      */
-    public function detectLog(Request $request, Response $response, array $args)
+    public function log(Request $request, Response $response, array $args)
     {
         $pageNum = $request->getQueryParams()['page'] ?? 1;
         $logs = DetectLog::orderBy('id', 'desc')->where('user_id', $this->user->id)->paginate(15, ['*'], 'page', $pageNum);
@@ -71,6 +71,6 @@ final class DetectController extends BaseController
         return $this->view()
             ->assign('logs', $logs)
             ->assign('render', $render)
-            ->display('user/detect_log.tpl');
+            ->display('user/detect/log.tpl');
     }
 }