Skip to content

Commit 65dd61d

Browse files
author
M1Screw
authored
Merge pull request #2371 from SSPanel-UIM/dev
Dev 20240225
2 parents 94ae8aa + fad3e56 commit 65dd61d

32 files changed

+439
-302
lines changed

‎app/predefine.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
*/
88

99
const BASE_PATH = __DIR__ . '/..';
10-
const VERSION = '2023.7';
10+
const VERSION = '2024.1';

‎composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
}
5959
},
6060
"require-dev": {
61+
"dg/bypass-finals": "^1.6",
6162
"nunomaduro/phpinsights": "*",
6263
"phpunit/phpunit": "^10|^11"
6364
},

‎composer.lock

+113-59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎phpunit.xml

+4
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@
2020
<directory>src</directory>
2121
</include>
2222
</source>
23+
24+
<php>
25+
<cookie name="testKey" value="testValue"/>
26+
</php>
2327
</phpunit>

‎src/Command/ClientDownload.php

-14
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ final class ClientDownload extends Command
3232
private array $version;
3333

3434
/**
35-
* @return void
36-
*
3735
* @throws GuzzleException
3836
*/
3937
public function boot(): void
@@ -68,8 +66,6 @@ public function boot(): void
6866
* @param string $fileName
6967
* @param string $savePath
7068
* @param string $url
71-
*
72-
* @return bool
7369
*/
7470
private function getSourceFile(string $fileName, string $savePath, string $url): bool
7571
{
@@ -104,8 +100,6 @@ private function getSourceFile(string $fileName, string $savePath, string $url):
104100
*
105101
* @param string $repo
106102
*
107-
* @return string
108-
*
109103
* @throws GuzzleException
110104
*/
111105
private function getLatestReleaseTagName(string $repo): string
@@ -125,8 +119,6 @@ private function getLatestReleaseTagName(string $repo): string
125119
*
126120
* @param string $repo
127121
*
128-
* @return string
129-
*
130122
* @throws GuzzleException
131123
*/
132124
private function getLatestPreReleaseTagName(string $repo): string
@@ -184,8 +176,6 @@ private function getLocalVersions(): array
184176
* 储存本地软体版本库
185177
*
186178
* @param array $versions
187-
*
188-
* @return void
189179
*/
190180
private function setLocalVersions(array $versions): void
191181
{
@@ -204,8 +194,6 @@ private function setLocalVersions(array $versions): void
204194
* @param $name
205195
* @param $taskName
206196
* @param $tagName
207-
*
208-
* @return array|string
209197
*/
210198
private static function getNames($name, $taskName, $tagName): array|string
211199
{
@@ -227,8 +215,6 @@ private static function getNames($name, $taskName, $tagName): array|string
227215
/**
228216
* @param array $task
229217
*
230-
* @return void
231-
*
232218
* @throws GuzzleException
233219
*/
234220
private function getSoft(array $task): void

‎src/Controllers/Admin/AnnController.php

-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ public function create(ServerRequest $request, Response $response, array $args):
7171
* @param ServerRequest $request
7272
* @param Response $response
7373
* @param array $args
74-
*
75-
* @return Response|ResponseInterface
7674
*/
7775
public function add(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
7876
{

‎src/Controllers/Admin/DocsController.php

-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ public function edit(ServerRequest $request, Response $response, array $args): R
125125
* @param ServerRequest $request
126126
* @param Response $response
127127
* @param array $args
128-
*
129-
* @return Response|ResponseInterface
130128
*/
131129
public function update(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
132130
{

‎src/Controllers/Admin/UserController.php

-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ public function index(ServerRequest $request, Response $response, array $args):
108108
* @param Response $response
109109
* @param array $args
110110
*
111-
* @return Response|ResponseInterface
112-
*
113111
* @throws Exception
114112
*/
115113
public function create(ServerRequest $request, Response $response, array $args): Response|ResponseInterface

‎src/Controllers/Api/AdminApiV1Controller.php

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\Controllers\Api;
6+
7+
use App\Controllers\BaseController;
8+
9+
final class AdminApiV1Controller extends BaseController
10+
{
11+
}

‎src/Controllers/Api/NodeApiV1Controller.php

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\Controllers\Api;
6+
7+
use App\Controllers\BaseController;
8+
9+
final class NodeApiV1Controller extends BaseController
10+
{
11+
}

‎src/Controllers/Api/UserApiV1Controller.php

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\Controllers\Api;
6+
7+
use App\Controllers\BaseController;
8+
9+
final class UserApiV1Controller extends BaseController
10+
{
11+
}

‎src/Controllers/AuthController.php

-6
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ public function login(ServerRequest $request, Response $response, array $args):
5757
* @param ServerRequest $request
5858
* @param Response $response
5959
* @param array $args
60-
*
61-
* @return Response|ResponseInterface
6260
*/
6361
public function loginHandle(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
6462
{
@@ -209,8 +207,6 @@ public function sendVerify(ServerRequest $request, Response $response, $next): R
209207
* @param $money
210208
* @param $is_admin_reg
211209
*
212-
* @return ResponseInterface
213-
*
214210
* @throws Exception
215211
*/
216212
public function registerHelper(
@@ -305,8 +301,6 @@ public function registerHelper(
305301
* @param Response $response
306302
* @param array $args
307303
*
308-
* @return Response|ResponseInterface
309-
*
310304
* @throws RedisException
311305
* @throws Exception
312306
*/

‎src/Controllers/SubController.php

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ final class SubController extends BaseController
2525
* @param $response
2626
* @param $args
2727
*
28-
* @return ResponseInterface
29-
*
3028
* @throws ClientExceptionInterface
3129
* @throws GuzzleException
3230
* @throws RedisException

‎src/Controllers/WebAPI/FuncController.php

+3-9
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,13 @@ final class FuncController extends BaseController
1515
{
1616
public function ping(ServerRequest $request, Response $response, array $args): ResponseInterface
1717
{
18-
return $response->withJson([
19-
'ret' => 1,
20-
'msg' => 'Pong? Pong!',
21-
]);
18+
return ResponseHelper::success($response, 'Pong? Pong!');
2219
}
2320

2421
public function getDetectRules(ServerRequest $request, Response $response, array $args): ResponseInterface
2522
{
26-
$rules = DetectRule::all();
23+
$rules = DetectRule::all()->toArray();
2724

28-
return ResponseHelper::successWithDataEtag($request, $response, [
29-
'ret' => 1,
30-
'data' => $rules,
31-
]);
25+
return ResponseHelper::successWithDataEtag($request, $response, $rules);
3226
}
3327
}

‎src/Controllers/WebAPI/NodeController.php

+7-11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Slim\Http\Response;
1212
use Slim\Http\ServerRequest;
1313
use function json_decode;
14+
use const JSON_UNESCAPED_SLASHES;
1415
use const VERSION;
1516

1617
final class NodeController extends BaseController
@@ -21,27 +22,22 @@ public function getInfo(ServerRequest $request, Response $response, array $args)
2122
$node = (new Node())->find($node_id);
2223

2324
if ($node === null) {
24-
return $response->withJson([
25-
'ret' => 0,
26-
'msg' => 'Node not found.',
27-
]);
25+
return ResponseHelper::error($response, 'Node not found.');
26+
}
27+
28+
if ($node->type === 0) {
29+
return ResponseHelper::error($response, 'Node is not enabled.');
2830
}
2931

3032
$data = [
31-
'node_group' => $node->node_group,
32-
'node_class' => $node->node_class,
3333
'node_speedlimit' => $node->node_speedlimit,
34-
'traffic_rate' => $node->traffic_rate,
3534
'sort' => $node->sort,
3635
'server' => $node->server,
3736
'custom_config' => json_decode($node->custom_config, true, JSON_UNESCAPED_SLASHES),
3837
'type' => 'SSPanel-UIM',
3938
'version' => VERSION,
4039
];
4140

42-
return ResponseHelper::successWithDataEtag($request, $response, [
43-
'ret' => 1,
44-
'data' => $data,
45-
]);
41+
return ResponseHelper::successWithDataEtag($request, $response, $data);
4642
}
4743
}

0 commit comments

Comments
 (0)