From 40301cc1f93b3139a62704c1c636d29eec22680f Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Tue, 1 Oct 2024 12:36:35 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-901=20-=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B0=20MQTT=20?= =?UTF-8?q?=D0=B8=20KAFKA=20-=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=20"kafka"=20=D0=B8=20"mqtt"=20=D0=B2=20=D0=B4=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=B8=D0=B2,=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=B5=D0=B9=20("@types/node"=20=D0=B8=20"bl")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 46e2f86..f6e373e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,9 +36,9 @@ } }, "node_modules/@types/node": { - "version": "22.5.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", - "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==", + "version": "22.7.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz", + "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==", "dependencies": { "undici-types": "~6.19.2" } @@ -165,9 +165,9 @@ } }, "node_modules/bl": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.15.tgz", - "integrity": "sha512-RGhjD1XCPS7ZdAH6cEJVaR3gLV4KJP2hvkQ49AH5kwScjiyd0jBM8RsP4oHKzcx+kNCON9752zPeRnuv0HHwzw==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.16.tgz", + "integrity": "sha512-V/kz+z2Mx5/6qDfRCilmrukUXcXuCoXKg3/3hDvzKKoSUx8CJKudfIoT29XZc3UE9xBvxs5qictiHdprwtteEg==", "dependencies": { "@types/readable-stream": "^4.0.0", "buffer": "^6.0.3", @@ -1525,9 +1525,9 @@ } }, "@types/node": { - "version": "22.5.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz", - "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==", + "version": "22.7.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz", + "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==", "requires": { "undici-types": "~6.19.2" } @@ -1624,9 +1624,9 @@ } }, "bl": { - "version": "6.0.15", - "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.15.tgz", - "integrity": "sha512-RGhjD1XCPS7ZdAH6cEJVaR3gLV4KJP2hvkQ49AH5kwScjiyd0jBM8RsP4oHKzcx+kNCON9752zPeRnuv0HHwzw==", + "version": "6.0.16", + "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.16.tgz", + "integrity": "sha512-V/kz+z2Mx5/6qDfRCilmrukUXcXuCoXKg3/3hDvzKKoSUx8CJKudfIoT29XZc3UE9xBvxs5qictiHdprwtteEg==", "requires": { "@types/readable-stream": "^4.0.0", "buffer": "^6.0.3", From f9bb2193d9c7ddea73bc4c9dcfc304abe2b3a3a3 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Tue, 1 Oct 2024 16:09:27 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A0=D0=B5=D0=BB=D0=B8=D0=B7=202024.09.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.js | 2 +- config_default.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.js b/config.js index c86ddc7..a3bf7e8 100644 --- a/config.js +++ b/config.js @@ -12,7 +12,7 @@ let common = { //Версия сервера приложений sVersion: "8.5.6.1", //Релиз сервера приложений - sRelease: "2024.08.30", + sRelease: "2024.09.27", //Таймаут останова сервера (мс) nTerminateTimeout: 60000, //Контролировать версию Системы diff --git a/config_default.js b/config_default.js index c289e71..f637709 100644 --- a/config_default.js +++ b/config_default.js @@ -12,7 +12,7 @@ let common = { //Версия сервера приложений sVersion: "8.5.6.1", //Релиз сервера приложений - sRelease: "2024.08.30", + sRelease: "2024.09.27", //Таймаут останова сервера (мс) nTerminateTimeout: 60000, //Контролировать версию Системы From e8c49d835a09d318b3b87072610fe743fc4076d6 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Tue, 29 Oct 2024 19:25:38 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-910=20-=20=D0=A1?= =?UTF-8?q?=D0=91=D0=98=D0=A1=20-=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80?= =?UTF-8?q?=D0=B6=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B2=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82?= =?UTF-8?q?=D0=B0=D1=85=20"=D0=98=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=83=D1=87=D0=B0=D1=82=D0=B5=D0=BB=D0=B8"=20=D0=B8=20"=D0=A1?= =?UTF-8?q?=D0=BE=D0=B7=D0=B4=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0"=20=D1=81=D0=BE?= =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/sbis.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/sbis.js b/modules/sbis.js index 858aece..ac86a75 100644 --- a/modules/sbis.js +++ b/modules/sbis.js @@ -30,10 +30,24 @@ const tag = [ "Доверенность" ]; +// Список имен тегов для замены ([Старое значение], [Новое значение]) +const replaceTags = [ + ['"Иные получатели":', '"ИныеПолучатели":'], + ['"Создатель документа":', '"СоздательДокумента":'], +]; + //------------ // Тело модуля //------------ +//Замена наименований тегов (для корректной работы toXML) +const replaceTag = (obj) => { + for (let value of replaceTags) { + obj = obj.replace(new RegExp(value[0], 'g'), value[1]); + } + return obj; +}; + //Обернуть содержимое тега в массив const toArray = (obj, tags) => { for (const prop in obj) { @@ -190,7 +204,7 @@ const afterDocParse = async prms => { let resu = null; if (prms.queue.blResp) { try { - resu = toXML(JSON.parse(prms.queue.blResp.toString())); + resu = toXML(JSON.parse(replaceTag(prms.queue.blResp.toString()))); } catch (e) { throw new Error(`Неожиданный ответ сервера ЭДО "СБИС". Ошибка интерпретации: ${e.message}`); } From 8d3c7b965f06f07ec68a7aec6c978b6b80030446 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Sat, 2 Nov 2024 13:38:15 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A0=D0=B5=D0=BB=D0=B8=D0=B7=202024.10.30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.js | 2 +- config_default.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.js b/config.js index a3bf7e8..7f6c4b3 100644 --- a/config.js +++ b/config.js @@ -12,7 +12,7 @@ let common = { //Версия сервера приложений sVersion: "8.5.6.1", //Релиз сервера приложений - sRelease: "2024.09.27", + sRelease: "2024.10.30", //Таймаут останова сервера (мс) nTerminateTimeout: 60000, //Контролировать версию Системы diff --git a/config_default.js b/config_default.js index f637709..cf940d0 100644 --- a/config_default.js +++ b/config_default.js @@ -12,7 +12,7 @@ let common = { //Версия сервера приложений sVersion: "8.5.6.1", //Релиз сервера приложений - sRelease: "2024.09.27", + sRelease: "2024.10.30", //Таймаут останова сервера (мс) nTerminateTimeout: 60000, //Контролировать версию Системы