From 5258a84bee91b50ac682ed4d8572907d0f212082 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Tue, 15 Sep 2026 19:05:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(camera):=20=E4=BA=91=E5=8F=B0/OSD=20?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9B=AE=E5=BD=95=E6=94=B9=E7=94=A8=20getApp?= =?UTF-8?q?DataDir()=EF=BC=8C=E4=BF=AE=E5=A4=8D=20Linux=20=E4=B8=8B?= =?UTF-8?q?=E8=90=BD=E5=88=B0=E5=AD=97=E9=9D=A2=E9=87=8F=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cameraPtz.js/cameraOsd.js 自己用 process.env.ProgramData || SystemDrive/ProgramData 拼日志目录,非 Windows 上两者都为空 → path.join('C:','ProgramData') 变成相对路径,在 9.101 上实际写到 /opt/printserver/C:/ProgramData/printServer/*.log(cameraOsd 自 7/30 起如此)。 改用项目既有约定 utils/runtime.js#getAppDataDir()(frpc.js 同款):Windows 打包版仍为 %ProgramData%\\printServer(与文档一致),Linux/开发态为项目根目录,与 frpc.log/run.log 同级。 --- utils/cameraOsd.js | 7 +++++-- utils/cameraPtz.js | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/utils/cameraOsd.js b/utils/cameraOsd.js index fa2c1f0..bef6b3a 100644 --- a/utils/cameraOsd.js +++ b/utils/cameraOsd.js @@ -13,14 +13,17 @@ import path from 'path'; import os from 'os'; import http from 'http'; import crypto from 'crypto'; +import { getAppDataDir } from './runtime.js'; const require = createRequire(import.meta.url); const { Cam } = require('onvif'); // ─── 文件日志 ─── +// 目录沿用项目约定 getAppDataDir()(同 frpc.js):Windows 打包版 = %ProgramData%\printServer, +// Linux / 开发态 = 项目根目录。之前自己拼 process.env.ProgramData 会让 Linux 写到 +// 字面量目录 "/opt/printserver/C:/ProgramData/printServer/" 下。 function _logDir() { - const appData = process.env.ProgramData || path.join(process.env.SystemDrive || 'C:', 'ProgramData'); - const dir = path.join(appData, 'printServer'); + const dir = getAppDataDir(); if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true }); return dir; } diff --git a/utils/cameraPtz.js b/utils/cameraPtz.js index ae98261..db352a5 100644 --- a/utils/cameraPtz.js +++ b/utils/cameraPtz.js @@ -28,6 +28,7 @@ import fs from 'fs'; import path from 'path'; import { format } from 'util'; +import { getAppDataDir } from './runtime.js'; import { extractRTSPInfo, _isapiAuth as acquireIsapiAuth, @@ -35,9 +36,12 @@ import { } from './cameraOsd.js'; // ─── 文件日志(独立文件,便于排查云台问题) ─── +// 目录沿用项目约定 getAppDataDir():Windows 打包版 = %ProgramData%\printServer; +// Linux / 开发态 = 项目根目录(和 frpc.log、run.log 同级)。 +// ⚠️ 不要自己用 process.env.ProgramData 拼:Linux 下会得到一个字面量目录 +// "/opt/printserver/C:/ProgramData/..."(cameraOsd 从 7 月底起就掉在那里)。 function _logDir() { - const appData = process.env.ProgramData || path.join(process.env.SystemDrive || 'C:', 'ProgramData'); - const dir = path.join(appData, 'printServer'); + const dir = getAppDataDir(); if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true }); return dir; }