update

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 node_modules
-/dist
-/dist_electron
+/app/dist
+/app/dist_electron
 
 
 # local env files

electron.build.js → app/electron.build.js

@@ -1,21 +1,24 @@
+// https://www.electron.build/tutorials/two-package-structure
+
 const fs = require('fs')
+const path = require('path')
 const axios = require('axios')
 const { exec } = require('child_process')
 const { build } = require('electron-builder')
 
-const fileContents = fs.readFileSync('dist/config/appconfig.json', 'utf-8')
+const getPath = (dir) => path.resolve(__dirname, dir)
+const outputDir = getPath('dist_electron') // 打包输出目录
+const fileContents = fs.readFileSync(getPath('dist/config/appconfig.json'), 'utf-8')
 const appConfig = JSON.parse(fileContents)
 
+// 打包之前清空目录
+exec('rd/s/q ' + outputDir)
 
-const package = fs.readFileSync('package.json', 'utf-8')
+// 打包自动修改版本号
+const package = fs.readFileSync(getPath('package.json'), 'utf-8')
 const pkg = JSON.parse(package)
 pkg.version = appConfig.version
-fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2))
-
-
-
-// 打包之前清空目录
-exec('rd/s/q dist_electron')
+fs.writeFileSync(getPath('package.json'), JSON.stringify(pkg, null, 2))
 
 axios.get(appConfig.apiUrl).then((res) => {
     const data = res.data.data
@@ -24,7 +27,7 @@ axios.get(appConfig.apiUrl).then((res) => {
     const config = {
         productName: appConfig.appName,
         directories: {
-            output: 'dist_electron'
+            output: outputDir
         },
         files: [
             'dist',
@@ -35,7 +38,7 @@ axios.get(appConfig.apiUrl).then((res) => {
             allowToChangeInstallationDirectory: true
         },
         win: {
-            icon: 'dist/favicon.ico',
+            icon: getPath('dist/favicon.ico'),
             target: [
                 'nsis'
             ]

main.js → app/main.js

@@ -1,4 +1,5 @@
 const fs = require('fs')
+const path = require('path')
 const yaml = require('js-yaml')
 const { app, BrowserWindow, Menu, dialog } = require('electron')
 const { autoUpdater } = require('electron-updater')
@@ -10,6 +11,7 @@ const updateHandle = (win) => {
 
         if (data.url) {
             autoUpdater.autoDownload = false
+            autoUpdater.autoInstallOnAppQuit = false
 
             autoUpdater.setFeedURL({
                 provider: data.provider,
@@ -79,11 +81,11 @@ const createWindow = () => {
         center: true,
         minWidth: 1280,
         minHeight: 800,
-        icon: 'dist/favicon.ico'
+        icon: path.resolve(__dirname, 'dist/favicon.ico')
     })
 
     win.maximize()
-    win.loadFile('dist/index.html')
+    win.loadFile(path.resolve(__dirname, 'dist/index.html'))
     win.on('ready-to-show', () => updateHandle(win))
 }
 

app/package-lock.json

@@ -0,0 +1,172 @@
+{
+  "name": "muchinfo",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "muchinfo",
+      "version": "1.0.0",
+      "dependencies": {
+        "electron-updater": "^6.1.4",
+        "js-yaml": "^4.1.0"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    },
+    "node_modules/builder-util-runtime": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.1.tgz",
+      "integrity": "sha512-2rLv/uQD2x+dJ0J3xtsmI12AlRyk7p45TEbE/6o/fbb633e/S3pPgm+ct+JHsoY7r39dKHnGEFk/AASRFdnXmA==",
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/electron-updater": {
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz",
+      "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==",
+      "dependencies": {
+        "builder-util-runtime": "9.2.1",
+        "fs-extra": "^10.1.0",
+        "js-yaml": "^4.1.0",
+        "lazy-val": "^1.0.5",
+        "lodash.escaperegexp": "^4.1.2",
+        "lodash.isequal": "^4.5.0",
+        "semver": "^7.3.8",
+        "tiny-typed-emitter": "^2.1.0"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
+      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/lazy-val": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz",
+      "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="
+    },
+    "node_modules/lodash.escaperegexp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz",
+      "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tiny-typed-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz",
+      "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA=="
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    }
+  }
+}

app/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "muchinfo",
+  "version": "1.0.0",
+  "main": "main.js",
+  "dependencies": {
+    "electron-updater": "^6.1.4",
+    "js-yaml": "^4.1.0"
+  }
+}

oem/qdhs/manifest.json

@@ -5,9 +5,9 @@
     "name" : "青岛海商",
     /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.0.3",
+        "name" : "1.0.4",
         /*应用版本名称*/
-        "code" : 100003
+        "code" : 100004
     },
     "description" : "",
     /*应用描述信息*/

oem/qxst/config/appconfig.json

@@ -1,7 +1,7 @@
 {
   "appName": "贵茶数字化",
-  "version": "1.0.5",
-  "versionCode": "100005",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "version": "1.0.0",
+  "versionCode": "100000",
+  "apiUrl": "http://8.130.72.213:8280/cfg?key=mtp_20",
   "shwoRegister": true
 }

package.json

@@ -1,8 +1,8 @@
 {
   "name": "muchinfo",
-  "version": "1.0.1",
+  "version": "1.0.0",
   "private": true,
-  "main": "main.js",
+  "main": "app/main.js",
   "scripts": {
     "dev:pc": "vue-cli-service serve --mode pc",
     "dev:mobile": "vue-cli-service serve --mode mobile",
@@ -27,7 +27,7 @@
     "build:tc@pc": "vue-cli-service build --mode tc@pc",
     "lint": "vue-cli-service lint",
     "dev": "electron .",
-    "build": "node electron.build.js"
+    "build": "node app/electron.build.js"
   },
   "dependencies": {
     "@tinymce/tinymce-vue": "^5.0.0",
@@ -38,12 +38,10 @@
     "crypto-js": "^4.1.1",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.4.3",
-    "electron-updater": "^6.1.4",
     "element-plus": "^2.3.8",
     "hqchart": "^1.1.12450",
     "html5-qrcode": "^2.2.5",
     "jquery": "^3.7.1",
-    "js-yaml": "^4.1.0",
     "long": "^5.2.0",
     "moment": "^2.29.3",
     "photoswipe": "^5.3.6",
@@ -87,4 +85,4 @@
     "vconsole": "^3.14.6",
     "worker-loader": "^3.0.8"
   }
-}
+}

vue.config.js

@@ -9,6 +9,7 @@ module.exports = defineConfig({
   transpileDependencies: [/node_modules/],
   productionSourceMap: false, // 打包取消.map
   publicPath: './',
+  outputDir: './app/dist',
   pages: {
     indexPath: {
       entry: process.env.VUE_APP_ROOT + 'main.ts',
@@ -62,7 +63,7 @@ module.exports = defineConfig({
         patterns: [
           {
             from: resolve(__dirname, oem), // 指定目录
-            to: resolve(__dirname, './dist'), // 目标目录
+            to: resolve(__dirname, './app/dist'), // 目标目录
             force: true, // 强制覆盖文件
           }
         ]