1
0
Эх сурвалжийг харах

chore: remove dummy webapi

M1Screw 2 жил өмнө
parent
commit
4b55f471a7

+ 0 - 6
app/routes.php

@@ -270,12 +270,6 @@ return static function (Slim\App $app): void {
         // 审计 & 杂七杂八的功能
         $group->get('/func/detect_rules', App\Controllers\WebAPI\FuncController::class . ':getDetectLogs');
         $group->get('/func/ping', App\Controllers\WebAPI\FuncController::class . ':ping');
-        // Dummy API for old version
-        $group->get('/nodes', App\Controllers\WebAPI\NodeController::class . ':getAllInfo');
-        $group->post('/func/block_ip', App\Controllers\WebAPI\FuncController::class . ':addBlockIp');
-        $group->get('/func/block_ip', App\Controllers\WebAPI\FuncController::class . ':getBlockip');
-        $group->get('/func/unblock_ip', App\Controllers\WebAPI\FuncController::class . ':getUnblockip');
-        $group->post('/nodes/{id}/info', App\Controllers\WebAPI\NodeController::class . ':info');
     })->add(new NodeToken());
 
     // 传统订阅(SS/V2Ray/Trojan etc.)

+ 0 - 3
install.sh

@@ -42,9 +42,6 @@ do_install_sspanel() {
     current_dir=$(pwd)
     crontab -l > cron.tmp
     echo "*/5 * * * * /usr/bin/php $current_dir/xcat Cron" >> cron.tmp
-    echo "*/1 * * * * /usr/bin/php $current_dir/xcat Job CheckJob" >> cron.tmp
-    echo "0 */1 * * * /usr/bin/php $current_dir/xcat Job UserJob" >> cron.tmp
-    echo "0 0 * * *   /usr/bin/php -n $current_dir/xcat Job DailyJob" >> cron.tmp
     crontab cron.tmp
     rm cron.tmp
     echo "Updating File Permission..."

+ 0 - 40
src/Controllers/Admin/ApiController.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Controllers\Admin;
-
-use App\Controllers\BaseController;
-use App\Models\Node;
-use Psr\Http\Message\ResponseInterface;
-use Slim\Http\Response;
-use Slim\Http\ServerRequest;
-
-final class ApiController extends BaseController
-{
-    public function getNodeList(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        return $response->withJson([
-            'ret' => 1,
-            'nodes' => Node::all(),
-        ]);
-    }
-
-    public function getNodeInfo(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        $node = Node::find($args['id']);
-
-        return $response->withJson([
-            'ret' => 1,
-            'node' => $node,
-        ]);
-    }
-
-    public function ping(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        return $response->withJson([
-            'ret' => 1,
-            'data' => 'pong',
-        ]);
-    }
-}

+ 0 - 25
src/Controllers/WebAPI/FuncController.php

@@ -30,29 +30,4 @@ final class FuncController extends BaseController
             'data' => $rules,
         ]);
     }
-
-    // Dummy function
-    public function getBlockip(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        return ResponseHelper::etagJson($request, $response, [
-            'ret' => 1,
-            'data' => [],
-        ]);
-    }
-
-    public function getUnblockip(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        return ResponseHelper::etagJson($request, $response, [
-            'ret' => 1,
-            'data' => [],
-        ]);
-    }
-
-    public function addBlockIp(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        return $response->withJson([
-            'ret' => 1,
-            'data' => 'ok',
-        ]);
-    }
 }

+ 1 - 16
src/Controllers/WebAPI/NodeController.php

@@ -14,6 +14,7 @@ use Slim\Http\ServerRequest;
 use function json_decode;
 use function json_encode;
 use function time;
+use const VERSION;
 
 final class NodeController extends BaseController
 {
@@ -34,14 +35,6 @@ final class NodeController extends BaseController
         ]);
     }
 
-    public function info(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        return $response->withJson([
-            'ret' => 1,
-            'data' => 'ok',
-        ]);
-    }
-
     public function getInfo(ServerRequest $request, Response $response, array $args): ResponseInterface
     {
         $node_id = $args['id'];
@@ -76,12 +69,4 @@ final class NodeController extends BaseController
             'data' => $data,
         ]);
     }
-
-    public function getAllInfo(ServerRequest $request, Response $response, array $args): ResponseInterface
-    {
-        return $response->withJson([
-            'ret' => 1,
-            'data' => [],
-        ]);
-    }
 }

+ 6 - 2
src/Controllers/WebAPI/UserController.php

@@ -36,6 +36,7 @@ final class UserController extends BaseController
     {
         $node_id = $request->getQueryParam('node_id');
         $node = Node::find($node_id);
+
         if ($node === null) {
             return $response->withJson([
                 'ret' => 0,
@@ -94,6 +95,7 @@ final class UserController extends BaseController
         };
 
         $users = [];
+
         foreach ($users_raw as $user_raw) {
             if ($user_raw->transfer_enable <= $user_raw->u + $user_raw->d) {
                 if ($_ENV['keep_connect']) {
@@ -128,13 +130,14 @@ final class UserController extends BaseController
     public function addTraffic(Request $request, Response $response, array $args): ResponseInterface
     {
         $data = json_decode($request->getBody()->__toString());
+
         if (! $data || ! is_array($data->data)) {
             return $response->withJson([
                 'ret' => 0,
             ]);
         }
-        $data = $data->data;
 
+        $data = $data->data;
         $node_id = $request->getQueryParam('node_id');
         $node = Node::find($node_id);
 
@@ -186,13 +189,14 @@ final class UserController extends BaseController
     public function addAliveIp(Request $request, Response $response, array $args): ResponseInterface
     {
         $data = json_decode($request->getBody()->__toString());
+
         if (! $data || ! is_array($data->data)) {
             return $response->withJson([
                 'ret' => 0,
             ]);
         }
-        $data = $data->data;
 
+        $data = $data->data;
         $node_id = $request->getQueryParam('node_id');
 
         if ($node_id === null || ! Node::where('id', $node_id)->exists()) {