1c/OpenIntegrations
1
0
Fork 0
mirror of https://github.com/Bayselonarrend/OpenIntegrations.git synced 2025-08-10 22:41:43 +02:00
Code Issues Releases Activity

Main build (Jenkins)

Browse Source
This commit is contained in:
Vitaly the Alpaca (bot)
2024-12-21 20:57:14 +03:00
parent eef686ff9c
commit 2e805b58b2
8 changed files with 5976 additions and 5972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11840
service/dictionaries/en.json
View File

File diff suppressed because it is too large Load Diff

25
src/en/OInt/core/Modules/OPI_TCP.os
View File

@@ -57,7 +57,7 @@ Function CreateConnection(Val Address) Export
OPI_TypeConversion.GetLine(Address); OPI_TypeConversion.GetLine(Address);
TCPClient = AttachAddInOnServer("OPI_TCPClient"); TCPClient = OPI_Tools.GetAddInObject("OPI_TCPClient");
TCPClient.Address = Address; TCPClient.Address = Address;
@@ -206,6 +206,11 @@ Function ProcessRequest(Val Address, Val Data = "", Val ResponseString = True) E
OPI_TypeConversion.GetBoolean(ResponseString); OPI_TypeConversion.GetBoolean(ResponseString);
Connection = CreateConnection(Address); Connection = CreateConnection(Address);
If Connection = Undefined Then
Return "OPI: Unable to establish a connection";
EndIf;
Result = SendBinaryData(Connection, Data); Result = SendBinaryData(Connection, Data);
If Result Then If Result Then
@@ -230,21 +235,3 @@ EndFunction
#EndRegion #EndRegion
#Region Private
Function AttachAddInOnServer(Val AddInName, Val Class = "Main")
If OPI_Tools.IsOneScript() Then
TemplateName = OPI_Tools.AddInsFolderOS() + AddInName + ".zip";
Else
TemplateName = "CommonTemplate." + AddInName;
EndIf;
AttachAddIn(TemplateName, AddInName, AddInType.Native);
AddIn = New("AddIn." + AddInName + "." + Class);
Return AddIn;
EndFunction
#EndRegion

15
src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
View File

@@ -1146,6 +1146,21 @@ Function MergeData(Val Data, Val Addition) Export
EndFunction EndFunction
Function GetAddInObject(Val AddInName, Val Class = "Main") Export
If OPI_Tools.IsOneScript() Then
TemplateName = OPI_Tools.AddInsFolderOS() + AddInName + ".zip";
Else
TemplateName = "CommonTemplate." + AddInName;
EndIf;
AttachAddIn(TemplateName, AddInName, AddInType.Native);
AddIn = New("AddIn." + AddInName + "." + Class);
Return AddIn;
EndFunction
#EndRegion #EndRegion
#EndRegion #EndRegion

25
src/en/OPI/src/CommonModules/OPI_TCP/Module.bsl
View File

@@ -57,7 +57,7 @@ Function CreateConnection(Val Address) Export
OPI_TypeConversion.GetLine(Address); OPI_TypeConversion.GetLine(Address);
TCPClient = AttachAddInOnServer("OPI_TCPClient"); TCPClient = OPI_Tools.GetAddInObject("OPI_TCPClient");
TCPClient.Address = Address; TCPClient.Address = Address;
@@ -206,6 +206,11 @@ Function ProcessRequest(Val Address, Val Data = "", Val ResponseString = True) E
OPI_TypeConversion.GetBoolean(ResponseString); OPI_TypeConversion.GetBoolean(ResponseString);
Connection = CreateConnection(Address); Connection = CreateConnection(Address);
If Connection = Undefined Then
Return "OPI: Unable to establish a connection";
EndIf;
Result = SendBinaryData(Connection, Data); Result = SendBinaryData(Connection, Data);
If Result Then If Result Then
@@ -230,21 +235,3 @@ EndFunction
#EndRegion #EndRegion
#Region Private
Function AttachAddInOnServer(Val AddInName, Val Class = "Main")
If OPI_Tools.IsOneScript() Then
TemplateName = OPI_Tools.AddInsFolderOS() + AddInName + ".zip";
Else
TemplateName = "CommonTemplate." + AddInName;
EndIf;
AttachAddIn(TemplateName, AddInName, AddInType.Native);
AddIn = New("AddIn." + AddInName + "." + Class);
Return AddIn;
EndFunction
#EndRegion

15
src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
View File

@@ -1146,6 +1146,21 @@ Function MergeData(Val Data, Val Addition) Export
EndFunction EndFunction
Function GetAddInObject(Val AddInName, Val Class = "Main") Export
If OPI_Tools.IsOneScript() Then
TemplateName = OPI_Tools.AddInsFolderOS() + AddInName + ".zip";
Else
TemplateName = "CommonTemplate." + AddInName;
EndIf;
AttachAddIn(TemplateName, AddInName, AddInType.Native);
AddIn = New("AddIn." + AddInName + "." + Class);
Return AddIn;
EndFunction
#EndRegion #EndRegion
#EndRegion #EndRegion