mirror of
https://github.com/lkddi/Xboard.git
synced 2026-04-24 03:57:27 +08:00
fix: resolve known issues and improve code standards
- Fix known bugs in user, plan, and server modules - Standardize code formatting and structure - Optimize database queries and model relationships - Improve request validation and error handling - Update admin controllers for better consistency
This commit is contained in:
@@ -13,6 +13,7 @@ use Laravel\Horizon\Contracts\MetricsRepository;
|
||||
use Laravel\Horizon\Contracts\SupervisorRepository;
|
||||
use Laravel\Horizon\Contracts\WorkloadRepository;
|
||||
use Laravel\Horizon\WaitTimeCalculator;
|
||||
use App\Helpers\ResponseEnum;
|
||||
|
||||
class SystemController extends Controller
|
||||
{
|
||||
@@ -257,7 +258,7 @@ class SystemController extends Controller
|
||||
]);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
return $this->error('清除日志失败:' . $e->getMessage());
|
||||
return $this->fail(ResponseEnum::HTTP_ERROR, null, '清除日志失败:' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -293,7 +294,7 @@ class SystemController extends Controller
|
||||
return $this->success($stats);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
return $this->error('获取统计信息失败:' . $e->getMessage());
|
||||
return $this->fail(ResponseEnum::HTTP_ERROR, null, '获取统计信息失败:' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ class TrafficResetController extends Controller
|
||||
$logs = $query->paginate($perPage);
|
||||
|
||||
// 格式化数据
|
||||
$logs->getCollection()->transform(function ($log) {
|
||||
$formattedLogs = $logs->getCollection()->map(function (TrafficResetLog $log) {
|
||||
return [
|
||||
'id' => $log->id,
|
||||
'user_id' => $log->user_id,
|
||||
@@ -99,7 +99,7 @@ class TrafficResetController extends Controller
|
||||
});
|
||||
|
||||
return response()->json([
|
||||
'data' => $logs->items(),
|
||||
'data' => $formattedLogs->toArray(),
|
||||
'pagination' => [
|
||||
'current_page' => $logs->currentPage(),
|
||||
'last_page' => $logs->lastPage(),
|
||||
@@ -198,7 +198,8 @@ class TrafficResetController extends Controller
|
||||
|
||||
$history = $this->trafficResetService->getUserResetHistory($user, $limit);
|
||||
|
||||
$data = $history->map(function ($log) {
|
||||
/** @var \Illuminate\Database\Eloquent\Collection<int, \App\Models\TrafficResetLog> $history */
|
||||
$data = $history->map(function (TrafficResetLog $log) {
|
||||
return [
|
||||
'id' => $log->id,
|
||||
'reset_type' => $log->reset_type,
|
||||
|
||||
Reference in New Issue
Block a user