From f8acabca7a9fad094718c93c3c49a83f7ae4b599 Mon Sep 17 00:00:00 2001 From: starknt <1431880400@qq.com> Date: Sat, 19 Oct 2024 13:13:46 +0800 Subject: [PATCH] feat: restore the proxy with Windows when restart --- packages/gui/src/background.js | 6 ++++-- packages/gui/src/background/powerMonitor.js | 2 +- packages/gui/vue.config.js | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/gui/src/background.js b/packages/gui/src/background.js index 1e9d5fb..dc26640 100644 --- a/packages/gui/src/background.js +++ b/packages/gui/src/background.js @@ -8,6 +8,8 @@ import backend from './bridge/backend' import DevSidecar from '@docmirror/dev-sidecar' import log from './utils/util.log' import minimist from 'minimist' + +const isWindows = process.platform === 'win32' // eslint-disable-next-line no-unused-vars const isMac = process.platform === 'darwin' // import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer' @@ -188,7 +190,7 @@ function createWindow (startHideWindow) { Menu.setApplicationMenu(null) win.setMenu(null) // !!IMPORTANT - if(process.platform === 'win32') { + if(isWindows) { powerMonitor.setupMainWindow(win) } @@ -448,7 +450,7 @@ if (!isFirstInstance) { } powerMonitor.on('shutdown', async (e) => { - if(process.platform !== 'win32') + if(e) e.preventDefault() log.info('系统关机,恢复代理设置') await quit() diff --git a/packages/gui/src/background/powerMonitor.js b/packages/gui/src/background/powerMonitor.js index edf85e0..53bcf97 100644 --- a/packages/gui/src/background/powerMonitor.js +++ b/packages/gui/src/background/powerMonitor.js @@ -1,5 +1,5 @@ import { powerMonitor as _powerMonitor, BrowserWindow } from 'electron' -import { setMainWindowHandle, insertWndProcHook, removeWndProcHook, acquireShutdownBlock, releaseShutdownBlock } from '@natmri/platform-napi' +import { setMainWindowHandle, insertWndProcHook, removeWndProcHook, releaseShutdownBlock, acquireShutdownBlock } from '@natmri/platform-napi'; class PowerMonitor { constructor() { diff --git a/packages/gui/vue.config.js b/packages/gui/vue.config.js index 775996b..94f2fd3 100644 --- a/packages/gui/vue.config.js +++ b/packages/gui/vue.config.js @@ -82,8 +82,8 @@ module.exports = { } }, win: { - icon: 'build/icons/' - // requestedExecutionLevel: 'highestAvailable' // 加了这个无法开机自启 + icon: 'build/icons/', + requestedExecutionLevel: 'highestAvailable' // 加了这个无法开机自启 }, linux: { icon: 'build/mac/',