diff --git a/Hcs.WebApp/Components/Pages/Test/Export.razor b/Hcs.WebApp/Components/Pages/Test/Export.razor
index 69e0ab0..231e2b0 100644
--- a/Hcs.WebApp/Components/Pages/Test/Export.razor
+++ b/Hcs.WebApp/Components/Pages/Test/Export.razor
@@ -5,8 +5,11 @@
@using Hcs.Broker.MessageCapturer
@using Hcs.Service.Async.Nsi
@using Hcs.WebApp.Components.Shared
+@using Hcs.WebApp.Config
+@using Hcs.WebApp.Utils
@inject NavigationManager NavigationManager
+@inject IConfiguration Configuration
Тестирование экспорта
@@ -62,10 +65,11 @@
messageCapturer = new FileMessageCapturer("test/export", logger);
messageCapturer.OnFileWritten += OnFileWritten;
+ var brokerConfig = Configuration.GetSection("BrokerConfig").Get();
client = new Client
{
- OrgPPAGUID = "ccd7fa02-a2bf-428a-984b-faef69ae0eb2",
- ExecutorGUID = "ccd7fa02-a2bf-428a-984b-faef69ae0eb2",
+ OrgPPAGUID = brokerConfig.OrgPPAGUID,
+ ExecutorGUID = brokerConfig.ExecutorGUID,
UseTunnel = false,
IsPPAK = false,
Role = OrganizationRole.RSO,
@@ -73,7 +77,7 @@
MessageCapturer = messageCapturer
};
- client.SetSigningCertificate("0636D2330032B3C38A4A26D765C787C248");
+ client.SetSigningCertificate(brokerConfig.CertificateSerialNumber);
}
void OnLog(string log)
diff --git a/Hcs.WebApp/Config/BrokerConfig.cs b/Hcs.WebApp/Config/BrokerConfig.cs
new file mode 100644
index 0000000..c0cc750
--- /dev/null
+++ b/Hcs.WebApp/Config/BrokerConfig.cs
@@ -0,0 +1,11 @@
+namespace Hcs.WebApp.Config
+{
+ public class BrokerConfig
+ {
+ public string OrgPPAGUID { get; set; }
+
+ public string ExecutorGUID { get; set; }
+
+ public string CertificateSerialNumber { get; set; }
+ }
+}
diff --git a/Hcs.WebApp/XmlBeautifier.cs b/Hcs.WebApp/Utils/XmlBeautifier.cs
similarity index 96%
rename from Hcs.WebApp/XmlBeautifier.cs
rename to Hcs.WebApp/Utils/XmlBeautifier.cs
index 69ca568..014990b 100644
--- a/Hcs.WebApp/XmlBeautifier.cs
+++ b/Hcs.WebApp/Utils/XmlBeautifier.cs
@@ -2,7 +2,7 @@
using System.Xml;
using System.Xml.Linq;
-namespace Hcs.WebApp
+namespace Hcs.WebApp.Utils
{
internal static class XmlBeautifier
{
diff --git a/Hcs.WebApp/appsettings.Development.json b/Hcs.WebApp/appsettings.Development.json
index 770d3e9..35f62ad 100644
--- a/Hcs.WebApp/appsettings.Development.json
+++ b/Hcs.WebApp/appsettings.Development.json
@@ -5,5 +5,11 @@
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
+ },
+ // В теории это небезопасно, но так как это чисто серверная аппка, то покс
+ "BrokerConfig": {
+ "OrgPPAGUID": "ccd7fa02-a2bf-428a-984b-faef69ae0eb2",
+ "ExecutorGUID": "ccd7fa02-a2bf-428a-984b-faef69ae0eb2",
+ "CertificateSerialNumber": "0636D2330032B3C38A4A26D765C787C248"
}
}
diff --git a/Hcs.WebApp/appsettings.json b/Hcs.WebApp/appsettings.json
index 10f68b8..927e57b 100644
--- a/Hcs.WebApp/appsettings.json
+++ b/Hcs.WebApp/appsettings.json
@@ -5,5 +5,11 @@
"Microsoft.AspNetCore": "Warning"
}
},
- "AllowedHosts": "*"
+ "AllowedHosts": "*",
+ // В теории это небезопасно, но так как это чисто серверная аппка, то покс
+ "BrokerConfig": {
+ "OrgPPAGUID": "ccd7fa02-a2bf-428a-984b-faef69ae0eb2",
+ "ExecutorGUID": "ccd7fa02-a2bf-428a-984b-faef69ae0eb2",
+ "CertificateSerialNumber": "0636D2330032B3C38A4A26D765C787C248"
+ }
}