feat: xxbb

2026-08-14 02:59:21 +08:00
parent 31924ca770
commit 5bf6852f66
82 changed files with 2890 additions and 521 deletions
@@ -52,7 +52,7 @@ class ChannelController extends Controller
            $q->where('status', (int) $status);
        }

-        $sortable = ['id', 'channel_id', 'channel_name', 'builder_type', 'status', 'user_id', 'created_at', 'updated_at'];
+        $sortable = ['id', 'channel_id', 'builder_type', 'status', 'user_id', 'created_at', 'updated_at'];
        $field = (string) $request->query('field', 'id');
        $order = strtolower((string) $request->query('order', 'desc')) === 'asc' ? 'asc' : 'desc';
        if (! in_array($field, $sortable, true)) {
@@ -60,24 +60,29 @@ class ChannelController extends Controller
        }
        $q->orderBy($field, $order);

-        $limit = max(1, min(100, (int) $request->query('limit', 15)));
+        $limit = max(1, min(100, (int) $request->query('limit', 20)));
        $page = max(1, (int) $request->query('page', 1));
        $paginator = $q->paginate($limit, ['*'], 'page', $page);

        $data = collect($paginator->items())->map(function (Channel $c) {
-            return [
+            $row = [
                'id' => $c->id,
                'channel_id' => $c->channel_id,
                'builder_type' => $c->builderType(),
-                'channel_name' => $c->channel_name ?: '',
                'user_id' => (int) $c->user_id,
                'agent_username' => $c->agentLabel(),
                'remark' => $c->remark ?: '',
                'status' => (int) $c->status,
                'links' => $c->supportLinks(),
+                'download_url' => null,
                'created_at' => optional($c->created_at)->format('Y-m-d H:i:s'),
                'updated_at' => optional($c->updated_at)->format('Y-m-d H:i:s'),
            ];
+            if ($c->isNewBuilder()) {
+                $row['download_url'] = route($this->portal().'.channels.download', $c);
+            }
+
+            return $row;
        })->values();

        return response()->json([
@@ -88,12 +93,17 @@ class ChannelController extends Controller
        ]);
    }

-    public function randomId()
+    public function randomId(Request $request)
    {
+        $builderType = strtolower(trim((string) $request->query('builder_type', Channel::BUILDER_OLD)));
+        $channelId = $builderType === Channel::BUILDER_NEW
+            ? Channel::randomNewChannelId()
+            : Channel::randomChannelId();
+
        return response()->json([
            'code' => 0,
            'msg' => '',
-            'data' => ['channel_id' => Channel::randomChannelId()],
+            'data' => ['channel_id' => $channelId],
        ]);
    }

@@ -101,8 +111,17 @@ class ChannelController extends Controller
    {
        abort_if($this->isAgentPortal(), 403);

+        $builderType = strtolower(trim((string) $request->input('builder_type', Channel::BUILDER_OLD)));
+        if (! in_array($builderType, [Channel::BUILDER_OLD, Channel::BUILDER_NEW], true)) {
+            $builderType = Channel::BUILDER_OLD;
+        }
+
+        $channelIdRule = $builderType === Channel::BUILDER_NEW
+            ? ['required', 'string', 'size:'.Channel::NEW_CHANNEL_ID_LENGTH, 'regex:/^[A-Za-z0-9]+$/']
+            : ['required', 'string', 'size:32', 'regex:/^[a-z0-9]+$/', Rule::unique('channels', 'channel_id')];
+
        $data = $request->validate([
-            'channel_id' => ['required', 'string', 'size:32', 'regex:/^[a-z0-9]+$/', Rule::unique('channels', 'channel_id')],
+            'channel_id' => $channelIdRule,
            'builder_type' => ['nullable', 'string', Rule::in([Channel::BUILDER_OLD, Channel::BUILDER_NEW])],
            'user_id' => ['nullable', 'integer', 'min:0'],
            'support_template' => ['nullable', 'string', Rule::in(ChannelProjectService::SUPPORT_TEMPLATES)],
@@ -112,13 +131,23 @@ class ChannelController extends Controller
            'status' => ['nullable', 'integer', Rule::in([0, 1])],
        ]);

+        if ($builderType === Channel::BUILDER_NEW) {
+            $normalized = Channel::normalizeNewChannelId((string) $data['channel_id']);
+            if ($normalized === null) {
+                throw ValidationException::withMessages(['channel_id' => '新版渠道 ID 必须是 8 位字母或数字']);
+            }
+            $data['channel_id'] = $normalized;
+            if (Channel::query()->whereRaw('upper(channel_id) = ?', [$normalized])->exists()) {
+                throw ValidationException::withMessages(['channel_id' => '渠道 ID 已存在']);
+            }
+        }
+
        $userId = (int) ($data['user_id'] ?? Channel::OFFICIAL_USER_ID);
        if ($userId > 0 && ! User::query()->whereKey($userId)->exists()) {
            throw ValidationException::withMessages(['user_id' => '代理用户不存在']);
        }

-        $builderType = (string) ($data['builder_type'] ?? Channel::BUILDER_OLD);
-        $channelName = null;
+        $builderType = (string) ($data['builder_type'] ?? $builderType);
        $supportTemplate = (string) ($data['support_template'] ?? ChannelProjectService::DEFAULT_SUPPORT_TEMPLATE);
        $this->assertAgentChannelQuota($userId);

@@ -129,9 +158,7 @@ class ChannelController extends Controller
                $data['deployment_seed'] ?? null,
                $data['reporting_seed'] ?? null,
                $builderType,
-                $channelName,
            );
-            $channelName = $build['channel_name'] ?? null;
        } catch (\Throwable $e) {
            return response()->json([
                'code' => 1,
@@ -140,7 +167,7 @@ class ChannelController extends Controller
        }

        try {
-            $channel = DB::transaction(function () use ($data, $userId, $builderType, $channelName) {
+            $channel = DB::transaction(function () use ($data, $userId, $builderType) {
                if ($userId > 0) {
                    $userExists = User::query()->lockForUpdate()->whereKey($userId)->exists();
                    if (! $userExists) {
@@ -153,7 +180,6 @@ class ChannelController extends Controller
                return Channel::query()->create([
                    'channel_id' => $data['channel_id'],
                    'builder_type' => $builderType,
-                    'channel_name' => $channelName,
                    'user_id' => $userId,
                    'domains' => [],
                    'remark' => $data['remark'] ?? null,
@@ -161,7 +187,7 @@ class ChannelController extends Controller
                ]);
            });
        } catch (\Throwable $e) {
-            $this->compensateBuildUnlessChannelExists($projects, $data['channel_id'], $builderType, $channelName);
+            $this->compensateBuildUnlessChannelExists($projects, $data['channel_id'], $builderType);

            return response()->json([
                'code' => 1,
@@ -175,7 +201,6 @@ class ChannelController extends Controller
            'data' => [
                'id' => $channel->id,
                'builder_type' => $channel->builderType(),
-                'channel_name' => $channel->channel_name,
                'links' => $channel->supportLinks(),
                'seeds' => $build['seeds'],
                'domains' => $build['domains'],
@@ -184,6 +209,10 @@ class ChannelController extends Controller
                'support_path' => $build['support_path'] ?? $channel->landingPath(),
                'weifile_path' => $build['weifile_path'] ?? null,
                'daily_path' => $build['daily_path'] ?? '',
+                'zip_path' => $build['zip_path'] ?? null,
+                'download_url' => $channel->isNewBuilder()
+                    ? route('admin.channels.download', $channel)
+                    : null,
            ],
        ]);
    }
@@ -236,6 +265,19 @@ class ChannelController extends Controller
        ]);
    }

+    public function download(Channel $channel, ChannelProjectService $projects)
+    {
+        $this->authorizeChannel($channel);
+        abort_unless($channel->isNewBuilder(), 404);
+
+        $path = $projects->newChannelZipPath($channel->channel_id);
+        abort_unless(is_file($path), 404, '安装包不存在，请重新创建渠道');
+
+        return response()->download($path, $channel->channel_id.'.zip', [
+            'Content-Type' => 'application/zip',
+        ]);
+    }
+
    public function destroy(Channel $channel, ChannelProjectService $projects)
    {
        abort_if($this->isAgentPortal(), 403);
@@ -243,11 +285,10 @@ class ChannelController extends Controller

        $channelId = $channel->channel_id;
        $builderType = $channel->builderType();
-        $channelName = $channel->channel_name;
        try {
            // Delete remotely first: a failed remote delete leaves the DB row available
            // for a safe retry instead of orphaning an unreachable static project.
-            $projects->deleteWebTree($channelId, $builderType, $channelName);
+            $projects->deleteWebTree($channelId, $builderType);
            DB::transaction(static fn () => $channel->delete());
        } catch (\Throwable $e) {
            return response()->json([
@@ -288,7 +329,6 @@ class ChannelController extends Controller
        ChannelProjectService $projects,
        string $channelId,
        string $builderType = Channel::BUILDER_OLD,
-        ?string $channelName = null,
    ): void {
        try {
            // A concurrent request may have won the unique channel_id insert. Its
@@ -306,12 +346,11 @@ class ChannelController extends Controller
        }

        try {
-            $projects->deleteWebTree($channelId, $builderType, $channelName);
+            $projects->deleteWebTree($channelId, $builderType);
        } catch (\Throwable $e) {
            Log::error('Failed to compensate channel build', [
                'channel_id' => $channelId,
                'builder_type' => $builderType,
-                'channel_name' => $channelName,
                'error' => $e->getMessage(),
            ]);
        }