From 0adaaa5bd6960046c4e47698ae60dfdfaa648fb4 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 19 Sep 2026 01:05:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=93=E5=8C=85=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=B7=A5=E7=89=8C=E6=89=AB=E7=A0=81=E4=B8=8A=E7=BA=BF/?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E3=80=81=E5=A4=9A=E6=88=90=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=8E30=E5=88=86=E9=92=9F=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=99=BB=E5=87=BA=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 打包模式(pages/packaging): - 工牌(base64 JSON)扫码识别,经 index.queryUserByToken 查询用户:同用户已在线则下线,否则绑定为在线成员 - 多成员模型 workbenchMembers:弹窗仅展示成员列表+逐个下线;上报打包携带全部在线成员(users) - 成员列表以服务端 getWorkbenchInfo.members 为准,绑定/下线后静默重拉 - 无在线成员时非工牌码拦截提示需要先登录,不走查询用户 - 带打包台 token 请求 401/403 统一清除工作台状态回登录(请求守卫) - 30 分钟无新打包任务:结束打包任务+下线全部成员(不退出工作台模式,留在当前页) - 移除手动退出工作台入口;扫描记录持久化 localStorage(50 条出入栈) - 操作员列表弹窗重新排版(头像/姓名/下线按钮) 其他: - 登录页扫码/更新流程、导航守卫与路由封装、Electron 主进程/预加载、发布脚本与配置模板(deploy.example.json)等调整 --- .env.example | 1 + .gitignore | 2 + android-offline/pack.ps1 | 78 ++++ config/README.md | 11 +- config/deploy.example.json | 21 + electron/icon.png | Bin 0 -> 38404 bytes electron/main.js | 305 ++++++++++++- electron/preload.js | 12 +- env.js | 10 +- package.json | 2 +- scripts/build-exe.cjs | 93 +++- scripts/gen-android-assets.ps1 | 7 + shims-uni.d.ts | 4 + src/App.vue | 6 +- src/api/index.ts | 2 +- src/api/request.ts | 4 + src/components/top-nav.vue | 55 ++- src/config/env.js | 25 + src/core/nav-guard.js | 131 ++++++ src/core/scan.js | 385 ++++++++++++++++ src/core/update.js | 133 ++++++ src/main.js | 3 + src/manifest.json | 6 + src/pages/index/index.vue | 22 +- src/pages/login/login.vue | 286 +++++++++++- src/pages/order/index.vue | 3 +- src/pages/packaging/index.vue | 781 ++++++++++++++++++-------------- src/pages/returns/index.vue | 3 +- src/pages/weighing/index.vue | 3 +- src/router/uni-simple-router.js | 1 + vite.config.js | 11 +- 31 files changed, 2014 insertions(+), 392 deletions(-) create mode 100644 config/deploy.example.json create mode 100644 electron/icon.png create mode 100644 src/core/nav-guard.js create mode 100644 src/core/scan.js create mode 100644 src/core/update.js create mode 100644 src/router/uni-simple-router.js diff --git a/.env.example b/.env.example index f95d9fb..6d798c9 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,5 @@ # 环境变量模板:复制本文件为 .env.local 并填写真实值(.env.local 不提交 git) # 详见 config/README.md +# 仅开发环境生效:生产构建(electron/Android 打包)固定使用 https://qimen.wms.gztbyc.com,见 env.js VITE_API_BASE_URL=http://your-server-ip:6060 VITE_IMG_URL=https://your-img-domain.com diff --git a/.gitignore b/.gitignore index 6a47656..6f01ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ dist # build artifacts (exe under release/windows, apk under release/android) release +build/.icon-ico # Android offline packaging # keystore files and local config (contains secrets) are NOT tracked. @@ -21,6 +22,7 @@ release # See config/README.md for all config conventions. android-offline/keystore/ config/android.json +config/deploy.json # Android SDK project: sources are tracked (ensure consistent build base), # only local build outputs are excluded. diff --git a/android-offline/pack.ps1 b/android-offline/pack.ps1 index d14c76e..057dfc6 100644 --- a/android-offline/pack.ps1 +++ b/android-offline/pack.ps1 @@ -8,11 +8,13 @@ # .\pack.ps1 -VersionName "1.0.2" # override version (written back to package.json; versionCode auto-derived) # .\pack.ps1 -VersionCode 10002 # manually set versionCode (rarely needed) # .\pack.ps1 -NoInject # skip prepare.cjs injection (already injected) +# .\pack.ps1 -NoUpload # package only, skip publish upload (scp + latest.json) # .\pack.ps1 -JavaHome '...' -AndroidSdk '...' param( [switch]$Clean, [switch]$Timestamp, [switch]$NoInject, + [switch]$NoUpload, [string]$VersionName = "", [string]$VersionCode = "", [string]$JavaHome = "", @@ -221,4 +223,80 @@ Write-Host " size : ${apkSize} MB" Write-Host " version : $verName ($verCode)" Write-Host "===================================================" -ForegroundColor Green +# ============ publish upload (scp + latest.json, same flow as sandan project) ============ +$deployCfgPath = Join-Path $projRoot 'config\deploy.json' +if ($NoUpload) { + Write-Host "" + Write-Host "[hint] -NoUpload specified, skip publish upload" -ForegroundColor DarkGray +} elseif (-not (Test-Path $deployCfgPath)) { + Write-Host "" + Write-Host "[hint] config/deploy.json not found, skip publish upload (copy config/deploy.example.json and fill real values)" -ForegroundColor DarkGray +} else { + $dcfg = Get-Content $deployCfgPath -Raw -Encoding UTF8 | ConvertFrom-Json + $dcfg = $dcfg.android + if (-not $dcfg) { + Write-Host "[error] config/deploy.json missing android section" -ForegroundColor Red + exit 1 + } + $dHost = [string]$dcfg.host + $dUser = [string]$dcfg.user + $dKey = [string]$dcfg.keyPath + $dRemDir = ([string]$dcfg.remoteDir).TrimEnd('/') + $dUrlPre = [string]$dcfg.downloadUrlPrefix + $dPort = 22 + if ($dcfg.port) { $dPort = [int]$dcfg.port } + $dLatest = 'latest.json' + if ($dcfg.latestJsonName) { $dLatest = [string]$dcfg.latestJsonName } + if ($dUrlPre -and -not $dUrlPre.EndsWith('/')) { $dUrlPre = $dUrlPre + '/' } + + $missing = @() + if (-not $dHost) { $missing += 'host' } + if (-not $dUser) { $missing += 'user' } + if (-not $dRemDir) { $missing += 'remoteDir' } + if (-not $dUrlPre) { $missing += 'downloadUrlPrefix' } + if ($missing.Count -gt 0) { + Write-Host "[error] config/deploy.json missing fields: $($missing -join ', ')" -ForegroundColor Red + exit 1 + } + if ($dKey -and -not (Test-Path $dKey)) { + Write-Host "[error] SSH key not found: $dKey" -ForegroundColor Red + exit 1 + } + + # generate latest.json (same directory as the APK) + $sha256 = (Get-FileHash -Path $apkDest -Algorithm SHA256).Hash + $dlUrl = "$dUrlPre$apkName" + $publishedAt = (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ') + $latest = [ordered]@{ + version = $verName + file = $apkName + url = $dlUrl + sha256 = $sha256 + publishedAtUtc = $publishedAt + } + $latestPath = Join-Path $distDir $dLatest + [System.IO.File]::WriteAllText($latestPath, ($latest | ConvertTo-Json), (New-Object System.Text.UTF8Encoding($false))) + + Write-Host "" + Write-Host "[publish] upload to ${dUser}@${dHost}:${dRemDir}/ ..." -ForegroundColor Yellow + $scpArgs = @('-i', $dKey, '-P', "$dPort", '-o', 'StrictHostKeyChecking=accept-new') + & scp @scpArgs $apkDest "${dUser}@${dHost}:${dRemDir}/" + if ($LASTEXITCODE -ne 0) { + Write-Host "[error] APK upload failed (scp exit code $LASTEXITCODE)" -ForegroundColor Red + exit 1 + } + & scp @scpArgs $latestPath "${dUser}@${dHost}:${dRemDir}/" + if ($LASTEXITCODE -ne 0) { + Write-Host "[error] $dLatest upload failed (scp exit code $LASTEXITCODE)" -ForegroundColor Red + exit 1 + } + + Write-Host "" + Write-Host "================== publish done ==================" -ForegroundColor Green + Write-Host " download : $dlUrl" + Write-Host " sha256 : $sha256" + Write-Host " updated : ${dRemDir}/${dLatest}" + Write-Host "=================================================" -ForegroundColor Green +} + exit 0 diff --git a/config/README.md b/config/README.md index fd9f380..b6acbe0 100644 --- a/config/README.md +++ b/config/README.md @@ -8,16 +8,20 @@ |---|---|---| | `android.json` | Android 离线打包本地配置(包名、签名密码、AppKey 等) | ❌ 不提交(敏感) | | `android.example.json` | 上述配置的模板,首次使用复制为 `android.json` | ✅ 提交 | +| `deploy.json` | 发布配置(服务器 IP/账号/SSH 密钥路径/上传目录,分 android/windows 两段) | ❌ 不提交 | +| `deploy.example.json` | 发布配置模板,首次使用复制为 `deploy.json` | ✅ 提交 | `android.json` 字段说明:appId(uni-app appid)、appKey(dev.dcloud.net.cn 申请)、appName(应用名)、packageName(Android 包名)、abis(CPU 架构)、icon/splash(图标启动图路径,相对项目根)、wwwSource(可选:指定 App 资源目录,留空则自动用 dist/build/app 或 unpackage/resources)、signing(keystore 路径/密码)。 +`deploy.json` 字段说明:android 段(APK 发布,`android:pack` 打包后自动 scp 上传)与 windows 段(exe 发布,`build:exe` 打包后自动 scp 上传),每段含 host(服务器 IP)、port(SSH 端口)、user(SSH 用户)、keyPath(SSH 私钥路径)、remoteDir(服务器上传目录:APK 与散单项目同为 worker_station,exe 为 worker_station_windows)、downloadUrlPrefix(下载 URL 前缀)、latestJsonName(latest.json 文件名)。跳过上传:`-NoUpload`(APK)/ `--no-upload`(exe)。 + ## 根目录其他配置 | 文件 | 说明 | git | |---|---|---| | `.env` / `.env.electron` | Vite 构建目标(web/electron),无敏感信息 | ✅ 提交 | | `.env.example` | 环境变量模板(接口地址等),复制为 `.env.local` 填写 | ✅ 提交 | -| `.env.local` | 本地环境变量(含内网接口地址,勿提交) | ❌ 不提交(匹配 `*.local`) | +| `.env.local` | 本地开发环境变量(含内网测试接口地址,勿提交;**仅 dev 生效**,生产构建固定走 `https://qimen.wms.gztbyc.com`,见 `env.js`) | ❌ 不提交(匹配 `*.local`) | | `env.js` | 前端环境模块(读 Vite 环境变量,不写死敏感地址) | ✅ 提交 | | `electron-builder.config.cjs` | exe 打包配置(无敏感) | ✅ 提交 | @@ -33,6 +37,7 @@ ## 新机器初始化清单 1. `cp config/android.example.json config/android.json` 并填写(签名密钥放入 `android-offline/keystore/`) -2. `cp .env.example .env.local` 并填写接口地址 +2. `cp config/deploy.example.json config/deploy.json` 并填写(仅发布 APK 时需要) +3. `cp .env.example .env.local` 并填写接口地址 3. `npm install` -4. 打包:`npm run build:exe`(Windows)、`npm run android:pack`(Android) +4. 打包:`npm run build:exe`(Windows,发布到 worker_station_windows)、`npm run android:pack`(Android,发布到 worker_station) diff --git a/config/deploy.example.json b/config/deploy.example.json new file mode 100644 index 0000000..06dc795 --- /dev/null +++ b/config/deploy.example.json @@ -0,0 +1,21 @@ +{ + "_comment": "发布配置模板:复制本文件为 config/deploy.json 并填写真实值(deploy.json 已 git 忽略,不提交;本模板不含真实服务器信息)。android 段用于 APK 发布,windows 段用于 exe 发布,各字段含义见 config/README.md。", + "android": { + "host": "your-server-ip", + "port": 22, + "user": "your-ssh-user", + "keyPath": "C:/Users/yourname/.ssh/your_key", + "remoteDir": "/your/www/upload/dir", + "downloadUrlPrefix": "https://your-download-domain/your-project/", + "latestJsonName": "latest.json" + }, + "windows": { + "host": "your-server-ip", + "port": 22, + "user": "your-ssh-user", + "keyPath": "C:/Users/yourname/.ssh/your_key", + "remoteDir": "/your/www/upload/dir", + "downloadUrlPrefix": "https://your-download-domain/your-project/", + "latestJsonName": "latest.json" + } +} diff --git a/electron/icon.png b/electron/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..85cb8d3c3835296e8bd3b2c930a6450f8acf2fe9 GIT binary patch literal 38404 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 W%E*&ieaj!pOpl#8nt$ZNo&N`HK79EA literal 0 HcmV?d00001 diff --git a/electron/main.js b/electron/main.js index 88ce55a..65d753d 100644 --- a/electron/main.js +++ b/electron/main.js @@ -1,14 +1,97 @@ -const { app, BrowserWindow, session } = require('electron') +const { app, BrowserWindow, session, ipcMain, shell, Tray, Menu, nativeImage } = require('electron') const path = require('path') +const fs = require('fs') +const os = require('os') +const https = require('https') +const http = require('http') const devServerUrl = process.env.ELECTRON_RENDERER_URL const rendererEntry = path.join(__dirname, '..', 'dist', 'build', 'h5', 'index.html') +let tray = null +let isQuitting = false + if (devServerUrl) { app.commandLine.appendSwitch('disable-http-cache') } -function createWindow() { +// ---------- 本地静态服务:history 模式路由需要 http 协议(file:// 下 pushState 被禁用) ---------- +const STATIC_MIME = { + '.html': 'text/html; charset=utf-8', + '.js': 'text/javascript; charset=utf-8', + '.mjs': 'text/javascript; charset=utf-8', + '.css': 'text/css; charset=utf-8', + '.json': 'application/json; charset=utf-8', + '.png': 'image/png', + '.jpg': 'image/jpeg', + '.jpeg': 'image/jpeg', + '.gif': 'image/gif', + '.svg': 'image/svg+xml', + '.ico': 'image/x-icon', + '.webp': 'image/webp', + '.woff': 'font/woff', + '.woff2': 'font/woff2', + '.ttf': 'font/ttf', + '.mp3': 'audio/mpeg', + '.map': 'application/json; charset=utf-8', +} + +let staticServer = null +let staticServerPort = 0 + +function serveFile(filePath, res) { + const ext = path.extname(filePath).toLowerCase() + res.writeHead(200, { 'Content-Type': STATIC_MIME[ext] || 'application/octet-stream' }) + fs.createReadStream(filePath).pipe(res) +} + +function startStaticServer() { + if (staticServer) { + return Promise.resolve(staticServerPort) + } + const rootDir = path.dirname(rendererEntry) + const server = http.createServer((req, res) => { + let urlPath = '/' + try { + urlPath = decodeURIComponent(String(req.url || '/').split('?')[0]) + } catch (e) { + urlPath = '/' + } + if (!urlPath || urlPath === '/') { + serveFile(path.join(rootDir, 'index.html'), res) + return + } + // 防目录穿越 + const filePath = path.normalize(path.join(rootDir, urlPath)) + if (!filePath.startsWith(rootDir)) { + res.writeHead(403) + res.end('Forbidden') + return + } + fs.stat(filePath, (err, stat) => { + if (!err && stat.isDirectory()) { + serveFile(path.join(filePath, 'index.html'), res) + return + } + if (err || !stat.isFile()) { + // SPA 回退:history 路由统一返回 index.html + serveFile(path.join(rootDir, 'index.html'), res) + return + } + serveFile(filePath, res) + }) + }) + return new Promise((resolve, reject) => { + server.on('error', reject) + server.listen(0, '127.0.0.1', () => { + staticServer = server + staticServerPort = server.address().port + resolve(staticServerPort) + }) + }) +} + +async function createWindow() { const win = new BrowserWindow({ width: 1200, height: 800, @@ -23,12 +106,170 @@ function createWindow() { win.webContents.session.clearCache().catch(() => {}) win.loadURL(devServerUrl) win.webContents.openDevTools({ mode: 'detach' }) - return + } else { + const port = await startStaticServer() + win.loadURL(`http://127.0.0.1:${port}/`) } - win.loadFile(rendererEntry) + // 不显示窗口标题栏下的菜单 + win.removeMenu() + + // 点关闭按钮时不退出,隐藏到托盘;托盘菜单退出时才真正退出 + win.on('close', (event) => { + if (!isQuitting) { + event.preventDefault() + win.hide() + } + }) + + // 外部链接(更新下载地址等)交给系统浏览器打开 + win.webContents.setWindowOpenHandler(({ url }) => { + if (url && url.startsWith('http')) { + require('electron').shell.openExternal(url) + } + return { action: 'deny' } + }) + return win } +function getTrayIconPath() { + const candidates = [ + path.join(__dirname, 'icon.png'), + path.join(__dirname, '..', 'src', 'static', 'images', '1.png'), + path.join(__dirname, '..', 'dist', 'build', 'h5', 'static', 'images', '1.png'), + ] + return candidates.find((p) => fs.existsSync(p)) || '' +} + +function createTray(mainWindow) { + if (tray) { + return tray + } + + const iconPath = getTrayIconPath() + let image = nativeImage.createEmpty() + if (iconPath) { + const loaded = nativeImage.createFromPath(iconPath) + if (!loaded.isEmpty()) { + image = loaded.resize({ width: 16, height: 16 }) + } + } + + tray = new Tray(image) + tray.setToolTip('WMS工作台') + + const showWindow = () => { + if (!mainWindow || mainWindow.isDestroyed()) { + return + } + mainWindow.show() + if (mainWindow.isMinimized()) { + mainWindow.restore() + } + mainWindow.focus() + } + + tray.on('click', showWindow) + tray.setContextMenu( + Menu.buildFromTemplate([ + { label: '显示主界面', click: showWindow }, + { type: 'separator' }, + { + label: '退出', + click: () => { + isQuitting = true + app.quit() + }, + }, + ]) + ) + return tray +} + +function setupCorsHeaders() { + // 允许渲染进程跨域读取发布服务器上的 latest.json 等文件 + session.defaultSession.webRequest.onHeadersReceived((details, callback) => { + callback({ + responseHeaders: { + ...details.responseHeaders, + 'Access-Control-Allow-Origin': ['*'], + }, + }) + }) +} + +// ---------- 内置更新下载(主进程,支持重定向/重试与进度回传) ---------- +function downloadUpdateFile(url, dest, onProgress) { + return new Promise((resolve, reject) => { + const maxAttempts = 3 + let attempt = 0 + + const tryOnce = () => { + attempt++ + const start = (target, redirects) => { + if (redirects > 5) { + reject(new Error('重定向次数过多')) + return + } + const request = https.get( + target, + { headers: { 'User-Agent': 'wms-worker-station-updater' } }, + (res) => { + if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) { + res.resume() + start(new URL(res.headers.location, target).toString(), redirects + 1) + return + } + if (res.statusCode !== 200) { + res.resume() + reject(new Error(`HTTP ${res.statusCode}`)) + return + } + const total = Number(res.headers['content-length'] || 0) + let received = 0 + const file = fs.createWriteStream(dest) + res.on('data', (chunk) => { + received += chunk.length + onProgress(received, total) + }) + res.pipe(file) + file.on('finish', () => { + file.close(() => resolve(dest)) + }) + file.on('error', (error) => reject(error)) + } + ) + request.on('error', (error) => { + if (attempt < maxAttempts) { + console.warn(`[updater] 下载失败,重试 ${attempt}/${maxAttempts}: ${error.message}`) + tryOnce() + } else { + reject(error) + } + }) + } + start(url, 0) + } + + tryOnce() + }) +} + +ipcMain.handle('download-update', async (event, url) => { + const tmpPath = path.join(os.tmpdir(), `wms-worker-station-${Date.now()}-setup.exe`) + await downloadUpdateFile(url, tmpPath, (received, total) => { + if (!event.sender.isDestroyed()) { + event.sender.send('download-progress', { received, total }) + } + }) + return tmpPath +}) + +ipcMain.handle('open-installer', async (_event, filePath) => { + const result = await shell.openPath(filePath) + return result +}) + function setupMediaPermissions() { const ses = session.defaultSession if (!ses) { @@ -55,19 +296,51 @@ function setupMediaPermissions() { } } -app.whenReady().then(() => { - setupMediaPermissions() - createWindow() +// ---------- 单实例锁:防止同时打开两个应用实例 ---------- +const gotTheLock = app.requestSingleInstanceLock() - app.on('activate', () => { - if (BrowserWindow.getAllWindows().length === 0) { - createWindow() +if (!gotTheLock) { + app.quit() +} else { + // 用户再次启动应用时,唤起已有实例的窗口 + app.on('second-instance', () => { + const win = BrowserWindow.getAllWindows()[0] + if (win) { + if (win.isMinimized()) { + win.restore() + } + win.show() + win.focus() } }) -}) -app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - app.quit() - } -}) + app.whenReady().then(async () => { + setupMediaPermissions() + setupCorsHeaders() + const win = await createWindow() + createTray(win) + + app.on('activate', async () => { + const allWindows = BrowserWindow.getAllWindows() + if (allWindows.length === 0) { + try { + await createWindow() + } catch (error) { + console.error('[static-server] 启动失败:', error) + } + } else { + allWindows[0].show() + } + }) + }) + + app.on('before-quit', () => { + isQuitting = true + }) + + app.on('window-all-closed', () => { + if (process.platform !== 'darwin') { + app.quit() + } + }) +} diff --git a/electron/preload.js b/electron/preload.js index fcc8a49..8fe4b74 100644 --- a/electron/preload.js +++ b/electron/preload.js @@ -1,5 +1,15 @@ -const { contextBridge } = require('electron') +const { contextBridge, ipcRenderer } = require('electron') contextBridge.exposeInMainWorld('electronAPI', { platform: process.platform, + // 内置下载更新安装包(主进程下载,返回本地临时文件路径) + downloadUpdate: (url) => ipcRenderer.invoke('download-update', url), + // 监听下载进度,返回取消监听函数 + onDownloadProgress: (callback) => { + const listener = (_event, data) => callback(data) + ipcRenderer.on('download-progress', listener) + return () => ipcRenderer.removeListener('download-progress', listener) + }, + // 打开本地安装包(启动 NSIS 安装向导) + openInstaller: (filePath) => ipcRenderer.invoke('open-installer', filePath), }) diff --git a/env.js b/env.js index 73ec245..8bfea1f 100644 --- a/env.js +++ b/env.js @@ -1,4 +1,10 @@ -// 环境地址统一走 Vite 环境变量(见 .env.example / .env.local,敏感地址勿提交 git) -export const BASE_URL = import.meta.env.VITE_API_BASE_URL || '' // 接口根地址,由 .env.local 注入 +// 生产接口根地址:所有 production 构建(electron 打包 / Android 打包)统一指向生产域名, +// 避免构建机上残留的 .env.local 测试地址被带进生产包 +const PROD_API_BASE = 'https://qimen.wms.gztbyc.com' + +// 开发环境地址走 Vite 环境变量(见 .env.example / .env.local,敏感地址勿提交 git) +export const BASE_URL = import.meta.env.PROD + ? PROD_API_BASE + : import.meta.env.VITE_API_BASE_URL || '' // 接口根地址,开发时由 .env.local 注入 export const API_URL = `${BASE_URL}/system` // 后台接口域名 export const IMG_URL = import.meta.env.VITE_IMG_URL || 'https://ye4s.file.gzxunren.com' // 全局网络图片地址变量,css背景图片地址变量在uni.scss diff --git a/package.json b/package.json index bc11fc5..b098253 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wms-worker-station", - "version": "1.0.1", + "version": "1.0.18", "description": "WMS仓库工作台桌面端", "author": "tianbao", "main": "electron/main.js", diff --git a/scripts/build-exe.cjs b/scripts/build-exe.cjs index c598fee..cec26df 100644 --- a/scripts/build-exe.cjs +++ b/scripts/build-exe.cjs @@ -1,13 +1,20 @@ /** - * 一键打包 Windows exe: - * 1. 编译前端资源到 dist/build/h5(uni build --mode electron) - * 2. 调用 electron-builder 生成 NSIS 安装包,输出到 release/ + * 一键打包 Windows exe 并发布: + * 1. 编译前端资源(uni build --mode electron) + * 2. electron-builder 生成 NSIS 安装包,输出 release/windows/ + * 3. 可选:读取 config/deploy.json 的 windows 段,scp 上传安装包与 latest.json + * 用法:node scripts/build-exe.cjs [--no-upload] */ const { spawnSync } = require('child_process') +const fs = require('fs') +const path = require('path') +const crypto = require('crypto') +const ROOT = path.resolve(__dirname, '..') const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm' const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx' const useShell = process.platform === 'win32' +const noUpload = process.argv.includes('--no-upload') function run(cmd, args) { const command = `${cmd} ${args.join(' ')}` @@ -22,7 +29,85 @@ function run(cmd, args) { console.log('[1/2] 编译前端资源 -> dist/build/h5') run(npmCmd, ['run', 'build:h5:electron']) -console.log('\n[2/2] electron-builder 打包 exe -> release/') +console.log('\n[2/2] electron-builder 打包 exe -> release/windows/') run(npxCmd, ['electron-builder', '--config', 'electron-builder.config.cjs']) +// ---------- 3. 发布上传(config/deploy.json 的 windows 段) ---------- +if (noUpload) { + console.log('\n[跳过] --no-upload 已指定,跳过发布上传') +} else { + const deployPath = path.join(ROOT, 'config', 'deploy.json') + if (!fs.existsSync(deployPath)) { + console.log('\n[跳过] 未找到 config/deploy.json,跳过发布上传(复制 config/deploy.example.json 并填写)') + } else { + let deploy + try { + deploy = JSON.parse(fs.readFileSync(deployPath, 'utf-8')) + } catch (error) { + console.error(`\n[x] config/deploy.json 解析失败: ${error.message}`) + process.exit(1) + } + const win = deploy.windows + if (!win || !win.host || !win.user || !win.remoteDir || !win.downloadUrlPrefix) { + console.log('\n[跳过] config/deploy.json 缺少 windows 段或字段不全,跳过发布上传') + } else { + const keyPath = win.keyPath || '' + if (keyPath && !fs.existsSync(keyPath)) { + console.error(`\n[x] SSH 密钥不存在: ${keyPath}`) + process.exit(1) + } + const port = String(win.port || 22) + const remoteDir = String(win.remoteDir).replace(/\/$/, '') + const urlPrefix = String(win.downloadUrlPrefix).replace(/\/?$/, '/') + const latestName = win.latestJsonName || 'latest.json' + + // 定位 NSIS 安装包(按当前版本精确匹配,避免目录残留旧包被误选) + const outDir = path.join(ROOT, 'release', 'windows') + const pkg = JSON.parse(fs.readFileSync(path.join(ROOT, 'package.json'), 'utf-8')) + const version = pkg.version + const productName = 'WMS工作台' + const expectedName = `${productName}-${version}-setup.exe` + const setupExe = fs.existsSync(path.join(outDir, expectedName)) + ? expectedName + : fs.readdirSync(outDir).find( + (file) => file.endsWith('.exe') && file.includes('setup') && !file.includes('__uninstaller') + ) + if (!setupExe) { + console.error('\\n[x] 未在 release/windows 找到安装包') + process.exit(1) + } + const exePath = path.join(outDir, setupExe) + const sha256 = crypto.createHash('sha256').update(fs.readFileSync(exePath)).digest('hex') + const latest = { + version, + file: setupExe, + url: `${urlPrefix}${setupExe}`, + sha256, + publishedAtUtc: new Date().toISOString(), + } + const latestPath = path.join(outDir, latestName) + fs.writeFileSync(latestPath, JSON.stringify(latest, null, 2) + '\n', 'utf-8') + + console.log(`\n[3/3] 发布上传 -> ${win.user}@${win.host}:${remoteDir}/ ...`) + const scpArgs = [ + ...(keyPath ? ['-i', keyPath] : []), + '-P', port, + '-o', 'StrictHostKeyChecking=accept-new', + ] + const target = `${win.user}@${win.host}:${remoteDir}/` + const uploadExe = spawnSync('scp', [...scpArgs, exePath, target], { stdio: 'inherit' }) + if (uploadExe.status !== 0) { + console.error(`\n[x] 安装包上传失败(scp 退出码 ${uploadExe.status})`) + process.exit(uploadExe.status || 1) + } + const uploadLatest = spawnSync('scp', [...scpArgs, latestPath, target], { stdio: 'inherit' }) + if (uploadLatest.status !== 0) { + console.error(`\n[x] ${latestName} 上传失败(scp 退出码 ${uploadLatest.status})`) + process.exit(uploadLatest.status || 1) + } + console.log(`\n[ok] 发布完成: ${urlPrefix}${setupExe}`) + } + } +} + console.log('\n[ok] 打包完成,安装包位于 release/windows/ 目录') diff --git a/scripts/gen-android-assets.ps1 b/scripts/gen-android-assets.ps1 index f5a8b50..d5772d8 100644 --- a/scripts/gen-android-assets.ps1 +++ b/scripts/gen-android-assets.ps1 @@ -137,6 +137,13 @@ function New-Splash([string]$path) { $iconPath = 'd:\wms_worker_station\android-offline\icon\app-icon.png' $splashPath = 'd:\wms_worker_station\android-offline\splash\splash.png' +$buildIconDir = 'd:\wms_worker_station\build' +$buildIconPath = Join-Path $buildIconDir 'icon.png' New-AppIcon $iconPath New-Splash $splashPath + +# Windows exe icon: electron-builder auto-converts build/icon.png (>=256x256) to .ico +if (-not (Test-Path $buildIconDir)) { New-Item -ItemType Directory -Path $buildIconDir -Force | Out-Null } +Copy-Item -Path $iconPath -Destination $buildIconPath -Force +Write-Host "windows icon saved: $buildIconPath" diff --git a/shims-uni.d.ts b/shims-uni.d.ts index ed4adcf..28db357 100644 --- a/shims-uni.d.ts +++ b/shims-uni.d.ts @@ -1,6 +1,10 @@ /// import 'vue' +declare const __APP_BUILD_TARGET__: string +declare const __APP_IS_ELECTRON__: boolean +declare const __APP_VERSION__: string + declare module '@vue/runtime-core' { type Hooks = App.AppInstance & Page.PageInstance; diff --git a/src/App.vue b/src/App.vue index d30fe64..eea6fcc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,10 +1,12 @@