1.修复矿建鉴权报错

2.优化登录跳转接口
3.优化登录跳转接口
4.修复CURD生成代码模块表不加前缀访问返回404问题
5.系统级报错***优化报错Fatal error: Type of app\common\library\token\TokenExpirationException::$message

app/admin/controller/auth/Admin.php

@@ -42,11 +42,23 @@ class Admin extends Backend
         }
 
         list($where, $alias, $limit, $order) = $this->queryBuilder();
-        $res = $this->model
+        $query = $this->model
             ->withoutField('login_failure,password,salt')
             ->withJoin($this->withJoinTable, $this->withJoinType)
             ->alias($alias)
-            ->where($where)
+            ->where($where);
+
+        // 仅返回“顶级角色组(pid=0)”下的管理员（用于远程下拉等场景）
+        $topGroup = $request->get('top_group') ?? $request->post('top_group');
+        if ($topGroup === '1' || $topGroup === 1 || $topGroup === true) {
+            $query = $query
+                ->join('admin_group_access aga', $alias['admin'] . '.id = aga.uid')
+                ->join('admin_group ag', 'aga.group_id = ag.id')
+                ->where('ag.pid', 0)
+                ->distinct(true);
+        }
+
+        $res = $query
             ->order($order)
             ->paginate($limit);
 
@@ -57,6 +69,76 @@ class Admin extends Backend
         ]);
     }
 
+    /**
+     * 远程下拉（重写：支持 top_group=1 仅返回顶级组管理员）
+     */
+    protected function _select(): Response
+    {
+        if (empty($this->model)) {
+            return $this->success('', [
+                'list'  => [],
+                'total' => 0,
+            ]);
+        }
+
+        $pk = $this->model->getPk();
+
+        $fields = [$pk];
+        $quickSearchArr = is_array($this->quickSearchField) ? $this->quickSearchField : explode(',', (string) $this->quickSearchField);
+        foreach ($quickSearchArr as $f) {
+            $f = trim((string) $f);
+            if ($f === '') continue;
+            $f = str_contains($f, '.') ? substr($f, strrpos($f, '.') + 1) : $f;
+            if ($f !== '' && !in_array($f, $fields, true)) {
+                $fields[] = $f;
+            }
+        }
+
+        list($where, $alias, $limit, $order) = $this->queryBuilder();
+        $modelTable = strtolower($this->model->getTable());
+        $mainAlias = ($alias[$modelTable] ?? $modelTable) . '.';
+
+        // 联表时避免字段歧义：主表字段统一 select 为 "admin.xxx as xxx"
+        $selectFields = [];
+        foreach ($fields as $f) {
+            $f = trim((string) $f);
+            if ($f === '') continue;
+            $selectFields[] = $mainAlias . $f . ' as ' . $f;
+        }
+
+        // 联表时避免排序字段歧义：无前缀的字段默认加主表前缀
+        $qualifiedOrder = [];
+        if (is_array($order)) {
+            foreach ($order as $k => $v) {
+                $k = (string) $k;
+                $qualifiedOrder[str_contains($k, '.') ? $k : ($mainAlias . $k)] = $v;
+            }
+        }
+
+        $query = $this->model
+            ->field($selectFields)
+            ->alias($alias)
+            ->where($where);
+
+        $topGroup = $this->request ? ($this->request->get('top_group') ?? $this->request->post('top_group')) : null;
+        if ($topGroup === '1' || $topGroup === 1 || $topGroup === true) {
+            $query = $query
+                ->join('admin_group_access aga', $mainAlias . 'id = aga.uid')
+                ->join('admin_group ag', 'aga.group_id = ag.id')
+                ->where('ag.pid', 0)
+                ->distinct(true);
+        }
+
+        $res = $query
+            ->order($qualifiedOrder ?: $order)
+            ->paginate($limit);
+
+        return $this->success('', [
+            'list'  => $res->items(),
+            'total' => $res->total(),
+        ]);
+    }
+
     public function add(Request $request): Response
     {
         $response = $this->initializeBackend($request);

app/admin/controller/game/Channel.php

@@ -4,6 +4,7 @@ namespace app\admin\controller\game;
 
 use Throwable;
 use app\common\controller\Backend;
+use support\think\Db;
 use support\Response;
 use Webman\Http\Request as WebmanRequest;
 
@@ -31,6 +32,238 @@ class Channel extends Backend
         return null;
     }
 
+    /**
+     * 渠道-管理员树（父级=渠道，子级=管理员，仅可选择子级）
+     */
+    public function adminTree(WebmanRequest $request): Response
+    {
+        $response = $this->initializeBackend($request);
+        if ($response !== null) return $response;
+
+        $channels = Db::name('game_channel')
+            ->field(['id', 'name', 'admin_group_id'])
+            ->order('id', 'asc')
+            ->select()
+            ->toArray();
+
+        $groupChildrenCache = [];
+        $getGroupChildren = function ($groupId) use (&$getGroupChildren, &$groupChildrenCache) {
+            if ($groupId === null || $groupId === '') return [];
+            if (array_key_exists($groupId, $groupChildrenCache)) return $groupChildrenCache[$groupId];
+            $children = Db::name('admin_group')
+                ->where('pid', $groupId)
+                ->where('status', 1)
+                ->column('id');
+            $all = [];
+            foreach ($children as $cid) {
+                $all[] = $cid;
+                foreach ($getGroupChildren($cid) as $cc) {
+                    $all[] = $cc;
+                }
+            }
+            $groupChildrenCache[$groupId] = $all;
+            return $all;
+        };
+
+        $tree = [];
+        foreach ($channels as $ch) {
+            $groupId = $ch['admin_group_id'] ?? null;
+            $groupIds = [];
+            if ($groupId !== null && $groupId !== '') {
+                $groupIds[] = $groupId;
+                foreach ($getGroupChildren($groupId) as $gid) {
+                    $groupIds[] = $gid;
+                }
+            }
+
+            $adminIds = [];
+            if ($groupIds) {
+                $adminIds = Db::name('admin_group_access')
+                    ->where('group_id', 'in', array_unique($groupIds))
+                    ->column('uid');
+            }
+            $adminIds = array_values(array_unique($adminIds));
+
+            $admins = [];
+            if ($adminIds) {
+                $admins = Db::name('admin')
+                    ->field(['id', 'username'])
+                    ->where('id', 'in', $adminIds)
+                    ->order('id', 'asc')
+                    ->select()
+                    ->toArray();
+            }
+
+            $children = [];
+            foreach ($admins as $a) {
+                $children[] = [
+                    'value'      => (string) $a['id'],
+                    'label'      => $a['username'],
+                    'channel_id' => $ch['id'],
+                    'is_leaf'    => true,
+                ];
+            }
+
+            $tree[] = [
+                'value'    => 'channel_' . $ch['id'],
+                'label'    => $ch['name'],
+                'disabled' => true,
+                'children' => $children,
+            ];
+        }
+
+        return $this->success('', [
+            'list' => $tree,
+        ]);
+    }
+
+    /**
+     * 添加（重写：管理员只选顶级组；admin_group_id 后端自动写入）
+     * @throws Throwable
+     */
+    protected function _add(): Response
+    {
+        if ($this->request && $this->request->method() === 'POST') {
+            $data = $this->request->post();
+            if (!$data) {
+                return $this->error(__('Parameter %s can not be empty', ['']));
+            }
+
+            $data = $this->applyInputFilter($data);
+            $data = $this->excludeFields($data);
+
+            $adminId = $data['admin_id'] ?? null;
+            if ($adminId === null || $adminId === '') {
+                return $this->error(__('Parameter %s can not be empty', ['admin_id']));
+            }
+
+            // 不允许前端填写，统一后端根据管理员所属“顶级角色组(pid=0)”自动回填
+            if (array_key_exists('admin_group_id', $data)) {
+                unset($data['admin_group_id']);
+            }
+
+            $topGroupId = Db::name('admin_group_access')
+                ->alias('aga')
+                ->join('admin_group ag', 'aga.group_id = ag.id')
+                ->where('aga.uid', $adminId)
+                ->where('ag.pid', 0)
+                ->value('ag.id');
+
+            if ($topGroupId === null || $topGroupId === '') {
+                return $this->error(__('Record not found'));
+            }
+            $data['admin_group_id'] = $topGroupId;
+
+            if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
+                $data[$this->dataLimitField] = $this->auth->id;
+            }
+
+            $result = false;
+            $this->model->startTrans();
+            try {
+                if ($this->modelValidate) {
+                    $validate = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                    if (class_exists($validate)) {
+                        $validate = new $validate();
+                        if ($this->modelSceneValidate) {
+                            $validate->scene('add');
+                        }
+                        $validate->check($data);
+                    }
+                }
+                $result = $this->model->save($data);
+                $this->model->commit();
+            } catch (Throwable $e) {
+                $this->model->rollback();
+                return $this->error($e->getMessage());
+            }
+            if ($result !== false) {
+                return $this->success(__('Added successfully'));
+            }
+            return $this->error(__('No rows were added'));
+        }
+
+        return $this->error(__('Parameter error'));
+    }
+
+    /**
+     * 编辑（重写：管理员只选顶级组；admin_group_id 后端自动写入）
+     * @throws Throwable
+     */
+    protected function _edit(): Response
+    {
+        $pk = $this->model->getPk();
+        $id = $this->request ? ($this->request->post($pk) ?? $this->request->get($pk)) : null;
+        $row = $this->model->find($id);
+        if (!$row) {
+            return $this->error(__('Record not found'));
+        }
+
+        $dataLimitAdminIds = $this->getDataLimitAdminIds();
+        if ($dataLimitAdminIds && !in_array($row[$this->dataLimitField], $dataLimitAdminIds)) {
+            return $this->error(__('You have no permission'));
+        }
+
+        if ($this->request && $this->request->method() === 'POST') {
+            $data = $this->request->post();
+            if (!$data) {
+                return $this->error(__('Parameter %s can not be empty', ['']));
+            }
+
+            $data = $this->applyInputFilter($data);
+            $data = $this->excludeFields($data);
+
+            // 不允许前端填写，统一后端根据管理员所属“顶级角色组(pid=0)”自动回填
+            if (array_key_exists('admin_group_id', $data)) {
+                unset($data['admin_group_id']);
+            }
+
+            $nextAdminId = array_key_exists('admin_id', $data) ? $data['admin_id'] : ($row['admin_id'] ?? null);
+            if ($nextAdminId !== null && $nextAdminId !== '') {
+                $topGroupId = Db::name('admin_group_access')
+                    ->alias('aga')
+                    ->join('admin_group ag', 'aga.group_id = ag.id')
+                    ->where('aga.uid', $nextAdminId)
+                    ->where('ag.pid', 0)
+                    ->value('ag.id');
+
+                if ($topGroupId === null || $topGroupId === '') {
+                    return $this->error(__('Record not found'));
+                }
+                $data['admin_group_id'] = $topGroupId;
+            }
+
+            $result = false;
+            $this->model->startTrans();
+            try {
+                if ($this->modelValidate) {
+                    $validate = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                    if (class_exists($validate)) {
+                        $validate = new $validate();
+                        if ($this->modelSceneValidate) {
+                            $validate->scene('edit');
+                        }
+                        $data[$pk] = $row[$pk];
+                        $validate->check($data);
+                    }
+                }
+                $result = $row->save($data);
+                $this->model->commit();
+            } catch (Throwable $e) {
+                $this->model->rollback();
+                return $this->error($e->getMessage());
+            }
+            if ($result !== false) {
+                return $this->success(__('Update successful'));
+            }
+            return $this->error(__('No rows updated'));
+        }
+
+        return $this->success('', [
+            'row' => $row
+        ]);
+    }
+
     /**
      * 查看
      * @throws Throwable

app/admin/controller/game/User.php

@@ -167,6 +167,8 @@ class User extends Backend
             return $this->error(__('No rows updated'));
         }
 
+        // GET: 返回编辑数据时，剔除敏感字段
+        unset($row['password'], $row['salt'], $row['token'], $row['refresh_token']);
         return $this->success('', [
             'row' => $row
         ]);

app/admin/library/crud/Helper.php

@@ -802,8 +802,8 @@ class Helper
         $indexVueData['defaultItems'] = self::getJsonFromArray($indexVueData['defaultItems'] ?? []);
         $indexVueData['tableColumn'] = self::buildTableColumn($indexVueData['tableColumn'] ?? []);
         $indexVueData['dblClickNotEditColumn'] = self::buildSimpleArray($indexVueData['dblClickNotEditColumn'] ?? ['undefined']);
-        $controllerFile['path'][] = $controllerFile['originalLastName'];
-        $indexVueData['controllerUrl'] = '\'/admin/' . ($controllerFile['path'] ? implode('.', $controllerFile['path']) : '') . '/\'';
+        $urlSegments = array_merge($controllerFile['path'], [$controllerFile['originalLastName']]);
+        $indexVueData['controllerUrl'] = '\'/admin/' . ($urlSegments ? implode('.', array_map('strtolower', $urlSegments)) : '') . '/\'';
         $indexVueData['componentName'] = ($webViewsDir['path'] ? implode('/', $webViewsDir['path']) . '/' : '') . $webViewsDir['originalLastName'];
         $indexVueContent = self::assembleStub('html/index', $indexVueData);
         self::writeFile(root_path() . $webViewsDir['views'] . '/' . 'index.vue', $indexVueContent);

app/admin/validate/mall/Player.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace app\admin\validate\mall;
-
-use think\Validate;
-
-class Player extends Validate
-{
-    protected $failException = true;
-
-    /**
-     * 验证规则
-     */
-    protected $rule = [
-    ];
-
-    /**
-     * 提示消息
-     */
-    protected $message = [
-    ];
-
-    /**
-     * 验证场景
-     */
-    protected $scene = [
-        'add'  => [],
-        'edit' => [],
-    ];
-
-}

app/api/controller/Install.php

@@ -668,7 +668,7 @@ class Install extends Api
 
     /**
      * 获取安装完成后的访问地址（根据请求来源区分 API 与前端开发模式）
-     * - 通过 API 访问（8787）：index.html#/admin、index.html#/
+     * - 通过 API 访问（8787）：index#/admin、index#/（无 index 与 # 之间的斜杠）
      * - 通过前端开发服务访问（1818）：/#/admin、/#/
      */
     public function accessUrls(Request $request): Response
@@ -680,7 +680,8 @@ class Install extends Api
             $port = substr($host, strrpos($host, ':') + 1);
         }
         $scheme = $request->header('x-forwarded-proto', 'http');
-        $base = rtrim($scheme . '://' . $host, '/');
+        $basePath = $request instanceof \support\Request ? $request->publicBasePath() : '';
+        $base = rtrim($scheme . '://' . $host, '/') . $basePath;
 
         if ($port === '1818') {
             $adminUrl = $base . '/#/admin';

app/common/controller/Backend.php

@@ -142,9 +142,14 @@ class Backend extends Api
 
         if ($needLogin) {
             if (!$this->auth->isLogin()) {
+                if ($request->method() === 'GET' && !$this->expectsApiJsonResponse($request)) {
+                    $location = $this->adminSpaLoginUrl($request);
+                    return redirect($location);
+                }
+                // 必须使用 HTTP 200 返回 JSON：若用 HTTP 303，axios 会跟随重定向，拿不到 JSON，前端无法跳转登录
                 return $this->error(__('Please login first'), [
                     'type' => Auth::NEED_LOGIN,
-                ], 0, ['statusCode' => Auth::LOGIN_RESPONSE_CODE]);
+                ], 0);
             }
             if ($needPermission) {
                 $controllerPath = $this->getControllerPath($request);
@@ -167,6 +172,37 @@ class Backend extends Api
         return null;
     }
 
+    /**
+     * 是否应按 API 返回 JSON（前端 axios 会带 server: true；纯浏览器地址栏访问多为 HTML Accept）
+     */
+    protected function expectsApiJsonResponse(WebmanRequest $request): bool
+    {
+        $server = $request->header('server', '');
+        if ($server === 'true' || $server === '1') {
+            return true;
+        }
+        if (strtolower($request->header('x-requested-with', '')) === 'xmlhttprequest') {
+            return true;
+        }
+        $accept = strtolower($request->header('accept', ''));
+        if (str_contains($accept, 'application/json')) {
+            return true;
+        }
+        // 浏览器地址栏/点击链接触发的主文档请求，优先 302 到前端登录（避免误判为 API）
+        if (strtolower((string) $request->header('sec-fetch-mode', '')) === 'navigate') {
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * 后台 Vue 为 hash 路由时的登录页（相对路径，与 web/src/router 一致）
+     */
+    protected function adminSpaLoginUrl(WebmanRequest $request): string
+    {
+        return '/#/admin/login';
+    }
+
     /**
      * 子类可覆盖，用于初始化 model 等（替代原 initialize）
      * @return Response|null 需直接返回时返回 Response，否则 null

app/common/library/token/TokenExpirationException.php

@@ -11,12 +11,15 @@ use Exception;
  */
 class TokenExpirationException extends Exception
 {
+    protected array $data = [];
+
     public function __construct(
-        protected string $message = '',
-        protected int $code = 409,
-        protected array $data = [],
+        string $message = '',
+        int $code = 409,
+        array $data = [],
         ?\Throwable $previous = null
     ) {
+        $this->data = $data;
         parent::__construct($message, $code, $previous);
     }
 

app/common/validate/MallItem.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace app\common\validate;
-
-use think\Validate;
-
-class MallItem extends Validate
-{
-    protected $failException = true;
-
-    /**
-     * 验证规则
-     */
-    protected $rule = [
-    ];
-
-    /**
-     * 提示消息
-     */
-    protected $message = [
-    ];
-
-    /**
-     * 验证场景
-     */
-    protected $scene = [
-        'add'  => [],
-        'edit' => [],
-    ];
-
-}

app/common/validate/MallWalletRecord.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace app\common\validate;
-
-use think\Validate;
-
-class MallWalletRecord extends Validate
-{
-    protected $failException = true;
-
-    /**
-     * 验证规则
-     */
-    protected $rule = [
-    ];
-
-    /**
-     * 提示消息
-     */
-    protected $message = [
-    ];
-
-    /**
-     * 验证场景
-     */
-    protected $scene = [
-        'add'  => [],
-        'edit' => [],
-    ];
-
-}

app/functions.php

@@ -204,7 +204,24 @@ if (!function_exists('get_controller_path')) {
         if (count($parts) < 2) {
             return $parts[0] ?? null;
         }
-        return implode('/', array_slice($parts, 1, -1)) ?: $parts[1];
+        $segments = array_slice($parts, 1, -1);
+        if ($segments === []) {
+            return $parts[1] ?? null;
+        }
+        // ThinkPHP 风格段 game.Config -> game/config，与 $request->controller 解析结果一致（否则权限节点对不上）
+        $normalized = [];
+        foreach ($segments as $seg) {
+            if (str_contains($seg, '.')) {
+                $dotPos = strpos($seg, '.');
+                $mod = substr($seg, 0, $dotPos);
+                $ctrl = substr($seg, $dotPos + 1);
+                $normalized[] = strtolower($mod);
+                $normalized[] = strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $ctrl));
+            } else {
+                $normalized[] = strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $seg));
+            }
+        }
+        return implode('/', $normalized);
     }
 }
 

config/route.php

@@ -245,6 +245,34 @@ Route::get('/admin/security/dataRecycleLog/index', [\app\admin\controller\securi
 Route::post('/admin/security/dataRecycleLog/restore', [\app\admin\controller\security\DataRecycleLog::class, 'restore']);
 Route::get('/admin/security/dataRecycleLog/info', [\app\admin\controller\security\DataRecycleLog::class, 'info']);
 
+// ==================== CRUD 生成的根级控制器（/admin/item/index 或 /admin/Item/index，无子目录、无点号） ====================
+// 显式路由在上，此处作为兜底；与 /admin/module.controller/action 互补
+Route::add(
+    ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'],
+    '/admin/{controller:[a-zA-Z][a-zA-Z0-9]*}/{action}',
+    function (\Webman\Http\Request $request, string $controller, string $action) {
+        $class = '\\app\\admin\\controller\\' . ucfirst(strtolower($controller));
+        if (!class_exists($class)) {
+            return new Response(404, ['Content-Type' => 'application/json'], json_encode(['code' => 404, 'msg' => '404 Not Found', 'data' => []], JSON_UNESCAPED_UNICODE));
+        }
+        if (!method_exists($class, $action)) {
+            return new Response(404, ['Content-Type' => 'application/json'], json_encode(['code' => 404, 'msg' => '404 Not Found', 'data' => []], JSON_UNESCAPED_UNICODE));
+        }
+        $request->controller = $class;
+        try {
+            $instance = new $class();
+            return $instance->$action($request);
+        } catch (\Throwable $e) {
+            return new Response(500, ['Content-Type' => 'application/json'], json_encode([
+                'code' => 0,
+                'msg'  => $e->getMessage(),
+                'time' => time(),
+                'data' => null,
+            ], JSON_UNESCAPED_UNICODE));
+        }
+    }
+);
+
 // ==================== 兼容 ThinkPHP 风格 URL（module.Controller/action） ====================
 // 前端使用 /admin/user.Rule/index 格式，需转换为控制器调用
 Route::add(

database/migrations/20230620180916_install_data.php

@@ -231,8 +231,17 @@ class InstallData extends AbstractMigration
 
     public function menuRule(): void
     {
-        if (!$this->hasTable('menu_rule')) return;
-        $table = $this->table('menu_rule');
+        // Install 迁移在已存在 admin_rule（旧版表名）时会跳过创建 menu_rule，此处需与之一致
+        $ruleTable = null;
+        if ($this->hasTable('menu_rule')) {
+            $ruleTable = 'menu_rule';
+        } elseif ($this->hasTable('admin_rule')) {
+            $ruleTable = 'admin_rule';
+        }
+        if ($ruleTable === null) {
+            return;
+        }
+        $table = $this->table($ruleTable);
         $rows  = [
             [
                 'id'         => '1',
@@ -1155,7 +1164,7 @@ class InstallData extends AbstractMigration
                 'createtime' => $this->nowTime,
             ],
         ];
-        $exist = Db::name('menu_rule')->where('id', 1)->value('id');
+        $exist = Db::name($ruleTable)->where('id', 1)->value('id');
         if (!$exist) {
             $table->insert($rows)->saveData();
         }

phinx-bootstrap.php

@@ -13,11 +13,7 @@ if (!defined('BASE_PATH')) {
 require $baseDir . '/vendor/autoload.php';
 
 if (class_exists('Dotenv\Dotenv') && is_file($baseDir . '/.env')) {
-    if (method_exists('Dotenv\Dotenv', 'createUnsafeImmutable')) {
-        Dotenv\Dotenv::createUnsafeImmutable($baseDir)->load();
-    } else {
     Dotenv\Dotenv::createMutable($baseDir)->load();
-    }
 }
 
 if (!function_exists('env')) {

phinx.php

@@ -10,11 +10,8 @@ $baseDir = __DIR__;
 require $baseDir . '/vendor/autoload.php';
 
 if (class_exists('Dotenv\Dotenv') && is_file($baseDir . '/.env')) {
-    if (method_exists('Dotenv\Dotenv', 'createUnsafeImmutable')) {
-        Dotenv\Dotenv::createUnsafeImmutable($baseDir)->load();
-    } else {
+    // 必须用 Mutable：Webman Worker 已加载过时，Immutable 不会覆盖 $_ENV，会导致 Phinx 与 Db::name() 前缀/库名不一致
     Dotenv\Dotenv::createMutable($baseDir)->load();
-    }
 }
 
 if (!function_exists('env')) {

public/install/index.html

@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="en">
-    <head>
+<head>
     <meta charset="UTF-8" />
     <link rel="icon" href="/install/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -107,7 +107,7 @@
                 if (!urls.adminUrl && !urls.frontUrl) return;
                 document.querySelectorAll('input[type="text"], input:not([type])').forEach(function(inp){
                     var v = (inp.value || '').trim();
-              if (v && (v.indexOf('#/admin') >= 0 || v.indexOf('index.html') >= 0) && v.indexOf('#/') >= 0) {
+                    if (v && (v.indexOf('#/admin') >= 0 || v.indexOf('index.html') >= 0 || v.indexOf('/index#') >= 0) && v.indexOf('#/') >= 0) {
                         inp.value = urls.adminUrl;
                         inp.dispatchEvent(new Event('input', { bubbles: true }));
                     }
@@ -116,6 +116,22 @@
                 document.querySelectorAll('a[href*="#/"]').forEach(function(a){
                     if (urls.frontUrl && a.href.indexOf('#/admin') < 0) a.href = urls.frontUrl;
                 });
+                // index.html/#/ 会被当成路径 /index.html/ 导致 webman 404，统一为 index.html#/
+                document.querySelectorAll('a[href*="index.html/#"]').forEach(function(a){
+                    a.href = a.href.replace(/index\.html\/#\//g, 'index.html#/');
+                });
+                // 打包的 index.js 完成页用 protocol+host 拼 adminUrl，会漏掉 /index.php 等前缀；用接口结果覆盖展示与点击
+                if (urls.adminUrl) {
+                    document.querySelectorAll('.admin-url').forEach(function(el){
+                        el.textContent = urls.adminUrl;
+                        el.style.cursor = 'pointer';
+                        el.onclick = function(ev){
+                            ev.preventDefault();
+                            ev.stopPropagation();
+                            window.open(urls.adminUrl, '_blank', 'noreferrer');
+                        };
+                    });
+                }
                 ensureQuickPanel();
             }
             if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', function(){ setInterval(applyUrls, 800); });
@@ -140,8 +156,8 @@
     </script>
     <script type="module" crossorigin src="/install/assets/index.js"></script>
     <link rel="stylesheet" crossorigin href="/install/assets/index.css">
-    </head>
-    <body>
-        <div id="app"></div>
-    </body>
+</head>
+<body>
+<div id="app"></div>
+</body>
 </html>

support/Request.php

@@ -35,6 +35,18 @@ class Request extends \Webman\Http\Request
         return $path;
     }
 
+    /**
+     * 入口为 /index.php/... 时返回 /index.php，用于拼接后台/前台完整 URL（与路由 path() 剥离规则对应）
+     */
+    public function publicBasePath(): string
+    {
+        $path = parent::path();
+        if (str_starts_with($path, '/index.php')) {
+            return '/index.php';
+        }
+        return '';
+    }
+
     /**
      * 获取请求参数（兼容 ThinkPHP param，合并 get/post，post 优先）
      * @param string|null $name 参数名，null 返回全部

web/src/stores/terminal.ts

@@ -100,6 +100,16 @@ export const useTerminal = defineStore(
         }
 
         function addTask(command: string, blockOnFailure = true, extend = '', callback: Function = () => {}) {
+            const duplicatePending = state.taskList.some(
+                (item) =>
+                    item.command === command &&
+                    (item.status === taskStatus.Waiting ||
+                        item.status === taskStatus.Connecting ||
+                        item.status === taskStatus.Executing)
+            )
+            if (duplicatePending) {
+                return
+            }
             if (!state.show) toggleDot(true)
             state.taskList = state.taskList.concat({
                 uuid: uuid(),

web/src/utils/axios.ts

@@ -1,6 +1,7 @@
 import type { AxiosRequestConfig, Method } from 'axios'
 import axios from 'axios'
 import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
+import { nextTick } from 'vue'
 import { refreshToken } from '/@/api/common'
 import { i18n } from '/@/lang/index'
 import router from '/@/router/index'
@@ -20,6 +21,12 @@ const loadingInstance: LoadingInstance = {
     count: 0,
 }
 
+/** 请求是否后台 /admin/ 接口（不依赖当前路由，避免 loading 等场景误判为前台） */
+function isAdminBackendRequest(config: AxiosRequestConfig): boolean {
+    const u = `${config.baseURL ?? ''}${config.url ?? ''}`
+    return /\/admin\//i.test(u)
+}
+
 /**
  * 根据运行环境获取基础请求URL
  */
@@ -112,6 +119,22 @@ function createAxios<Data = any, T = ApiPromise<Data>>(axiosConfig: AxiosRequest
 
             if (response.config.responseType == 'json') {
                 if (response.data && response.data.code !== 1) {
+                    const needLogin = response.data.data && typeof response.data.data === 'object' && response.data.data.type === 'need login'
+                    if (needLogin) {
+                        const isAdminAppFlag = isAdminApp() || isAdminBackendRequest(response.config)
+                        if (isAdminAppFlag) {
+                            adminInfo.removeToken()
+                        } else {
+                            userInfo.removeToken()
+                        }
+                        const loginRouteName = isAdminAppFlag ? 'adminLogin' : 'userLogin'
+                        if (router.currentRoute.value.name !== loginRouteName) {
+                            nextTick(() => {
+                                void router.replace({ name: loginRouteName })
+                            })
+                        }
+                        return Promise.reject(response.data)
+                    }
                     if (response.data.code == 409) {
                         if (!window.tokenRefreshing) {
                             window.tokenRefreshing = true

web/src/views/backend/game/channel/popupForm.vue

@@ -60,20 +60,12 @@
                         @keyup.ctrl.enter="baTable.onSubmit(formRef)"
                         :placeholder="t('Please input field', { field: t('game.channel.remark') })"
                     />
-                    <FormItem
-                        :label="t('game.channel.admin_group_id')"
-                        type="remoteSelect"
-                        v-model="baTable.form.items!.admin_group_id"
-                        prop="admin_group_id"
-                        :input-attr="{ pk: 'admin_group.id', field: 'name', remoteUrl: '/admin/auth.Group/index' }"
-                        :placeholder="t('Please select field', { field: t('game.channel.admin_group_id') })"
-                    />
                     <FormItem
                         :label="t('game.channel.admin_id')"
                         type="remoteSelect"
                         v-model="baTable.form.items!.admin_id"
                         prop="admin_id"
-                        :input-attr="{ pk: 'admin.id', field: 'username', remoteUrl: '/admin/auth.Admin/index' }"
+                        :input-attr="{ pk: 'admin.id', field: 'username', remoteUrl: '/admin/auth.Admin/index', params: { top_group: '1' } }"
                         :placeholder="t('Please select field', { field: t('game.channel.admin_id') })"
                     />
                 </el-form>
@@ -110,7 +102,6 @@ const rules: Partial<Record<string, FormItemRule[]>> = reactive({
     name: [buildValidatorData({ name: 'required', title: t('game.channel.name') })],
     user_count: [buildValidatorData({ name: 'integer', title: t('game.channel.user_count') })],
     profit_amount: [buildValidatorData({ name: 'float', title: t('game.channel.profit_amount') })],
-    admin_group_id: [buildValidatorData({ name: 'required', title: t('game.channel.admin_group_id') })],
     admin_id: [buildValidatorData({ name: 'required', title: t('game.channel.admin_id') })],
     create_time: [buildValidatorData({ name: 'date', title: t('game.channel.create_time') })],
     update_time: [buildValidatorData({ name: 'date', title: t('game.channel.update_time') })],

web/src/views/backend/game/user/index.vue

@@ -90,10 +90,18 @@ const baTable = new baTableClass(
                 prop: 'admin.username',
                 align: 'center',
                 minWidth: 90,
+                effect: 'plain',
                 operatorPlaceholder: t('Fuzzy query'),
                 render: 'tags',
                 operator: 'LIKE',
                 comSearchRender: 'string',
+                //修改tag颜色
+                customRenderAttr: {
+                    tag: () => ({
+                        color: '#e8f3ff',
+                        style: { color: '#1677ff', borderColor: '#91caff' },
+                    }),
+                },
             },
             {
                 label: t('game.user.remark'),

web/src/views/backend/game/user/popupForm.vue

@@ -75,22 +75,19 @@
                         prop="status"
                         :input-attr="{ content: { '0': t('game.user.status 0'), '1': t('game.user.status 1') } }"
                     />
-                    <FormItem
-                        :label="t('game.user.game_channel_id')"
-                        type="remoteSelect"
-                        v-model="baTable.form.items!.game_channel_id"
-                        prop="game_channel_id"
-                        :input-attr="{ pk: 'game_channel.id', field: 'name', remoteUrl: '/admin/game.Channel/index' }"
-                        :placeholder="t('Please select field', { field: t('game.user.game_channel_id') })"
-                    />
-                    <FormItem
-                        :label="t('game.user.admin_id')"
-                        type="remoteSelect"
+                    <el-form-item :label="t('game.user.game_channel_id')" prop="admin_id">
+                        <el-tree-select
                             v-model="baTable.form.items!.admin_id"
-                        prop="admin_id"
-                        :input-attr="{ pk: 'admin.id', field: 'username', remoteUrl: '/admin/auth.Admin/index' }"
+                            class="w100"
+                            clearable
+                            filterable
+                            :data="channelAdminTree"
+                            :props="treeProps"
+                            :render-after-expand="false"
                             :placeholder="t('Please select field', { field: t('game.user.admin_id') })"
+                            @change="onAdminTreeChange"
                         />
+                    </el-form-item>
                 </el-form>
             </div>
         </el-scrollbar>
@@ -107,12 +104,13 @@
 
 <script setup lang="ts">
 import type { FormItemRule } from 'element-plus'
-import { inject, reactive, useTemplateRef } from 'vue'
+import { inject, onMounted, reactive, ref, useTemplateRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import FormItem from '/@/components/formItem/index.vue'
 import { useConfig } from '/@/stores/config'
 import type baTableClass from '/@/utils/baTable'
-import { buildValidatorData } from '/@/utils/validate'
+import { buildValidatorData, regularPassword } from '/@/utils/validate'
+import createAxios from '/@/utils/axios'
 
 const config = useConfig()
 const formRef = useTemplateRef('formRef')
@@ -120,15 +118,92 @@ const baTable = inject('baTable') as baTableClass
 
 const { t } = useI18n()
 
+type TreeNode = {
+    value: string
+    label: string
+    disabled?: boolean
+    children?: TreeNode[]
+    channel_id?: number
+    is_leaf?: boolean
+}
+
+const channelAdminTree = ref<TreeNode[]>([])
+const adminIdToChannelId = ref<Record<string, number>>({})
+
+const treeProps = {
+    value: 'value',
+    label: 'label',
+    children: 'children',
+    disabled: 'disabled',
+}
+
+const loadChannelAdminTree = async () => {
+    const res = await createAxios({
+        url: '/admin/game.Channel/adminTree',
+        method: 'get',
+    })
+    const list = (res.data?.list ?? []) as TreeNode[]
+    channelAdminTree.value = list
+
+    const map: Record<string, number> = {}
+    const walk = (nodes: TreeNode[]) => {
+        for (const n of nodes) {
+            if (n.children && n.children.length) {
+                walk(n.children)
+            } else if (n.is_leaf && n.channel_id !== undefined) {
+                map[n.value] = n.channel_id
+            }
+        }
+    }
+    walk(list)
+    adminIdToChannelId.value = map
+}
+
+const onAdminTreeChange = (val: string | number | null) => {
+    if (val === null || val === undefined || val === '') {
+        return
+    }
+    const key = typeof val === 'number' ? String(val) : val
+    const channelId = adminIdToChannelId.value[key]
+    if (channelId !== undefined) {
+        baTable.form.items!.game_channel_id = channelId
+    }
+}
+
+onMounted(() => {
+    loadChannelAdminTree()
+})
+
+watch(
+    () => baTable.form.items?.admin_id,
+    (val) => {
+        if (val === undefined || val === null || val === '') return
+        onAdminTreeChange(val as any)
+    }
+)
+
+const validatorGameUserPassword = (rule: any, val: string, callback: (error?: Error) => void) => {
+    const operate = baTable.form.operate
+    const v = typeof val === 'string' ? val.trim() : ''
+
+    // 新增：必填
+    if (operate === 'Add') {
+        if (!v) return callback(new Error(t('Please input field', { field: t('game.user.password') })))
+        if (!regularPassword(v)) return callback(new Error(t('validate.Please enter the correct password')))
+        return callback()
+    }
+
+    // 编辑：可空；非空则校验格式
+    if (!v) return callback()
+    if (!regularPassword(v)) return callback(new Error(t('validate.Please enter the correct password')))
+    return callback()
+}
+
 const rules: Partial<Record<string, FormItemRule[]>> = reactive({
     username: [buildValidatorData({ name: 'required', title: t('game.user.username') })],
-    password: [
-        buildValidatorData({ name: 'password', title: t('game.user.password') }),
-        buildValidatorData({ name: 'required', title: t('game.user.password') }),
-    ],
+    password: [{ validator: validatorGameUserPassword, trigger: 'blur' }],
     phone: [buildValidatorData({ name: 'required', title: t('game.user.phone') })],
     coin: [buildValidatorData({ name: 'number', title: t('game.user.coin') })],
-    game_channel_id: [buildValidatorData({ name: 'required', title: t('game.user.game_channel_id') })],
     admin_id: [buildValidatorData({ name: 'required', title: t('game.user.admin_id') })],
     create_time: [buildValidatorData({ name: 'date', title: t('game.user.create_time') })],
     update_time: [buildValidatorData({ name: 'date', title: t('game.user.update_time') })],