From 10f19a5c1d39f36520e5870cd1246d160dca1ce7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 22 Dec 2025 14:47:34 +0000 Subject: [PATCH] Update websocket and frontend to support base URL Co-authored-by: whyour <22700758+whyour@users.noreply.github.com> --- back/loaders/sock.ts | 3 ++- src/utils/http.tsx | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/back/loaders/sock.ts b/back/loaders/sock.ts index 2d1eb8a7..81a38d83 100644 --- a/back/loaders/sock.ts +++ b/back/loaders/sock.ts @@ -5,9 +5,10 @@ import SockService from '../services/sock'; import { getPlatform } from '../config/util'; import { shareStore } from '../shared/store'; import { isValidToken } from '../shared/auth'; +import config from '../config'; export default async ({ server }: { server: Server }) => { - const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} }); + const echo = sockJs.createServer({ prefix: `${config.baseUrl}/api/ws`, log: () => {} }); const sockService = Container.get(SockService); echo.on('connection', async (conn) => { diff --git a/src/utils/http.tsx b/src/utils/http.tsx index b25f3646..2a4ff01f 100644 --- a/src/utils/http.tsx +++ b/src/utils/http.tsx @@ -83,7 +83,7 @@ let _request = axios.create({ params: { t: time }, }); -const apiWhiteList = [ +const apiWhiteListBase = [ '/api/user/login', '/open/auth/token', '/api/user/two-factor/login', @@ -92,6 +92,8 @@ const apiWhiteList = [ '/api/user/notification/init', ]; +const apiWhiteList = apiWhiteListBase.map(path => `${config.baseUrl}${path.replace(/^\//, '')}`); + _request.interceptors.request.use((_config) => { const token = localStorage.getItem(config.authKey); if (token && !apiWhiteList.includes(_config.url!)) {