前端页面调整

This commit is contained in:
2026-06-10 14:18:40 +08:00
parent 9516adc810
commit eb33f534f5
4 changed files with 65 additions and 12 deletions
+13 -11
View File
@@ -1,12 +1,12 @@
// Package httpx 内的 spa.go 提供 SPA 静态资源 + 404 fallback。 // Package httpx 内的 spa.go 提供 SPA 静态资源 + 404 fallback。
// 命中文件直接 ServeFile;不存在但路径无后缀视为前端路由,回退 index.html; // 命中文件直接 ServeFile;不存在且最后一段无扩展名视为前端路由,回退 index.html;
// /api/ 前缀始终返回 404(避免把 API 拼写错误掩盖成 HTML)。 // /api/ 前缀始终返回 404(避免把 API 拼写错误掩盖成 HTML)。
package httpx package httpx
import ( import (
"errors"
"io/fs" "io/fs"
"net/http" "net/http"
stdpath "path"
"strings" "strings"
) )
@@ -18,16 +18,18 @@ func NewSPAHandler(distFS fs.FS) http.Handler {
http.NotFound(w, r) http.NotFound(w, r)
return return
} }
path := strings.TrimPrefix(r.URL.Path, "/") // Trim 两侧斜杠:带尾斜杠的路径(如 /p/x/w/)对 fs.Stat 是非法 fs 路径,
if path == "" { // 返回 ErrInvalid 而非 ErrNotExist,必须先归一化才能正确触发回退。
path = "index.html" name := strings.Trim(r.URL.Path, "/")
if name == "" {
name = "index.html"
} }
if _, err := fs.Stat(distFS, path); err != nil { if _, err := fs.Stat(distFS, name); err != nil && stdpath.Ext(name) == "" {
if errors.Is(err, fs.ErrNotExist) && !strings.Contains(path, ".") { // 前端路由:直接发 index.html 内容,不能改写 r.URL.Path 再走
r.URL.Path = "/index.html" // fileServer——FileServer 会把 /index.html 301 重定向到 "./",
fileServer.ServeHTTP(w, r) // 深层路由刷新会被改写成带尾斜杠的错误 URL。
return http.ServeFileFS(w, r, distFS, "index.html")
} return
} }
fileServer.ServeHTTP(w, r) fileServer.ServeHTTP(w, r)
}) })
+46
View File
@@ -0,0 +1,46 @@
package httpx
import (
"net/http/httptest"
"strings"
"testing"
"testing/fstest"
)
func TestSPAHandler(t *testing.T) {
distFS := fstest.MapFS{
"index.html": {Data: []byte("<html>app</html>")},
"assets/app.js": {Data: []byte("console.log(1)")},
}
h := NewSPAHandler(distFS)
tests := []struct {
name string
path string
wantStatus int
wantBody string
}{
{"根路径返回 index", "/", 200, "<html>app</html>"},
{"静态文件直接命中", "/assets/app.js", 200, "console.log(1)"},
{"前端路由回退 index", "/p/TestProject/w/main", 200, "<html>app</html>"},
{"带尾斜杠的前端路由也回退 index", "/p/TestProject/w/", 200, "<html>app</html>"},
{"不存在的带扩展名文件返回 404", "/assets/missing.js", 404, ""},
{"api 前缀不回退", "/api/v1/unknown", 404, ""},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
rec := httptest.NewRecorder()
h.ServeHTTP(rec, httptest.NewRequest("GET", tt.path, nil))
if rec.Code != tt.wantStatus {
t.Fatalf("status = %d, want %d", rec.Code, tt.wantStatus)
}
if tt.wantBody != "" && strings.TrimSpace(rec.Body.String()) != tt.wantBody {
t.Fatalf("body = %q, want %q", rec.Body.String(), tt.wantBody)
}
// 回退必须直接 200 返回内容,禁止 301 ./ 重定向(会把深层路由改写成尾斜杠 URL)
if rec.Code == 301 || rec.Code == 302 {
t.Fatalf("unexpected redirect to %q", rec.Header().Get("Location"))
}
})
}
}
+5
View File
@@ -175,6 +175,11 @@ const routes: RouteRecordRaw[] = [
component: () => import('@/views/admin/AgentKindEditView.vue'), component: () => import('@/views/admin/AgentKindEditView.vue'),
meta: { requiresAuth: true, requiresAdmin: true }, meta: { requiresAuth: true, requiresAdmin: true },
}, },
{
// 兜底:匹配不到的路径(如空参数的 /p/x/w/、手输错误 URL)统一回首页,避免白屏
path: '/:pathMatch(.*)*',
redirect: '/',
},
] ]
const router = createRouter({ const router = createRouter({
+1 -1
View File
@@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted } from 'vue' import { onMounted } from 'vue'
import { useAcpStore } from '@/stores/acp' import { useAcpStore } from '@/stores/acp'
import AppShell from '@/components/layout/AppShell.vue' import AppShell from '@/layouts/AppShell.vue'
import SessionStatusBadge from '@/components/acp/SessionStatusBadge.vue' import SessionStatusBadge from '@/components/acp/SessionStatusBadge.vue'
const store = useAcpStore() const store = useAcpStore()