fix: correct know file issues

app/Http/Controllers/V1/User/NoticeController.php

@@ -12,8 +12,8 @@ class NoticeController extends Controller
     {
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = 5;
-        $model = Notice::orderBy('created_at', 'DESC')
+        $model = Notice::orderBy('sort', 'ASC')
-            ->where('show', 1);
+            ->where('show', true);
         $total = $model->count();
         $res = $model->forPage($current, $pageSize)
             ->get();

app/Http/Controllers/V2/Admin/NoticeController.php

@@ -7,12 +7,17 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\NoticeSave;
 use App\Models\Notice;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class NoticeController extends Controller
 {
     public function fetch(Request $request)
     {
-        return $this->success(Notice::orderBy('id', 'DESC')->get());
+        return $this->success(
+            Notice::orderBy('sort', 'ASC')
+                ->orderBy('id', 'DESC')
+                ->get()
+        );
     }
 
     public function save(NoticeSave $request)
@@ -72,4 +77,25 @@ class NoticeController extends Controller
         }
         return $this->success(true);
     }
+
+    public function sort(Request $request)
+    {
+        $params = $request->validate([
+            'ids' => 'required|array'
+        ]);
+
+        try {
+            DB::beginTransaction();
+            foreach ($params['ids'] as $k => $v) {
+                $notice = Notice::findOrFail($v);
+                $notice->update(['sort' => $k + 1]);
+            }
+            DB::commit();
+            return $this->success(true);
+        } catch (\Exception $e) {
+            DB::rollBack();
+            \Log::error($e);
+            return $this->fail([500, '排序保存失败']);
+        }
+    }
 }

app/Http/Controllers/V2/Admin/OrderController.php

@@ -14,6 +14,7 @@ use App\Services\UserService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Eloquent\Builder;
 
 class OrderController extends Controller
 {
@@ -57,24 +58,80 @@ class OrderController extends Controller
         );
     }
 
-    private function applyFiltersAndSorts(Request $request, $builder)
+    private function applyFiltersAndSorts(Request $request, Builder $builder): void
     {
-        $request->collect('filter')->each(function ($filter) use ($builder) {
+        $this->applyFilters($request, $builder);
-            $key = $filter['id'];
+        $this->applySorting($request, $builder);
+    }
+
+    private function applyFilters(Request $request, Builder $builder): void
+    {
+        if (!$request->has('filter')) {
+            return;
+        }
+
+        collect($request->input('filter'))->each(function ($filter) use ($builder) {
+            $field = $filter['id'];
             $value = $filter['value'];
 
-            $builder->where(function ($query) use ($key, $value) {
+            $builder->where(function ($query) use ($field, $value) {
-                is_array($value)
+                $this->buildFilterQuery($query, $field, $value);
-                    ? $query->whereIn($key, $value)
-                    : $query->where($key, 'like', "%{$value}%");
             });
         });
+    }
 
-        $request->collect('sort')->each(function ($sort) use ($builder) {
+    private function buildFilterQuery(Builder $query, string $field, mixed $value): void
-            $builder->orderBy(
+    {
-                $sort['id'],
+        // Handle array values for 'in' operations
-                $sort['desc'] ? 'DESC' : 'ASC'
+        if (is_array($value)) {
-            );
+            $query->whereIn($field, $value);
+            return;
+        }
+
+        // Handle operator-based filtering
+        if (!is_string($value) || !str_contains($value, ':')) {
+            $query->where($field, 'like', "%{$value}%");
+            return;
+        }
+
+        [$operator, $filterValue] = explode(':', $value, 2);
+        
+        // Convert numeric strings to appropriate type
+        if (is_numeric($filterValue)) {
+            $filterValue = strpos($filterValue, '.') !== false 
+                ? (float) $filterValue 
+                : (int) $filterValue;
+        }
+
+        // Apply operator
+        $query->where($field, match (strtolower($operator)) {
+            'eq' => '=',
+            'gt' => '>',
+            'gte' => '>=',
+            'lt' => '<',
+            'lte' => '<=',
+            'like' => 'like',
+            'notlike' => 'not like',
+            'null' => static fn($q) => $q->whereNull($queryField),
+            'notnull' => static fn($q) => $q->whereNotNull($queryField),
+            default => 'like'
+        }, match (strtolower($operator)) {
+            'like', 'notlike' => "%{$filterValue}%",
+            'null', 'notnull' => null,
+            default => $filterValue
+        });
+    }
+
+    private function applySorting(Request $request, Builder $builder): void
+    {
+        if (!$request->has('sort')) {
+            return;
+        }
+
+        collect($request->input('sort'))->each(function ($sort) use ($builder) {
+            $field = $sort['id'];
+            $direction = $sort['desc'] ? 'DESC' : 'ASC';
+            $builder->orderBy($field, $direction);
         });
     }
 

app/Http/Routes/V2/AdminRoute.php

@@ -139,6 +139,7 @@ class AdminRoute
                 $router->post('/update', [NoticeController::class, 'update']);
                 $router->post('/drop', [NoticeController::class, 'drop']);
                 $router->post('/show', [NoticeController::class, 'show']);
+                $router->post('/sort', [NoticeController::class, 'sort']);
             });
 
             // Ticket

app/Models/Notice.php

@@ -14,6 +14,5 @@ class Notice extends Model
         'updated_at' => 'timestamp',
         'tags' => 'array',
         'show' => 'boolean',
-
     ];
 }

app/Protocols/Clash.php

@@ -166,10 +166,10 @@ class Clash implements ProtocolInterface
                 break;
             case 'ws':
                 $array['network'] = 'ws';
-                $array['ws-opts'] = [
+                $array['ws-opts']['path'] = data_get($protocol_settings, 'network_settings.path', '/');
-                    'path' => data_get($protocol_settings, 'network_settings.path'),
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
-                    'headers' => ['Host' => data_get($protocol_settings, 'network_settings.headers.Host')]
+                    $array['ws-opts']['headers'] = ['Host' => $host];
-                ];
+                }
                 break;
             case 'grpc':
                 $array['network'] = 'grpc';
@@ -200,10 +200,10 @@ class Clash implements ProtocolInterface
                 break;
             case 'ws':
                 $array['network'] = 'ws';
-                $array['ws-opts'] = [
+                $array['ws-opts']['path'] = data_get($protocol_settings, 'network_settings.path', '/');
-                    'path' => data_get($protocol_settings, 'network_settings.path'),
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
-                    'headers' => ['Host' => data_get($protocol_settings, 'network_settings.headers.Host')]
+                    $array['ws-opts']['headers'] = ['Host' => $host];
-                ];
+                }
                 break;
             case 'grpc':
                 $array['network'] = 'grpc';

app/Protocols/ClashMeta.php

@@ -167,7 +167,7 @@ class ClashMeta implements ProtocolInterface
                 $array['network'] = 'ws';
                 $array['ws-opts'] = [
                     'path' => data_get($protocol_settings, 'network_settings.path'),
-                    'headers' => ['Host' => data_get($protocol_settings, 'network_settings.headers.Host')]
+                    'headers' => ['Host' => data_get($protocol_settings, 'network_settings.headers.Host', $server['host'])]
                 ];
                 break;
             case 'grpc':
@@ -221,10 +221,10 @@ class ClashMeta implements ProtocolInterface
         switch (data_get($protocol_settings, 'network')) {
             case 'ws':
                 $array['network'] = 'ws';
-                $array['ws-opts'] = [
+                $array['ws-opts']['path'] = data_get($protocol_settings, 'network_settings.path', '/');
-                    'path' => data_get($protocol_settings, 'network_settings.path'),
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
-                    'headers' => ['Host' => data_get($protocol_settings, 'network_settings.headers.Host')]
+                    $array['ws-opts']['headers'] = ['Host' => $host];
-                ];
+                }
                 break;
             case 'grpc':
                 $array['network'] = 'grpc';
@@ -248,7 +248,7 @@ class ClashMeta implements ProtocolInterface
 
     public static function buildTrojan($password, $server)
     {
-        $settings = data_get($server, 'protocol_settings', []);
+        $protocol_settings = data_get($server, 'protocol_settings', []);
         $array = [
             'name' => $server['name'],
             'type' => 'trojan',
@@ -256,23 +256,23 @@ class ClashMeta implements ProtocolInterface
             'port' => $server['port'],
             'password' => $password,
             'udp' => true,
-            'sni' => data_get($settings, 'server_name'),
+            'sni' => data_get($protocol_settings, 'server_name'),
-            'skip-cert-verify' => (bool) data_get($settings, 'allow_insecure', false)
+            'skip-cert-verify' => (bool) data_get($protocol_settings, 'allow_insecure', false)
         ];
 
-        switch (data_get($settings, 'network')) {
+        switch (data_get($protocol_settings, 'network')) {
             case 'grpc':
                 $array['network'] = 'grpc';
                 $array['grpc-opts'] = [
-                    'grpc-service-name' => data_get($settings, 'network_settings.serviceName')
+                    'grpc-service-name' => data_get($protocol_settings, 'network_settings.serviceName')
                 ];
                 break;
             case 'ws':
                 $array['network'] = 'ws';
-                $array['ws-opts'] = [
+                $array['ws-opts']['path'] = data_get($protocol_settings, 'network_settings.path', '/');
-                    'path' => data_get($settings, 'network_settings.path'),
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
-                    'headers' => ['Host' => data_get($settings, 'network_settings.headers.Host')]
+                    $array['ws-opts']['headers'] = ['Host' => $host];
-                ];
+                }
                 break;
             default:
                 break;

app/Protocols/General.php

@@ -83,13 +83,15 @@ class General implements ProtocolInterface
         switch ($protocol_settings['network']) {
             case 'tcp':
                 $config['type'] = 'http';
-                $config['path'] = \Arr::random(data_get($protocol_settings, 'network_settings.header.request.path', []));
+                $config['path'] = \Arr::random(data_get($protocol_settings, 'network_settings.header.request.path', ['/']));
-                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host') ? \Arr::random(data_get($protocol_settings, 'network_settings.headers.Host')) : null;
+                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host') ? \Arr::random(data_get($protocol_settings, 'network_settings.headers.Host'),['/']) : null;
                 break;
             case 'ws':
                 $config['type'] = 'ws';
                 $config['path'] = data_get($protocol_settings, 'network_settings.path');
-                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host') ? \Arr::random(data_get($protocol_settings, 'network_settings.headers.Host')) : null;
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
+                    $config['host'] = $host;
+                }
                 break;
             case 'grpc':
                 $config['type'] = 'grpc';
@@ -137,7 +139,9 @@ class General implements ProtocolInterface
         switch ($server['protocol_settings']['network']) {
             case 'ws':
                 $config['path'] = data_get($protocol_settings, 'network_settings.path');
-                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host');
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
+                    $config['host'] = $host;
+                }
                 break;
             case 'grpc':
                 $config['serviceName'] = data_get($protocol_settings, 'network_settings.serviceName');
@@ -148,11 +152,11 @@ class General implements ProtocolInterface
                 break;
             case 'httpupgrade':
                 $config['path'] = data_get($protocol_settings, 'network_settings.path');
-                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host');
+                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host', $server['host']);
                 break;
             case 'xhttp':
                 $config['path'] = data_get($protocol_settings, 'network_settings.path');
-                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host');
+                $config['host'] = data_get($protocol_settings, 'network_settings.headers.Host', $server['host']);
                 $config['mode'] = data_get($protocol_settings, 'network_settings.mode', 'auto');
                 $config['extra'] = data_get($protocol_settings, 'network_settings.extra') ? Helper::encodeURIComponent(data_get($protocol_settings, 'network_settings.extra')) : null;
                 break;

app/Protocols/Shadowrocket.php

@@ -102,7 +102,9 @@ class Shadowrocket implements ProtocolInterface
             case 'ws':
                 $config['obfs'] = "websocket";
                 $config['path'] = data_get($protocol_settings, 'network_settings.path');
-                $config['obfsParam'] = data_get($protocol_settings, 'network_settings.headers.Host');
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
+                    $config['obfsParam'] = $host;
+                }
                 break;
             case 'grpc':
                 $config['obfs'] = "grpc";
@@ -159,12 +161,14 @@ class Shadowrocket implements ProtocolInterface
             case 'tcp':
                 $config['obfs'] = data_get($protocol_settings, 'network_settings.header.type');
                 $config['path'] = \Arr::random(data_get($protocol_settings, 'network_settings.header.request.path', ['/']));
-                $config['obfsParam'] = \Arr::random(data_get($protocol_settings, 'network_settings.header.request.headers.Host', ['']));
+                $config['obfsParam'] = \Arr::random(data_get($protocol_settings, 'network_settings.header.request.headers.Host', ['/']));
                 break;
             case 'ws':
                 $config['obfs'] = "websocket";
                 $config['path'] = data_get($protocol_settings, 'network_settings.path');
-                $config['obfsParam'] = data_get($protocol_settings, 'network_settings.headers.Host');
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
+                    $config['obfsParam'] = $host;
+                }
                 break;
             case 'grpc':
                 $config['obfs'] = "grpc";

app/Protocols/SingBox.php

@@ -135,12 +135,12 @@ class SingBox implements ProtocolInterface
         $transport = match ($protocol_settings['network']) {
             'tcp' => [
                 'type' => 'http',
-                'path' => \Arr::random(data_get($protocol_settings, 'network_settings.header.request.path', []))
+                'path' => \Arr::random(data_get($protocol_settings, 'network_settings.header.request.path', ['/']))
             ],
             'ws' => [
                 'type' => 'ws',
                 'path' => data_get($protocol_settings, 'network_settings.path'),
-                'headers' => data_get($protocol_settings, 'network_settings.headers.Host') ? ['Host' => data_get($protocol_settings, 'network_settings.headers.Host')] : null,
+                'headers' => ($host = data_get($protocol_settings, 'network_settings.headers.Host')) ? ['Host' => $host] : null,
                 'max_early_data' => 2048,
                 'early_data_header_name' => 'Sec-WebSocket-Protocol'
             ],
@@ -196,13 +196,13 @@ class SingBox implements ProtocolInterface
                 'type' => 'http',
                 'path' => data_get($protocol_settings, 'network_settings.header.request.path')
             ] : null,
-            'ws' => [
+            'ws' => array_filter([
                 'type' => 'ws',
                 'path' => data_get($protocol_settings, 'network_settings.path'),
-                'headers' => data_get($protocol_settings, 'network_settings.headers.Host') ? ['Host' => [data_get($protocol_settings, 'network_settings.headers.Host')]] : null,
+                'headers' => ($host = data_get($protocol_settings, 'network_settings.headers.Host')) ? ['Host' => $host] : null,
                 'max_early_data' => 2048,
                 'early_data_header_name' => 'Sec-WebSocket-Protocol'
-            ],
+            ], fn($value) => !is_null($value)),
             'grpc' => [
                 'type' => 'grpc',
                 'service_name' => data_get($protocol_settings, 'network_settings.serviceName')
@@ -215,7 +215,7 @@ class SingBox implements ProtocolInterface
             'httpupgrade' => [
                 'type' => 'httpupgrade',
                 'path' => data_get($protocol_settings, 'network_settings.path'),
-                'host' => data_get($protocol_settings, 'network_settings.headers.Host'),
+                'host' => data_get($protocol_settings, 'network_settings.headers.Host', $server['host']),
                 'headers' => data_get($protocol_settings, 'network_settings.headers')
             ],
             default => null

app/Protocols/Stash.php

@@ -152,7 +152,9 @@ class Stash implements ProtocolInterface
             case 'ws':
                 $array['network'] = 'ws';
                 $array['ws-opts']['path'] = data_get($protocol_settings, 'network_settings.path');
-                $array['ws-opts']['headers'] = data_get($protocol_settings, 'network_settings.headers.Host') ? ['Host' => data_get($protocol_settings, 'network_settings.headers.Host')] : null;
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
+                    $array['ws-opts']['headers'] = ['Host' => $host];
+                }
                 break;
             case 'grpc':
                 $array['network'] = 'grpc';
@@ -205,7 +207,9 @@ class Stash implements ProtocolInterface
             case 'ws':
                 $array['network'] = 'ws';
                 $array['ws-opts']['path'] = data_get($protocol_settings, 'network_settings.path');
-                $array['ws-opts']['headers'] = data_get($protocol_settings, 'network_settings.headers.Host') ? ['Host' => data_get($protocol_settings, 'network_settings.headers.Host')] : null;
+                if ($host = data_get($protocol_settings, 'network_settings.headers.Host')) {
+                    $array['ws-opts']['headers'] = ['Host' => $host];
+                }
                 break;
             case 'grpc':
                 $array['network'] = 'grpc';

app/Services/OrderService.php

@@ -67,6 +67,7 @@ class OrderService
             }
 
             $this->setSpeedLimit($plan->speed_limit);
+            $this->setDeviceLimit($plan->device_limit);
 
             if (!$this->user->save()) {
                 throw new \Exception('用户信息保存失败');
@@ -272,6 +273,11 @@ class OrderService
         $this->user->speed_limit = $speedLimit;
     }
     
+    private function setDeviceLimit($deviceLimit)
+    {
+        $this->user->device_limit = $deviceLimit;
+    }
+
     private function buyByResetTraffic()
     {
         $this->user->u = 0;

database/migrations/2025_01_12_190315_add_sort_to_v2_notice_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('v2_notice', function (Blueprint $table) {
+            $table->integer('sort')->nullable()->after('id')->index();
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('v2_notice', function (Blueprint $table) {
+            $table->dropColumn('sort');
+        });
+    }
+};

database/migrations/2025_01_12_200936_modify_commission_status_in_v2_order_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::table('v2_order')->where('commission_status', null)->update([
+            'commission_status' => 0
+        ]);
+        Schema::table('v2_order', function (Blueprint $table) {
+            $table->boolean('commission_status')->default(value: 0)->comment('0待确认1发放中2有效3无效')->change();
+        });
+        
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('v2_order', function (Blueprint $table) {
+            $table->boolean('commission_status')->nullable()->comment('0待确认1发放中2有效3无效')->change();
+        });
+    }
+};