diff --git a/MasstransferCommon.Tests/MasstransferCommon.Tests.csproj b/MasstransferCommon.Tests/MasstransferCommon.Tests.csproj
new file mode 100644
index 0000000..4925776
--- /dev/null
+++ b/MasstransferCommon.Tests/MasstransferCommon.Tests.csproj
@@ -0,0 +1,21 @@
+
+
+
+ net7.0
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MasstransferCommon.Tests/Utils/JsonUtilTest.cs b/MasstransferCommon.Tests/Utils/JsonUtilTest.cs
new file mode 100644
index 0000000..871ba5e
--- /dev/null
+++ b/MasstransferCommon.Tests/Utils/JsonUtilTest.cs
@@ -0,0 +1,21 @@
+using System.IO;
+using JetBrains.Annotations;
+using MasstransferCommon.Utils;
+using MasstransferExporter.DataExporter.Model;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MasstransferCommon.Tests.Utils;
+
+[TestClass]
+[TestSubject(typeof(JsonUtil))]
+public class JsonUtilTest
+{
+ [TestMethod]
+ public void Test()
+ {
+ var json = File.ReadAllText("C:\\Users\\huangxianguo\\Desktop\\formula.json");
+
+ var dto = JsonUtil.FromJson(json);
+ Assert.IsNotNull(dto);
+ }
+}
\ No newline at end of file
diff --git a/MasstransferCommon/Utils/JsonUtil.cs b/MasstransferCommon/Utils/JsonUtil.cs
index 1c9da47..1db00a9 100644
--- a/MasstransferCommon/Utils/JsonUtil.cs
+++ b/MasstransferCommon/Utils/JsonUtil.cs
@@ -49,6 +49,7 @@ public class JsonUtil
}
catch (Exception e)
{
+ Console.WriteLine(e);
throw new ArgumentException($" 无效的json 字符串 {json} ");
}
}
diff --git a/MasstransferExporter.sln b/MasstransferExporter.sln
index bfee5fe..9309002 100644
--- a/MasstransferExporter.sln
+++ b/MasstransferExporter.sln
@@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasstransferInfrastructure"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasstransferCommon", "MasstransferCommon\MasstransferCommon.csproj", "{66C6D73C-BADB-4E28-9C83-E701B019626D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject1", "TestProject1\TestProject1.csproj", "{D26C3A44-62AF-4ACC-B454-51E1098C2C86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MasstransferCommon.Tests", "MasstransferCommon.Tests\MasstransferCommon.Tests.csproj", "{DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,9 +26,9 @@ Global
{66C6D73C-BADB-4E28-9C83-E701B019626D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66C6D73C-BADB-4E28-9C83-E701B019626D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66C6D73C-BADB-4E28-9C83-E701B019626D}.Release|Any CPU.Build.0 = Release|Any CPU
- {D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D26C3A44-62AF-4ACC-B454-51E1098C2C86}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
diff --git a/MasstransferExporter.sln.DotSettings.user b/MasstransferExporter.sln.DotSettings.user
index e69de29..e3bc613 100644
--- a/MasstransferExporter.sln.DotSettings.user
+++ b/MasstransferExporter.sln.DotSettings.user
@@ -0,0 +1,8 @@
+
+ MasstransferCommon.Tests
+ d6790ab7-33c2-4425-b2c9-51480cd1a852
+ <SessionState ContinuousTestingMode="0" IsActive="True" Name="Test" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session">
+ <TestAncestor>
+ <TestId>MSTest::DBEDC6E1-AEE6-47FA-A17A-2B412CE99C7C::net7.0::MasstransferCommon.Tests.Utils.JsonUtilTest.Test</TestId>
+ </TestAncestor>
+</SessionState>
\ No newline at end of file
diff --git a/MasstransferExporter/DataExporter/ConfigService.cs b/MasstransferExporter/DataExporter/ConfigService.cs
index 37745d5..92b0438 100644
--- a/MasstransferExporter/DataExporter/ConfigService.cs
+++ b/MasstransferExporter/DataExporter/ConfigService.cs
@@ -1,6 +1,8 @@
using MasstransferCommon.Atrributes;
using MasstransferCommon.Events;
+using MasstransferCommon.Model.Constant;
using MasstransferCommon.Utils;
+using MasstransferCommunicate.Mqtt.Client;
using MasstransferExporter.DataExporter.Model;
using Masuit.Tools;
@@ -16,7 +18,7 @@ public class ConfigService : Instant
///
private static async Task ListenConfigIssuedEvent(EventType type, bool start)
{
- // await MessageQueueHelper.Subscribe(Topics.DownloadConfigData, HandleConfigIssuedEvent);
+ await MessageQueueHelper.Subscribe(Topics.DownloadConfigData, HandleConfigIssuedEvent);
}
@@ -25,7 +27,7 @@ public class ConfigService : Instant
///
///
///
- private static void HandleConfigIssuedEvent(string topic, ConfigData data)
+ private static void HandleConfigIssuedEvent(string topic, ConfigData