CITKParus/P8-ExchangeService
7
0
Fork 1
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Внесение изменений из master ветки

Browse Source
This commit is contained in:
boa604 2026-02-13 12:01:57 +03:00
parent 19a7023291
commit 2a13f5e350
8 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.js
View File

@ -24,7 +24,7 @@ let common = {
//Версия сервера приложений
sVersion: "8.5.6.1",
//Релиз сервера приложений
sRelease: "2025.12.24",
sRelease: "2026.02.10",
//Таймаут останова сервера (мс)
nTerminateTimeout: 60000,
//Контролировать версию Системы

1
core/db_connector.js
View File

@ -520,6 +520,7 @@ class DBConnector extends EventEmitter {
let putQueueData = deepClone(prms);
putQueueData.blMsg = prms.blMsg ? prms.blMsg : Buffer.from("");
putQueueData.connection = this.connection;
putQueueData.nExsSrv = this.nExsSrv;
//Исполняем действие в БД
try {
let res = await this.connector.putQueue(putQueueData);

2
core/in_queue.js
View File

@ -81,7 +81,7 @@ class InQueue extends EventEmitter {
this.notifier = prms.notifier;
//WEB-приложение
this.webApp = express();
// Глобально разрешаем CORS для всех маршрутов и методов.
// Глобально разрешаем CORS для всех маршрутов и методов
this.webApp.use(cors());
//WEB-сервер
this.srv = null;

2
core/utils.js
View File

@ -507,7 +507,7 @@ const getURLProtocol = sURL => {
return sURL.substring(0, 1) === "/" ? SPROTOCOL_HTTP : new URL(sURL).protocol.slice(0, -1);
};
//Wraps async task with timeout and abort support
//Обёртывание промиса в таймаут исполнения
const wrapPromiseTimeout = (timeout, executor) => {
if (!timeout || typeof executor !== "function") {
return executor ? executor() : Promise.resolve();

1
modules/parus_oracle_db.js
View File

@ -392,6 +392,7 @@ const putQueue = async prms => {
inPrms: {
NEXSSERVICEFN: prms.nServiceFnId,
BMSG: prms.blMsg,
NEXSSRV: prms.nExsSrv,
NEXSQUEUE: prms.nQueueId,
NLNK_COMPANY: prms.nLnkCompanyId,
NLNK_DOCUMENT: prms.nLnkDocumentId,

1
modules/parus_pg_db.js
View File

@ -361,6 +361,7 @@ const putQueue = async prms => {
inPrms: {
NEXSSERVICEFN: prms.nServiceFnId,
BMSG: prms.blMsg,
NEXSSRV: prms.nExsSrv,
NEXSQUEUE: prms.nQueueId,
NLNK_COMPANY: prms.nLnkCompanyId,
NLNK_DOCUMENT: prms.nLnkDocumentId,

46
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "parus_exchange_service",
"version": "1.0.0",
"version": "2.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "parus_exchange_service",
"version": "1.0.0",
"version": "2.0.0",
"license": "ISC",
"dependencies": {
"cors": "^2.8.5",
@ -39,9 +39,9 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "25.0.10",
"resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.10.tgz",
"integrity": "sha512-zWW5KPngR/yvakJgGOmZ5vTBemDoSqF3AcV/LrO5u5wTWyEAVVh+IT39G4gtyAkh3CtTZs8aX/yRM82OfzHJRg==",
"version": "25.2.3",
"resolved": "https://registry.npmjs.org/@types/node/-/node-25.2.3.tgz",
"integrity": "sha512-m0jEgYlYz+mDJZ2+F4v8D1AyQb+QzsNqRuI7xg1VQX/KlKS0qT9r1Mo16yo5F/MtifXFgaofIFsdFMox2SxIbQ==",
"license": "MIT",
"dependencies": {
"undici-types": "~7.16.0"
@ -308,9 +308,9 @@
}
},
"node_modules/cors": {
"version": "2.8.5",
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
"integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
"version": "2.8.6",
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
"integrity": "sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==",
"license": "MIT",
"dependencies": {
"object-assign": "^4",
@ -318,6 +318,10 @@
},
"engines": {
"node": ">= 0.10"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/express"
}
},
"node_modules/debug": {
@ -797,9 +801,9 @@
}
},
"node_modules/mqtt": {
"version": "5.14.1",
"resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.14.1.tgz",
"integrity": "sha512-NxkPxE70Uq3Ph7goefQa7ggSsVzHrayCD0OyxlJgITN/EbzlZN+JEPmaAZdxP1LsIT5FamDyILoQTF72W7Nnbw==",
"version": "5.15.0",
"resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.15.0.tgz",
"integrity": "sha512-KC+wAssYk83Qu5bT8YDzDYgUJxPhbLeVsDvpY2QvL28PnXYJzC2WkKruyMUgBAZaQ7h9lo9k2g4neRNUUxzgMw==",
"license": "MIT",
"dependencies": {
"@types/readable-stream": "^4.0.21",
@ -945,12 +949,12 @@
}
},
"node_modules/pg": {
"version": "8.17.2",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.17.2.tgz",
"integrity": "sha512-vjbKdiBJRqzcYw1fNU5KuHyYvdJ1qpcQg1CeBrHFqV1pWgHeVR6j/+kX0E1AAXfyuLUGY1ICrN2ELKA/z2HWzw==",
"version": "8.18.0",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.18.0.tgz",
"integrity": "sha512-xqrUDL1b9MbkydY/s+VZ6v+xiMUmOUk7SS9d/1kpyQxoJ6U9AO1oIJyUWVZojbfe5Cc/oluutcgFG4L9RDP1iQ==",
"license": "MIT",
"dependencies": {
"pg-connection-string": "^2.10.1",
"pg-connection-string": "^2.11.0",
"pg-pool": "^3.11.0",
"pg-protocol": "^1.11.0",
"pg-types": "2.2.0",
@ -979,9 +983,9 @@
"optional": true
},
"node_modules/pg-connection-string": {
"version": "2.10.1",
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.10.1.tgz",
"integrity": "sha512-iNzslsoeSH2/gmDDKiyMqF64DATUCWj3YJ0wP14kqcsf2TUklwimd+66yYojKwZCA7h2yRNLGug71hCBA2a4sw==",
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.11.0.tgz",
"integrity": "sha512-kecgoJwhOpxYU21rZjULrmrBJ698U2RxXofKVzOn5UDj61BPj/qMb7diYUR1nLScCDbrztQFl1TaQZT0t1EtzQ==",
"license": "MIT"
},
"node_modules/pg-int8": {
@ -1483,9 +1487,9 @@
}
},
"node_modules/worker-timers": {
"version": "8.0.29",
"resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.29.tgz",
"integrity": "sha512-9jk0MWHhWAZ2xlJPXr45oe5UF/opdpfZrY0HtyPizWuJ+ce1M3IYk/4IIdGct3kn9Ncfs+tkZt3w1tU6KW2Fsg==",
"version": "8.0.30",
"resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-8.0.30.tgz",
"integrity": "sha512-8P7YoMHWN0Tz7mg+9oEhuZdjBIn2z6gfjlJqFcHiDd9no/oLnMGCARCDkV1LR3ccQus62ZdtIp7t3aTKrMLHOg==",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.28.6",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "parus_exchange_service",
"version": "1.0.0",
"version": "2.0.0",
"description": "Parus 8 and WEB API integration platform",
"main": "index.js",
"scripts": {