diff --git a/apps/admin/src/api.ts b/apps/admin/src/api.ts index 38669f6..32dcd35 100644 --- a/apps/admin/src/api.ts +++ b/apps/admin/src/api.ts @@ -3,7 +3,7 @@ import router from './router'; import { clearStaffSession, reconcileStaffSessionFromToken, useAuthStore } from './stores/auth'; import { ensureStaffSession, resetStaffSessionHydration } from './utils/session-hydrate'; -const api = axios.create({ baseURL: '/admin/api' }); +const api = axios.create({ baseURL: '/api' }); let handling401 = false; let handling403Portal = false; diff --git a/apps/admin/src/router/index.ts b/apps/admin/src/router/index.ts index cb4e613..1a5647c 100644 --- a/apps/admin/src/router/index.ts +++ b/apps/admin/src/router/index.ts @@ -3,7 +3,7 @@ import { useAuthStore } from '../stores/auth'; import { ensureStaffSession } from '../utils/session-hydrate'; const router = createRouter({ - history: createWebHistory('/admin'), + history: createWebHistory(), routes: [ { path: '/login', component: () => import('../views/Login.vue'), meta: { public: true } }, { diff --git a/apps/admin/vite.config.ts b/apps/admin/vite.config.ts index 0a04aca..395196d 100644 --- a/apps/admin/vite.config.ts +++ b/apps/admin/vite.config.ts @@ -3,7 +3,6 @@ import vue from '@vitejs/plugin-vue'; import { resolve } from 'path'; export default defineConfig({ - base: '/admin/', plugins: [vue()], resolve: { // 避免 src 内遗留的 .js 抢先于 .ts/.vue 被解析(曾导致 i18n 文案缺失) @@ -16,12 +15,6 @@ export default defineConfig({ publicDir: resolve(__dirname, '../../packages/shared/public'), server: { port: 5174, - proxy: { - '/admin/api': { - target: 'http://localhost:3000', - changeOrigin: true, - rewrite: (path) => path.replace(/^\/admin\/api/, '/api'), - }, - }, + proxy: { '/api': { target: 'http://localhost:3000', changeOrigin: true } }, }, }); diff --git a/docker/admin/Dockerfile b/docker/admin/Dockerfile index 721ee95..0ca6634 100644 --- a/docker/admin/Dockerfile +++ b/docker/admin/Dockerfile @@ -10,7 +10,7 @@ COPY apps/api/package.json apps/api/ COPY apps/player/package.json apps/player/ COPY apps/admin/package.json apps/admin/ COPY packages/shared/package.json packages/shared/ -RUN pnpm install --frozen-lockfile +RUN pnpm install --no-frozen-lockfile FROM base AS builder WORKDIR /app diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile index 99453d3..a9509a1 100644 --- a/docker/api/Dockerfile +++ b/docker/api/Dockerfile @@ -10,7 +10,7 @@ COPY apps/api/package.json apps/api/ COPY apps/player/package.json apps/player/ COPY apps/admin/package.json apps/admin/ COPY packages/shared/package.json packages/shared/ -RUN pnpm install --frozen-lockfile +RUN pnpm install --no-frozen-lockfile FROM base AS builder WORKDIR /app diff --git a/docker/nginx/admin.conf b/docker/nginx/admin.conf index fbb4568..c98df63 100644 --- a/docker/nginx/admin.conf +++ b/docker/nginx/admin.conf @@ -9,8 +9,8 @@ server { gzip on; gzip_types text/plain text/css application/json application/javascript text/xml application/xml; - location /admin/api/ { - proxy_pass http://api:3000/api/; + location /api/ { + proxy_pass http://api:3000; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -18,16 +18,7 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } - location /admin/ { - alias /usr/share/nginx/html/; - try_files $uri $uri/ @admin_spa; - } - - location @admin_spa { - rewrite ^ /index.html break; - } - - location = / { - return 301 /admin/; + location / { + try_files $uri $uri/ /index.html; } } diff --git a/docker/player/Dockerfile b/docker/player/Dockerfile index 4f1d513..c2bcfb8 100644 --- a/docker/player/Dockerfile +++ b/docker/player/Dockerfile @@ -10,7 +10,7 @@ COPY apps/api/package.json apps/api/ COPY apps/player/package.json apps/player/ COPY apps/admin/package.json apps/admin/ COPY packages/shared/package.json packages/shared/ -RUN pnpm install --frozen-lockfile +RUN pnpm install --no-frozen-lockfile FROM base AS builder WORKDIR /app