1.修复矿建鉴权报错

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

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'];
+        $urlSegments = array_merge($controllerFile['path'], [$controllerFile['originalLastName']]);
-        $indexVueData['controllerUrl'] = '\'/admin/' . ($controllerFile['path'] ? implode('.', $controllerFile['path']) : '') . '/\'';
+        $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/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 = '',
+        string $message = '',
-        protected int $code = 409,
+        int $code = 409,
-        protected array $data = [],
+        array $data = [],
         ?\Throwable $previous = null
     ) {
+        $this->data = $data;
         parent::__construct($message, $code, $previous);
     }
 

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;
+        // Install 迁移在已存在 admin_rule（旧版表名）时会跳过创建 menu_rule，此处需与之一致
-        $table = $this->table('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::createMutable($baseDir)->load();
-        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')) {
+    // 必须用 Mutable：Webman Worker 已加载过时，Immutable 不会覆盖 $_ENV，会导致 Phinx 与 Db::name() 前缀/库名不一致
-        Dotenv\Dotenv::createUnsafeImmutable($baseDir)->load();
+    Dotenv\Dotenv::createMutable($baseDir)->load();
-    } else {
-        Dotenv\Dotenv::createMutable($baseDir)->load();
-    }
 }
 
 if (!function_exists('env')) {

public/install/index.html

@@ -1,147 +1,163 @@
 <!doctype html>
 <html lang="en">
-    <head>
+<head>
-        <meta charset="UTF-8" />
+    <meta charset="UTF-8" />
-        <link rel="icon" href="/install/favicon.ico" />
+    <link rel="icon" href="/install/favicon.ico" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>BuildAdmin-安装</title>
+    <title>BuildAdmin-安装</title>
-      <script>
+    <script>
         (function(){
-          var urls = { adminUrl: '', frontUrl: '' };
+            var urls = { adminUrl: '', frontUrl: '' };
-          fetch('/api/install/accessUrls').then(function(r){return r.json();}).then(function(res){
+            fetch('/api/install/accessUrls').then(function(r){return r.json();}).then(function(res){
-            if (res && res.data) { urls.adminUrl = res.data.adminUrl || ''; urls.frontUrl = res.data.frontUrl || ''; }
+                if (res && res.data) { urls.adminUrl = res.data.adminUrl || ''; urls.frontUrl = res.data.frontUrl || ''; }
-          }).catch(function(){});
+            }).catch(function(){});
-          function ensureQuickPanel() {
+            function ensureQuickPanel() {
-            if (!urls.adminUrl && !urls.frontUrl) return;
+                if (!urls.adminUrl && !urls.frontUrl) return;
-            if (document.getElementById('__ba_install_quick_urls__')) return;
+                if (document.getElementById('__ba_install_quick_urls__')) return;
-            var wrap = document.createElement('div');
+                var wrap = document.createElement('div');
-            wrap.id = '__ba_install_quick_urls__';
+                wrap.id = '__ba_install_quick_urls__';
-            wrap.style.position = 'fixed';
+                wrap.style.position = 'fixed';
-            wrap.style.right = '16px';
+                wrap.style.right = '16px';
-            wrap.style.bottom = '16px';
+                wrap.style.bottom = '16px';
-            wrap.style.zIndex = '99999';
+                wrap.style.zIndex = '99999';
-            wrap.style.maxWidth = '560px';
+                wrap.style.maxWidth = '560px';
-            wrap.style.fontFamily = 'ui-sans-serif, system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji"';
+                wrap.style.fontFamily = 'ui-sans-serif, system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial, "Apple Color Emoji", "Segoe UI Emoji"';
-            wrap.innerHTML =
+                wrap.innerHTML =
-              '<div style="background:rgba(255,255,255,.96);border:1px solid rgba(0,0,0,.08);box-shadow:0 8px 24px rgba(0,0,0,.12);border-radius:12px;overflow:hidden">' +
+                    '<div style="background:rgba(255,255,255,.96);border:1px solid rgba(0,0,0,.08);box-shadow:0 8px 24px rgba(0,0,0,.12);border-radius:12px;overflow:hidden">' +
-                '<div style="padding:10px 12px;border-bottom:1px solid rgba(0,0,0,.06);display:flex;gap:8px;align-items:center;justify-content:space-between">' +
+                    '<div style="padding:10px 12px;border-bottom:1px solid rgba(0,0,0,.06);display:flex;gap:8px;align-items:center;justify-content:space-between">' +
-                  '<div style="font-weight:600;color:#111">安装完成快捷入口</div>' +
+                    '<div style="font-weight:600;color:#111">安装完成快捷入口</div>' +
-                  '<button type="button" aria-label="close" style="border:0;background:transparent;cursor:pointer;font-size:16px;line-height:16px;color:#666;padding:4px 6px">×</button>' +
+                    '<button type="button" aria-label="close" style="border:0;background:transparent;cursor:pointer;font-size:16px;line-height:16px;color:#666;padding:4px 6px">×</button>' +
-                '</div>' +
+                    '</div>' +
-                '<div style="padding:12px;display:flex;flex-direction:column;gap:10px">' +
+                    '<div style="padding:12px;display:flex;flex-direction:column;gap:10px">' +
-                  '<div>' +
+                    '<div>' +
                     '<div style="font-size:12px;color:#666;margin-bottom:6px">后台地址</div>' +
                     '<div style="display:flex;gap:8px;align-items:center;flex-wrap:wrap">' +
-                      '<a data-k="admin" target="_blank" rel="noreferrer" style="color:#1677ff;text-decoration:none;word-break:break-all"></a>' +
+                    '<a data-k="admin" target="_blank" rel="noreferrer" style="color:#1677ff;text-decoration:none;word-break:break-all"></a>' +
-                      '<button data-copy="admin" type="button" style="border:1px solid rgba(0,0,0,.12);background:#fff;border-radius:8px;padding:6px 10px;cursor:pointer">复制</button>' +
+                    '<button data-copy="admin" type="button" style="border:1px solid rgba(0,0,0,.12);background:#fff;border-radius:8px;padding:6px 10px;cursor:pointer">复制</button>' +
                     '</div>' +
-                  '</div>' +
+                    '</div>' +
-                  '<div>' +
+                    '<div>' +
                     '<div style="font-size:12px;color:#666;margin-bottom:6px">前台地址</div>' +
                     '<div style="display:flex;gap:8px;align-items:center;flex-wrap:wrap">' +
-                      '<a data-k="front" target="_blank" rel="noreferrer" style="color:#1677ff;text-decoration:none;word-break:break-all"></a>' +
+                    '<a data-k="front" target="_blank" rel="noreferrer" style="color:#1677ff;text-decoration:none;word-break:break-all"></a>' +
-                      '<button data-copy="front" type="button" style="border:1px solid rgba(0,0,0,.12);background:#fff;border-radius:8px;padding:6px 10px;cursor:pointer">复制</button>' +
+                    '<button data-copy="front" type="button" style="border:1px solid rgba(0,0,0,.12);background:#fff;border-radius:8px;padding:6px 10px;cursor:pointer">复制</button>' +
                     '</div>' +
-                  '</div>' +
+                    '</div>' +
-                  '<div data-msg style="font-size:12px;color:#52c41a;min-height:16px"></div>' +
+                    '<div data-msg style="font-size:12px;color:#52c41a;min-height:16px"></div>' +
-                '</div>' +
+                    '</div>' +
-              '</div>';
+                    '</div>';
-            document.body.appendChild(wrap);
+                document.body.appendChild(wrap);
 
-            var closeBtn = wrap.querySelector('button[aria-label="close"]');
+                var closeBtn = wrap.querySelector('button[aria-label="close"]');
-            if (closeBtn) closeBtn.addEventListener('click', function(){ wrap.remove(); });
+                if (closeBtn) closeBtn.addEventListener('click', function(){ wrap.remove(); });
 
-            function setLink(which, val) {
+                function setLink(which, val) {
-              var a = wrap.querySelector('a[data-k="' + which + '"]');
+                    var a = wrap.querySelector('a[data-k="' + which + '"]');
-              if (!a) return;
+                    if (!a) return;
-              a.textContent = val || '';
+                    a.textContent = val || '';
-              a.href = val || 'javascript:void(0)';
+                    a.href = val || 'javascript:void(0)';
-            }
-            setLink('admin', urls.adminUrl);
-            setLink('front', urls.frontUrl);
-
-            function showMsg(text, ok) {
-              var el = wrap.querySelector('[data-msg]');
-              if (!el) return;
-              el.style.color = ok ? '#52c41a' : '#ff4d4f';
-              el.textContent = text;
-              window.clearTimeout(el.__t);
-              el.__t = window.setTimeout(function(){ el.textContent = ''; }, 1800);
-            }
-            function copyText(text) {
-              if (!text) return Promise.reject(new Error('empty'));
-              if (navigator.clipboard && navigator.clipboard.writeText) {
-                return navigator.clipboard.writeText(text);
-              }
-              return new Promise(function(resolve, reject){
-                try {
-                  var ta = document.createElement('textarea');
-                  ta.value = text;
-                  ta.setAttribute('readonly', 'readonly');
-                  ta.style.position = 'fixed';
-                  ta.style.left = '-9999px';
-                  document.body.appendChild(ta);
-                  ta.select();
-                  var ok = document.execCommand('copy');
-                  document.body.removeChild(ta);
-                  ok ? resolve() : reject(new Error('copy failed'));
-                } catch (e) {
-                  reject(e);
                 }
-              });
+                setLink('admin', urls.adminUrl);
+                setLink('front', urls.frontUrl);
+
+                function showMsg(text, ok) {
+                    var el = wrap.querySelector('[data-msg]');
+                    if (!el) return;
+                    el.style.color = ok ? '#52c41a' : '#ff4d4f';
+                    el.textContent = text;
+                    window.clearTimeout(el.__t);
+                    el.__t = window.setTimeout(function(){ el.textContent = ''; }, 1800);
+                }
+                function copyText(text) {
+                    if (!text) return Promise.reject(new Error('empty'));
+                    if (navigator.clipboard && navigator.clipboard.writeText) {
+                        return navigator.clipboard.writeText(text);
+                    }
+                    return new Promise(function(resolve, reject){
+                        try {
+                            var ta = document.createElement('textarea');
+                            ta.value = text;
+                            ta.setAttribute('readonly', 'readonly');
+                            ta.style.position = 'fixed';
+                            ta.style.left = '-9999px';
+                            document.body.appendChild(ta);
+                            ta.select();
+                            var ok = document.execCommand('copy');
+                            document.body.removeChild(ta);
+                            ok ? resolve() : reject(new Error('copy failed'));
+                        } catch (e) {
+                            reject(e);
+                        }
+                    });
+                }
+                wrap.addEventListener('click', function(e){
+                    var t = e.target;
+                    if (!t || !t.getAttribute) return;
+                    var which = t.getAttribute('data-copy');
+                    if (!which) return;
+                    var text = which === 'admin' ? urls.adminUrl : urls.frontUrl;
+                    copyText(text).then(function(){
+                        showMsg('已复制：' + text, true);
+                    }).catch(function(){
+                        showMsg('复制失败，请手动复制', false);
+                    });
+                });
             }
-            wrap.addEventListener('click', function(e){
+            function applyUrls() {
-              var t = e.target;
+                if (!urls.adminUrl && !urls.frontUrl) return;
-              if (!t || !t.getAttribute) return;
+                document.querySelectorAll('input[type="text"], input:not([type])').forEach(function(inp){
-              var which = t.getAttribute('data-copy');
+                    var v = (inp.value || '').trim();
-              if (!which) return;
+                    if (v && (v.indexOf('#/admin') >= 0 || v.indexOf('index.html') >= 0 || v.indexOf('/index#') >= 0) && v.indexOf('#/') >= 0) {
-              var text = which === 'admin' ? urls.adminUrl : urls.frontUrl;
+                        inp.value = urls.adminUrl;
-              copyText(text).then(function(){
+                        inp.dispatchEvent(new Event('input', { bubbles: true }));
-                showMsg('已复制：' + text, true);
+                    }
-              }).catch(function(){
+                });
-                showMsg('复制失败，请手动复制', false);
+                document.querySelectorAll('a[href*="#/admin"]').forEach(function(a){ if (urls.adminUrl) a.href = urls.adminUrl; });
-              });
+                document.querySelectorAll('a[href*="#/"]').forEach(function(a){
-            });
+                    if (urls.frontUrl && a.href.indexOf('#/admin') < 0) a.href = urls.frontUrl;
-          }
+                });
-          function applyUrls() {
+                // index.html/#/ 会被当成路径 /index.html/ 导致 webman 404，统一为 index.html#/
-            if (!urls.adminUrl && !urls.frontUrl) return;
+                document.querySelectorAll('a[href*="index.html/#"]').forEach(function(a){
-            document.querySelectorAll('input[type="text"], input:not([type])').forEach(function(inp){
+                    a.href = a.href.replace(/index\.html\/#\//g, 'index.html#/');
-              var v = (inp.value || '').trim();
+                });
-              if (v && (v.indexOf('#/admin') >= 0 || v.indexOf('index.html') >= 0) && v.indexOf('#/') >= 0) {
+                // 打包的 index.js 完成页用 protocol+host 拼 adminUrl，会漏掉 /index.php 等前缀；用接口结果覆盖展示与点击
-                inp.value = urls.adminUrl;
+                if (urls.adminUrl) {
-                inp.dispatchEvent(new Event('input', { bubbles: true }));
+                    document.querySelectorAll('.admin-url').forEach(function(el){
-              }
+                        el.textContent = urls.adminUrl;
-            });
+                        el.style.cursor = 'pointer';
-            document.querySelectorAll('a[href*="#/admin"]').forEach(function(a){ if (urls.adminUrl) a.href = urls.adminUrl; });
+                        el.onclick = function(ev){
-            document.querySelectorAll('a[href*="#/"]').forEach(function(a){
+                            ev.preventDefault();
-              if (urls.frontUrl && a.href.indexOf('#/admin') < 0) a.href = urls.frontUrl;
+                            ev.stopPropagation();
-            });
+                            window.open(urls.adminUrl, '_blank', 'noreferrer');
-            ensureQuickPanel();
+                        };
-          }
+                    });
-          if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', function(){ setInterval(applyUrls, 800); });
+                }
-          else setInterval(applyUrls, 800);
+                ensureQuickPanel();
+            }
+            if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', function(){ setInterval(applyUrls, 800); });
+            else setInterval(applyUrls, 800);
         })();
         (function(){
-          function closeMigrateModal() {
+            function closeMigrateModal() {
-            if (!document.body) return;
+                if (!document.body) return;
-            var txt = document.body.innerText || document.body.textContent || '';
+                var txt = document.body.innerText || document.body.textContent || '';
-            if (txt.indexOf('数据表迁移失败') < 0 && txt.indexOf('数据表自动迁移失败') < 0) return;
+                if (txt.indexOf('数据表迁移失败') < 0 && txt.indexOf('数据表自动迁移失败') < 0) return;
-            var btns = document.body.querySelectorAll('button, [role="button"], .el-button');
+                var btns = document.body.querySelectorAll('button, [role="button"], .el-button');
-            for (var i = 0; i < btns.length; i++) {
+                for (var i = 0; i < btns.length; i++) {
-              var b = btns[i];
+                    var b = btns[i];
-              if (b.textContent && b.textContent.indexOf('继续安装') >= 0) { b.click(); return; }
+                    if (b.textContent && b.textContent.indexOf('继续安装') >= 0) { b.click(); return; }
+                }
             }
-          }
+            var obs = new MutationObserver(closeMigrateModal);
-          var obs = new MutationObserver(closeMigrateModal);
+            function start() { if (document.body) { obs.observe(document.body, { childList: true, subtree: true }); closeMigrateModal(); } }
-          function start() { if (document.body) { obs.observe(document.body, { childList: true, subtree: true }); closeMigrateModal(); } }
+            if (document.body) start(); else document.addEventListener('DOMContentLoaded', start);
-          if (document.body) start(); else document.addEventListener('DOMContentLoaded', start);
+            setInterval(closeMigrateModal, 150);
-          setInterval(closeMigrateModal, 150);
         })();
-      </script>
+    </script>
-      <script type="module" crossorigin src="/install/assets/index.js"></script>
+    <script type="module" crossorigin src="/install/assets/index.js"></script>
-      <link rel="stylesheet" crossorigin href="/install/assets/index.css">
+    <link rel="stylesheet" crossorigin href="/install/assets/index.css">
-    </head>
+</head>
-    <body>
+<body>
-        <div id="app"></div>
+<div id="app"></div>
-    </body>
+</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