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; }