diff --git a/config.json b/config.json index 1bc17c2..41c3034 100644 --- a/config.json +++ b/config.json @@ -10,7 +10,7 @@ "reconnectInterval": 3000 }, "refreshTokenExpireTime": 0, - "tokenExpireTime": 1779965429409, - "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3Nzk5NjE4MjksImV4cCI6MTc3OTk2NTQyOX0.xDzEdZXmynizKOELecYraoWq0rqc5guEExlBz6x3ziI", + "tokenExpireTime": 1780469814666, + "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3ODA0NjYyMTQsImV4cCI6MTc4MDQ2OTgxNH0.kR9RugjGPeSLijWn4Enq93Hf2Pn63DToxS6C82ElzxE", "refreshToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3YXJlaG91c2UiOiIxMDAwMDAiLCJjb21wdXRlcklkIjoiMjgiLCJpYXQiOjE3Nzg2MTAwNDMsImV4cCI6NDkzNDM3MDA0M30.JkOtPdc6VA5IDxy6E6Pqk5nffmE5VagoXtXYr7cNLZc" } \ No newline at end of file diff --git a/services/printer.js b/services/printer.js index ae5df77..751c760 100644 --- a/services/printer.js +++ b/services/printer.js @@ -108,14 +108,19 @@ class PrinterService extends service { return payload; }; - const validateExpressPayload = (payload) => { + const validateExpressPayload = (payload, componentName) => { if (!payload || typeof payload !== 'object') return '打印数据为空或格式错误'; if (!payload.cmd) return '缺少 cmd 字段'; if (!payload.requestID) return '缺少 requestID 字段'; if (!payload.task || typeof payload.task !== 'object') return '缺少 task 字段'; if (!payload.task.taskID) return '缺少 task.taskID 字段'; if (!payload.task.printer) return '缺少 task.printer 字段'; - if (!Array.isArray(payload.task.documents) || payload.task.documents.length === 0) return '缺少 task.documents 或 documents 为空'; + const normalizedComponentName = normalizeComponentName(componentName); + const isShipinhaoPayload = normalizedComponentName === '视频号' + || (Array.isArray(payload.taskList) && payload.taskList.length > 0); + if (!isShipinhaoPayload && (!Array.isArray(payload.task.documents) || payload.task.documents.length === 0)) { + return '缺少 task.documents 或 documents 为空'; + } return null; }; @@ -153,7 +158,7 @@ class PrinterService extends service { if (component && component.readyState === 1) { if (data.type === 'express') { - const validationError = validateExpressPayload(printData); + const validationError = validateExpressPayload(printData, data.component); if (validationError) { console.error('快递面单数据校验失败:', validationError, printData); this.app.emit('printError', {