From bf350354646eda9eb3f61e3addba4628c3cd5f14 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Wed, 21 May 2025 16:04:07 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A6=D0=98=D0=A2=D0=9A-960=20-=20=D1=80?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8=D0=B7=20=D0=B2=20=D0=B7=D0=B0=D0=B3=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=BA=D0=B5=20"X-Solution-Info"=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=A1=D0=91=D0=98=D0=A1=20(=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=20=D0=BE?= =?UTF-8?q?=D1=82=2015.05.2025)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/diadoc.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/diadoc.js b/modules/diadoc.js index 2778d6e..d3c8cbb 100644 --- a/modules/diadoc.js +++ b/modules/diadoc.js @@ -10,6 +10,7 @@ const xml2js = require("xml2js"); //Конвертация XML в JSON и JSON в XML const _ = require("lodash"); //Работа с коллекциями и объектами const rqp = require("request-promise"); //Работа с HTTP/HTTPS запросами +const config = require("../config"); //Параметры сервера const { SDDAUTH_API_CLIENT_ID, SDEPARTMENT_NAME, SDEPARTMENT_ID } = require("./diadoc_config"); //Ключ разработчика //--------------------- @@ -128,7 +129,7 @@ const checkAPIClientId = sAPIClientId => { //Формиорвание заголовка сообщения const buildHeaders = (sAPIClientId, sToken = null) => ({ "Content-type": "application/json", - "X-Solution-Info": "PARUS", + "X-Solution-Info": `PARUS_${config.common.sRelease}`, Authorization: `DiadocAuth ddauth_api_client_id=${sAPIClientId}${sToken ? `,ddauth_token=${sToken}` : ""}`, Accept: "application/json" }); From 28dc47bc4da30e282193a57d6f189a26e3a5009c Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Wed, 28 May 2025 17:56:39 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D0=B8=D0=BC=D1=8F=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=B0=20=D0=B2=20config.js=20(=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20PR)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config.js b/config.js index 623def9..5af59f2 100644 --- a/config.js +++ b/config.js @@ -9,6 +9,7 @@ //Общие параметры let common = { + sServerNameTmp: "", //Версия сервера приложений sVersion: "8.5.6.1", //Релиз сервера приложений From 19b17d6052f691d6f34ca6ef7cf31102406bb8d8 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Wed, 28 May 2025 18:00:44 +0300 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=D0=92=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B5=20=D0=B8=D0=BC=D1=8F=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20=D0=B2=20config.js=20(=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B?= =?UTF-8?q?=20PR)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 28dc47bc4da30e282193a57d6f189a26e3a5009c. --- config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/config.js b/config.js index 5af59f2..623def9 100644 --- a/config.js +++ b/config.js @@ -9,7 +9,6 @@ //Общие параметры let common = { - sServerNameTmp: "", //Версия сервера приложений sVersion: "8.5.6.1", //Релиз сервера приложений