From b1a5d29fa79b134a7cb12c81af93722ab9f90042 Mon Sep 17 00:00:00 2001
From: zenghongyao <873884283@qq.com>
Date: Tue, 22 Apr 2025 10:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Abstracts/ProtocolPlugin.cs                               | 1 +
 .../Subscribers/SubscriberAppService.cs                       | 2 +-
 web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj        | 4 ++--
 web/JiShe.CollectBus.Host/appsettings.json                    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs
index e2c7229..bb9115b 100644
--- a/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol.Contracts/Abstracts/ProtocolPlugin.cs
@@ -356,6 +356,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
         /// <returns></returns>
         public int CalculatePn(string da1, string da2) => (da2.HexToDec() - 1) * 8 + (8 - da1.HexTo4BinZero().IndexOf(da1.Equals("00") ? "0" : "1"));
 
+
         /// <summary>
         /// 计算Fn
         /// </summary>
diff --git a/services/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs
index 569186b..ee0997d 100644
--- a/services/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs
+++ b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAppService.cs
@@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Subscribers
             IServiceProvider serviceProvider,
             IRepository<MessageReceivedLogin, Guid> messageReceivedLoginEventRepository,
             IRepository<MessageReceivedHeartbeat, Guid> messageReceivedHeartbeatEventRepository,
-            IoTDBProvider dbProvider,
+            IIoTDbProvider dbProvider,
             IMeterReadingRecordRepository meterReadingRecordsRepository)
         {
             _logger = logger;
diff --git a/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj b/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
index b4f7d03..86f49a6 100644
--- a/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
+++ b/web/JiShe.CollectBus.Host/JiShe.CollectBus.Host.csproj
@@ -62,10 +62,10 @@
 
   <ItemGroup>
     <None Update="Plugins\JiShe.CollectBus.Protocol.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="Plugins\JiShe.CollectBus.Protocol.Test.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
diff --git a/web/JiShe.CollectBus.Host/appsettings.json b/web/JiShe.CollectBus.Host/appsettings.json
index e2ba871..4b1ed82 100644
--- a/web/JiShe.CollectBus.Host/appsettings.json
+++ b/web/JiShe.CollectBus.Host/appsettings.json
@@ -84,7 +84,7 @@
     "SaslPassword": "lixiao1980",
     "KafkaReplicationFactor": 3,
     "NumPartitions": 30,
-    "ServerTagName": "JiSheCollectBus20"
+    "ServerTagName": "JiSheCollectBus99"
   },
   "IoTDBOptions": {
     "UserName": "root",