lkddi/Xboard
1
0
Fork 0
mirror of https://github.com/lkddi/Xboard.git synced 2026-04-23 19:37:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: resolve PHPStan static analysis warnings"

Browse Source 
This reverts commit 2d3e4b4a95.
This commit is contained in:
xboard
2025-04-14 21:23:08 +08:00
parent 2d3e4b4a95
commit db235c10e8
84 changed files with 1190 additions and 2330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/V2/Admin/ConfigController.php
+6
View File
@@ -64,6 +64,12 @@ class ConfigController extends Controller
return $this->success(true);
}
private function getTemplateContent(string $filename): string
{
$path = resource_path("rules/{$filename}");
return File::exists($path) ? File::get($path) : '';
}
public function fetch(Request $request)
{
$key = $request->input('key');
app/Http/Controllers/V2/Admin/OrderController.php
+17 -23
View File
@@ -15,7 +15,6 @@ use App\Utils\Helper;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\Log;
class OrderController extends Controller
{
@@ -28,7 +27,7 @@ class OrderController extends Controller
if ($order->surplus_order_ids) {
$order['surplus_orders'] = Order::whereIn('id', $order->surplus_order_ids)->get();
}
$order['period'] = PlanService::getLegacyPeriod((string) $order->period);
$order['period'] = PlanService::getLegacyPeriod($order->period);
return $this->success($order);
}
@@ -46,21 +45,17 @@ class OrderController extends Controller
$this->applyFiltersAndSorts($request, $orderModel);
/** @var \Illuminate\Pagination\LengthAwarePaginator $paginatedResults */
$paginatedResults = $orderModel
->latest('created_at')
->paginate(
perPage: $pageSize,
page: $current
);
$paginatedResults->getCollection()->transform(function($order) {
$orderArray = $order->toArray();
$orderArray['period'] = PlanService::getLegacyPeriod((string) $order->period);
return $orderArray;
});
return response()->json($paginatedResults);
return response()->json(
$orderModel
->latest('created_at')
->paginate(
perPage: $pageSize,
page: $current
)->through(fn($order) => [
...$order->toArray(),
'period' => PlanService::getLegacyPeriod($order->period)
]),
);
}
private function applyFiltersAndSorts(Request $request, Builder $builder): void
@@ -117,8 +112,8 @@ class OrderController extends Controller
'lte' => '<=',
'like' => 'like',
'notlike' => 'not like',
'null' => static fn($q) => $q->whereNull($field),
'notnull' => static fn($q) => $q->whereNotNull($field),
'null' => static fn($q) => $q->whereNull($queryField),
'notnull' => static fn($q) => $q->whereNotNull($queryField),
default => 'like'
}, match (strtolower($operator)) {
'like', 'notlike' => "%{$filterValue}%",
@@ -189,7 +184,7 @@ class OrderController extends Controller
try {
$order->update($params);
} catch (\Exception $e) {
Log::error($e);
\Log::error($e);
return $this->fail([500, '更新失败']);
}
@@ -220,12 +215,11 @@ class OrderController extends Controller
$orderService = new OrderService($order);
$order->user_id = $user->id;
$order->plan_id = $plan->id;
$period = $request->input('period');
$order->period = (int) PlanService::getPeriodKey((string) $period);
$order->period = PlanService::getPeriodKey($request->input('period'));
$order->trade_no = Helper::guid();
$order->total_amount = $request->input('total_amount');
if (PlanService::getPeriodKey((string) $order->period) === Plan::PERIOD_RESET_TRAFFIC) {
if (PlanService::getPeriodKey($order->period) === Plan::PERIOD_RESET_TRAFFIC) {
$order->type = Order::TYPE_RESET_TRAFFIC;
} else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
$order->type = Order::TYPE_UPGRADE;
app/Http/Controllers/V2/Admin/PlanController.php
+8 -9
View File
@@ -8,7 +8,6 @@ use App\Models\Plan;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class PlanController extends Controller
{
@@ -59,7 +58,7 @@ class PlanController extends Controller
return $this->success(true);
} catch (\Exception $e) {
DB::rollBack();
Log::error($e);
\Log::error($e);
return $this->fail([500, '保存失败']);
}
}
@@ -77,12 +76,12 @@ class PlanController extends Controller
if (User::where('plan_id', $request->input('id'))->first()) {
return $this->fail([400201, '该订阅下存在用户无法删除']);
}
$plan = Plan::find($request->input('id'));
if (!$plan) {
return $this->fail([400202, '该订阅不存在']);
if ($request->input('id')) {
$plan = Plan::find($request->input('id'));
if (!$plan) {
return $this->fail([400202, '该订阅不存在']);
}
}
return $this->success($plan->delete());
}
@@ -102,7 +101,7 @@ class PlanController extends Controller
try {
$plan->update($updateData);
} catch (\Exception $e) {
Log::error($e);
\Log::error($e);
return $this->fail([500, '保存失败']);
}
@@ -125,7 +124,7 @@ class PlanController extends Controller
DB::commit();
} catch (\Exception $e) {
DB::rollBack();
Log::error($e);
\Log::error($e);
return $this->fail([500, '保存失败']);
}
return $this->success(true);
app/Http/Controllers/V2/Admin/Server/GroupController.php
+6 -6
View File
@@ -14,15 +14,15 @@ class GroupController extends Controller
{
public function fetch(Request $request): JsonResponse
{
$serverGroups = ServerGroup::query()
->orderByDesc('id')
->withCount('users')
->get();
// 只在需要时手动加载server_count
$serverGroups->each(function ($group) {
$group->setAttribute('server_count', $group->server_count);
});
->get()
->transform(function ($group) {
$group->server_count = $group->servers()->count();
return $group;
});
return $this->success($serverGroups);
}
app/Http/Controllers/V2/Admin/Server/ManageController.php
+5 -6
View File
@@ -10,13 +10,12 @@ use App\Models\ServerGroup;
use App\Services\ServerService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class ManageController extends Controller
{
public function getNodes(Request $request)
{
$servers = ServerService::getAllServers()->map(function ($item) {
$servers = collect(ServerService::getAllServers())->map(function ($item) {
$item['groups'] = ServerGroup::whereIn('id', $item['group_ids'])->get(['name', 'id']);
$item['parent'] = $item->parent;
return $item;
@@ -42,7 +41,7 @@ class ManageController extends Controller
DB::commit();
} catch (\Exception $e) {
DB::rollBack();
Log::error($e);
\Log::error($e);
return $this->fail([500, '保存失败']);
}
@@ -61,7 +60,7 @@ class ManageController extends Controller
$server->update($params);
return $this->success(true);
} catch (\Exception $e) {
Log::error($e);
\Log::error($e);
return $this->fail([500, '保存失败']);
}
}
@@ -70,7 +69,7 @@ class ManageController extends Controller
Server::create($params);
return $this->success(true);
} catch (\Exception $e) {
Log::error($e);
\Log::error($e);
return $this->fail([500, '创建失败']);
}
@@ -84,7 +83,7 @@ class ManageController extends Controller
'show' => 'integer',
]);
if (!Server::where('id', $request->id)->update(['show' => $request->show])) {
if (Server::where('id', $request->id)->update(['show' => $request->show]) === false) {
return $this->fail([500, '保存失败']);
}
return $this->success(true);
app/Http/Controllers/V2/Admin/StatController.php
+4 -2
View File
@@ -25,7 +25,8 @@ class StatController extends Controller
{
// 获取在线节点数
$onlineNodes = Server::all()->filter(function ($server) {
return !!$server->is_online;
$server->loadServerStatus();
return $server->is_online;
})->count();
// 获取在线设备数和在线用户数
$onlineDevices = User::where('t', '>=', time() - 600)
@@ -267,7 +268,8 @@ class StatController extends Controller
// 获取在线节点数
$onlineNodes = Server::all()->filter(function ($server) {
return !!$server->is_online;
$server->loadServerStatus();
return $server->is_online;
})->count();
// 获取在线设备数和在线用户数
app/Http/Controllers/V2/Admin/TicketController.php
+11 -27
View File
@@ -55,10 +55,13 @@ class TicketController extends Controller
if (!$ticket) {
return $this->fail([400202, '工单不存在']);
}
$result = $ticket->toArray();
$result['user'] = UserController::transformUserData($ticket->user);
$ticket->user = UserController::transformUserData($ticket->user);
$ticket->messages->each(function ($message) use ($ticket) {
$message->is_me = $message->user_id !== $ticket->user_id;
return $this->success($result);
});
return $this->success($ticket);
}
/**
@@ -88,16 +91,12 @@ class TicketController extends Controller
perPage: $request->integer('pageSize', 10),
page: $request->integer('current', 1)
);
// 获取items然后映射转换
$items = collect($tickets->items())->map(function ($ticket) {
$ticketData = $ticket->toArray();
$ticketData['user'] = UserController::transformUserData($ticket->user);
return $ticketData;
})->all();
$tickets->getCollection()->transform(function ($ticket) {
$ticket->user = UserController::transformUserData($ticket->user);
return $ticket;
});
return response([
'data' => $items,
'data' => $tickets->items(),
'total' => $tickets->total()
]);
}
@@ -138,19 +137,4 @@ class TicketController extends Controller
return $this->fail([500101, '关闭失败']);
}
}
public function show($ticketId)
{
$ticket = Ticket::with([
'user',
'messages' => function ($query) {
$query->with(['user']); // 如果需要用户信息
}
])->findOrFail($ticketId);
// 自动包含 is_me 属性
return response()->json([
'data' => $ticket
]);
}
}
app/Http/Controllers/V2/Admin/UserController.php
+20 -21
View File
@@ -81,7 +81,7 @@ class UserController extends Controller
// 处理关联查询
if (str_contains($field, '.')) {
[$relation, $relationField] = explode('.', $field);
$query->whereHas($relation, function ($q) use ($relationField, $value) {
$query->whereHas($relation, function($q) use ($relationField, $value) {
if (is_array($value)) {
$q->whereIn($relationField, $value);
} else if (is_string($value) && str_contains($value, ':')) {
@@ -163,7 +163,7 @@ class UserController extends Controller
$users = $userModel->orderBy('id', 'desc')
->paginate($pageSize, ['*'], 'page', $current);
$users->getCollection()->map(function ($user) {
$users->getCollection()->transform(function ($user) {
return self::transformUserData($user);
});
@@ -177,14 +177,13 @@ class UserController extends Controller
* Transform user data for response
*
* @param User $user
* @return array<string, mixed>
* @return User
*/
public static function transformUserData(User $user): array
public static function transformUserData(User $user): User
{
$user = $user->toArray();
$user['balance'] = $user['balance'] / 100;
$user['commission_balance'] = $user['commission_balance'] / 100;
$user['subscribe_url'] = Helper::getSubscribeUrl($user['token']);
$user->subscribe_url = Helper::getSubscribeUrl($user->token);
$user->balance = $user->balance / 100;
$user->commission_balance = $user->commission_balance / 100;
return $user;
}
@@ -236,7 +235,7 @@ class UserController extends Controller
if (isset($params['banned']) && (int) $params['banned'] === 1) {
$authService = new AuthService($user);
$authService->removeAllSessions();
$authService->removeSession();
}
if (isset($params['balance'])) {
$params['balance'] = $params['balance'] * 100;
@@ -264,7 +263,7 @@ class UserController extends Controller
{
ini_set('memory_limit', '-1');
gc_enable(); // 启用垃圾回收
// 优化查询：使用with预加载plan关系，避免N+1问题
$query = User::with('plan:id,name')
->orderBy('id', 'asc')
@@ -279,18 +278,18 @@ class UserController extends Controller
'token',
'plan_id'
]);
$this->applyFiltersAndSorts($request, $query);
$filename = 'users_' . date('Y-m-d_His') . '.csv';
return response()->streamDownload(function () use ($query) {
return response()->streamDownload(function() use ($query) {
// 打开输出流
$output = fopen('php://output', 'w');
// 添加BOM标记，确保Excel正确显示中文
fprintf($output, chr(0xEF) . chr(0xBB) . chr(0xBF));
fprintf($output, chr(0xEF).chr(0xBB).chr(0xBF));
// 写入CSV头部
fputcsv($output, [
'邮箱',
@@ -302,9 +301,9 @@ class UserController extends Controller
'订阅计划',
'订阅地址'
]);
// 分批处理数据以减少内存使用
$query->chunk(500, function ($users) use ($output) {
$query->chunk(500, function($users) use ($output) {
foreach ($users as $user) {
try {
$row = [
@@ -326,11 +325,11 @@ class UserController extends Controller
continue; // 继续处理下一条记录
}
}
// 清理内存
gc_collect_cycles();
});
fclose($output);
}, $filename, [
'Content-Type' => 'text/csv; charset=UTF-8',