diff --git a/packages/gui/.env.build-pre b/packages/gui/.env.build-pre new file mode 100644 index 00000000..bf4e9ec4 --- /dev/null +++ b/packages/gui/.env.build-pre @@ -0,0 +1,3 @@ +VUE_APP_PUBLISH_URL=http://dev-sidecar.docmirror.cn/update/preview/ +VUE_APP_PUBLISH_PROVIDER=generic +VUE_APP_IS_BUILD=true diff --git a/packages/gui/.env.pre b/packages/gui/.env.pre index 54fb8f0a..c4560c21 100644 --- a/packages/gui/.env.pre +++ b/packages/gui/.env.pre @@ -1,2 +1,3 @@ VUE_APP_PUBLISH_URL=http://dev-sidecar.docmirror.cn/update/preview/ -VUE_APP_PUBLISH_PROVIDER=generic \ No newline at end of file +VUE_APP_PUBLISH_PROVIDER=generic +VUE_APP_IS_BUILD=false \ No newline at end of file diff --git a/packages/gui/package.json b/packages/gui/package.json index d4064dfe..ecab5042 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar-gui", - "version": "1.6.0", + "version": "1.5.0", "private": false, "license": "MPL-2.0", "main": "background.js", @@ -8,7 +8,7 @@ "serve": "vue-cli-service serve", "lint": "vue-cli-service lint", "electron:build": "vue-cli-service electron:build", - "electron:build:pre": "vue-cli-service electron:build --mode pre", + "electron:build:pre": "vue-cli-service electron:build --mode build-pre", "electron": "vue-cli-service electron:serve", "electron:pre": "vue-cli-service electron:serve --mode pre", "postinstall": "electron-builder install-app-deps", diff --git a/packages/gui/src/bridge/update/backend.js b/packages/gui/src/bridge/update/backend.js index d780d212..b5564e48 100644 --- a/packages/gui/src/bridge/update/backend.js +++ b/packages/gui/src/bridge/update/backend.js @@ -48,7 +48,9 @@ function updateHandle (app, api, win, beforeQuit, quit, log) { updateNotAva: '当前为最新版本,无需更新' } // 本地开发环境,改变app-update.yml地址 - if (process.env.NODE_ENV === 'development') { + const isBuild = process.env.VUE_APP_IS_BUILD + console.log('is build', isBuild, process.env.NODE_ENV === 'development' && isBuild !== 'true') + if (process.env.NODE_ENV === 'development' && isBuild !== 'true') { // const publishUrl = process.env.VUE_APP_PUBLISH_URL // autoUpdater.setFeedURL({ // provider: 'generic', @@ -63,7 +65,7 @@ function updateHandle (app, api, win, beforeQuit, quit, log) { } } - console.log('auto updater', autoUpdater.getFeedURL()) + logger.info('auto updater', autoUpdater.getFeedURL()) autoUpdater.autoDownload = false let partPackagePath = null @@ -102,6 +104,8 @@ function updateHandle (app, api, win, beforeQuit, quit, log) { if (platform === 'mac') { target = path.join(appPath, 'Resources') } + const length = fs.statSync(partPackagePath) + log.info('安装包大小:', length) log.info('开始解压缩,安装升级包', partPackagePath, target) diff --git a/packages/gui/src/utils/util.apppath.js b/packages/gui/src/utils/util.apppath.js index 8a400f14..a6832c91 100644 --- a/packages/gui/src/utils/util.apppath.js +++ b/packages/gui/src/utils/util.apppath.js @@ -1,11 +1,7 @@ import path from 'path' -const isDevelopment = process.env.NODE_ENV !== 'production' export default { getAppRootPath (app) { - if (isDevelopment) { - return app.getAppPath() - } else { - return path.join(app.getAppPath(), '../../') - } + const exePath = app.getPath('exe') + return path.join(exePath, '../') } }