From a00abed20b978a9aa0c6719bb98541c01829988b Mon Sep 17 00:00:00 2001 From: Chen Gu Date: Sat, 9 May 2026 07:59:50 +0800 Subject: [PATCH] fix: Electron dev URL fallback to localhost:5173 --- electron/main.js | 15 ++++++++------- electron/main.ts | 16 ++++++++++------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/electron/main.js b/electron/main.js index bc1d161..c81d37d 100644 --- a/electron/main.js +++ b/electron/main.js @@ -75,13 +75,14 @@ function createWindow() { devTools: true, }, }); - if (process.env.VITE_DEV_SERVER_URL) { - mainWindow.loadURL(process.env.VITE_DEV_SERVER_URL); - mainWindow.webContents.openDevTools({ mode: 'detach' }); - } - else { - mainWindow.loadFile(path.join(__dirname, '../dist/index.html')); - } + // 优先从 VITE_DEV_SERVER_URL 加载,否则尝试 localhost:5173,最后用 dist 文件 + const devUrl = process.env.VITE_DEV_SERVER_URL || 'http://localhost:5173'; + // 尝试加载 dev server + mainWindow.loadURL(devUrl).catch(() => { + console.log('[main] Dev server not available, loading dist...'); + mainWindow?.loadFile(path.join(__dirname, '../dist/index.html')); + }); + mainWindow.webContents.openDevTools({ mode: 'detach' }); } // === IPC: 系统优化 === electron_1.ipcMain.handle('optimize:list', async () => { diff --git a/electron/main.ts b/electron/main.ts index 5f5cc70..444df81 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -43,12 +43,16 @@ function createWindow() { }, }); - if (process.env.VITE_DEV_SERVER_URL) { - mainWindow.loadURL(process.env.VITE_DEV_SERVER_URL); - mainWindow.webContents.openDevTools({ mode: 'detach' }); - } else { - mainWindow.loadFile(path.join(__dirname, '../dist/index.html')); - } + // 优先从 VITE_DEV_SERVER_URL 加载,否则尝试 localhost:5173,最后用 dist 文件 + const devUrl = process.env.VITE_DEV_SERVER_URL || 'http://localhost:5173'; + + // 尝试加载 dev server + mainWindow.loadURL(devUrl).catch(() => { + console.log('[main] Dev server not available, loading dist...'); + mainWindow?.loadFile(path.join(__dirname, '../dist/index.html')); + }); + + mainWindow.webContents.openDevTools({ mode: 'detach' }); } // === IPC: 系统优化 ===