diff --git a/JiShe.CollectBus.sln b/JiShe.CollectBus.sln
index 3252e73..6d98b74 100644
--- a/JiShe.CollectBus.sln
+++ b/JiShe.CollectBus.sln
@@ -37,15 +37,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Web", "1.Web", "{A02F7D8A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4.Modules", "4.Modules", "{2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.Protocols", "3.Protocols", "{3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6.Protocols", "6.Protocols", "{3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.Services", "2.Services", "{BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Shared", "5.Shared", "{EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.Shared", "3.Shared", "{EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka.Test", "modules\JiShe.CollectBus.Kafka.Test\JiShe.CollectBus.Kafka.Test.csproj", "{6D6A2A58-7406-9C8C-7B23-3E442CCE3E6B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6.External", "6.External", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.External", "5.External", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Protocol.T1882018", "protocols\JiShe.CollectBus.Protocol.T1882018\JiShe.CollectBus.Protocol.T1882018.csproj", "{430D298B-377E-49B8-83AA-ADC7C0EBDB0F}"
 EndProject
diff --git a/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs b/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs
index 4a5aec8..101eec1 100644
--- a/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs
@@ -1,12 +1,9 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System.Reflection;
 using Volo.Abp;
 using Volo.Abp.Modularity;
 
-namespace JiShe.CollectBus.Protocol
+namespace JiShe.CollectBus.Protocol.T1882018
 {
     public class JiSheCollectBusProtocolT1882018Module : AbpModule
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketBuilder.cs b/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketBuilder.cs
index eaa9ca8..e5511f2 100644
--- a/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketBuilder.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketBuilder.cs
@@ -1,11 +1,7 @@
-using FreeSql;
+using System.Reflection;
 using JiShe.CollectBus.Common.BuildSendDatas;
-using JiShe.CollectBus.Common.Enums;
-using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Common.Models;
-using System.Reflection;
 
-namespace JiShe.CollectBus.Protocol.SendData
+namespace JiShe.CollectBus.Protocol.T1882018.SendData
 {
     /// <summary>
     /// 构建188-2018下发报文
diff --git a/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketRequest.cs b/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketRequest.cs
index ef51ea1..d3c9638 100644
--- a/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketRequest.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketRequest.cs
@@ -1,4 +1,4 @@
-namespace JiShe.CollectBus.Protocol.SendData
+namespace JiShe.CollectBus.Protocol.T1882018.SendData
 {
     /// <summary>
     /// 构建645报文参数
diff --git a/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketResponse.cs b/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketResponse.cs
index 90e6e62..9cde217 100644
--- a/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketResponse.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketResponse.cs
@@ -1,4 +1,4 @@
-namespace JiShe.CollectBus.Protocol.SendData
+namespace JiShe.CollectBus.Protocol.T1882018.SendData
 {
     /// <summary>
     /// 返回645报文结果
diff --git a/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs
index de7b44a..5aa1b1f 100644
--- a/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs
@@ -1,23 +1,16 @@
-using JiShe.CollectBus.Common.BuildSendDatas;
-using JiShe.CollectBus.Common.Consts;
+using JiShe.CollectBus.Common.Consts;
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Common.Helpers;
-using JiShe.CollectBus.Common.Models;
-using JiShe.CollectBus.Enums;
-using JiShe.CollectBus.IotSystems.Devices;
-using JiShe.CollectBus.IotSystems.MessageReceiveds;
 using JiShe.CollectBus.IotSystems.Protocols;
-using JiShe.CollectBus.Kafka.Producer;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
-using JiShe.CollectBus.Protocol.SendData;
+using JiShe.CollectBus.Protocol.Models;
+using JiShe.CollectBus.Protocol.T1882018.SendData;
+using JiShe.CollectBus.Protocol.T37612012;
+using JiShe.CollectBus.Protocol.T37612012.SendData;
 using Mapster;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using TouchSocket.Sockets;
-using Volo.Abp.Domain.Repositories;
 
-namespace JiShe.CollectBus.Protocol
+namespace JiShe.CollectBus.Protocol.T1882018
 {
     /// <summary>
     /// T1882018协议插件
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs
index 406beb9..63ab925 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs
@@ -3,7 +3,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
 {
     /// <summary>
     /// 5.1.3.1 F1：全部确认：对收到报文中的全部数据单元标识进行确认  
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
index 0871607..5ae0b45 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
@@ -3,7 +3,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
 {
     /// <summary>
     /// 5.1.3.2 F2：全部否认
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
index 60ededf..658985f 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
@@ -1,12 +1,12 @@
-using JiShe.CollectBus.Common.Extensions;
+using System.Text;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
-using System.Text;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
 {
     /// <summary>
     /// 5.9.1.2 F1:终端版本信息 
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
index ca64928..5d7f9f7 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
@@ -1,11 +1,11 @@
-using JiShe.CollectBus.Common.Extensions;
+using System.Text;
+using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
-using System.Text;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
 {
     /// <summary>
     ///  5.9.2.4.9 F9：远程通信模块版本信息(只读解析SIM卡号)
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
index b410abe..b6d190f 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
@@ -5,7 +5,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
 {
     /// <summary>
     /// 5.10.1.3.1 F10：终端电能表/交流采样装置配置参数
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
index ced9573..c197509 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
@@ -1,13 +1,11 @@
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Abstracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
 {
     /// <summary>
     /// 5.5.1.3.53 F66：定时上报 2 类数据任务设置
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
index f87aaf3..f9358e2 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
@@ -3,7 +3,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
 {
     /// <summary>
     /// 5.5.1.3.55 F68：定时上报 2 类数据任务启动/停止设置
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
index 2568aab..253f2d1 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
@@ -4,15 +4,14 @@ using JiShe.CollectBus.IoTDB.Interface;
 using JiShe.CollectBus.IoTDB.Options;
 using JiShe.CollectBus.IoTDB.Provider;
 using JiShe.CollectBus.IotSystems.MeterReadingRecords;
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.85 F129：当前正向有功电能示值（总、费率1～M）
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
index a7c65a9..009e9d2 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
@@ -1,12 +1,11 @@
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.86 F130：当前正向无功（组合无功 1）电能示值（总、费率 1～M）
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
index 977b8f0..36492fb 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
@@ -1,12 +1,11 @@
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.87 F131：当前反向有功电能示值（总、费率 1～M）
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
index c6a0fc7..59a41fb 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
@@ -1,12 +1,11 @@
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.88 F132：当前反向无功（组合无功 2）电能示值（总、费率 1～M）
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
index a718674..ec72e1a 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
@@ -1,13 +1,12 @@
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.101 F145：当月正向有功最大需量及发生时间（总、费率 1～M）
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs
index a79ed99..cd7b565 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs
@@ -1,13 +1,12 @@
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.105 F149：上月（上一结算日）正向有功最大需量及发生时间（总、费率 1～M）
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
index 2d2b0c8..b8113af 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
@@ -1,12 +1,11 @@
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 水表抄读取
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
index 94b1085..512aa3d 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
@@ -1,13 +1,12 @@
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.22 F25：当前三相及总有/无功功率、功率因数，三相电压、电流、零序电流、视在功率
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
index f636e92..1874bb5 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
@@ -1,13 +1,12 @@
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.1 F2：终端日历时钟
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
index 054c2c2..3f33b9f 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
@@ -1,12 +1,11 @@
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.30 F33：当前正向有/无功电能示值、一/四象限无功电能示值（总、费率 1～M，1≤M≤12）
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
index e6e42ec..4478952 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
@@ -1,13 +1,12 @@
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
-using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
+namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
     /// <summary>
     /// 5.12.2.4.46 F49：当前电压、电流相位角
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
index 1c6372b..7245d70 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 2 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs
index c56d7fc..7c2db74 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs
@@ -2,7 +2,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 年时区数 p≤14
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs
index 465d461..20870cd 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 日时段表数 q≤8
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs
index f35f34f..cf0c882 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 日时段数(每日切换数) m≤14
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000204.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000204.cs
index ee012f0..56ab772 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000204.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000204.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 费率数 k≤63
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs
index cbbb021..4ce52fc 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套时区表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs
index 4e3ecd4..deb25fe 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 1 日时段表数据：
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs
index 31a5f45..3dee4da 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 2 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs
index d4588d7..d3693c2 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 3 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs
index f16bf26..68faa82 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 4 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs
index ebeb20e..9ef615f 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 5 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs
index 6660605..a31ae33 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 6 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs
index 50220f9..5142cf7 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 7 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs
index c6da235..0074290 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs
@@ -1,8 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 第一套第 8 日时段表数据
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
index 22127e3..86d2149 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
@@ -2,7 +2,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A1 : IAnalysisStrategy<List<string>, string>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs
index 16655ec..2713adb 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs
@@ -2,7 +2,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 附录A.11数据格式
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs
index 47d8413..51d73ab 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs
@@ -2,7 +2,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 附录A.13数据格式
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs
index 4ffb948..5d21ee8 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs
@@ -2,7 +2,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     /// <summary>
     /// 附录A.14数据格式
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs
index c8049cd..284c3f6 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A15 : IAnalysisStrategy<List<string>, string>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs
index e2b40e6..942fc95 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs
@@ -1,6 +1,6 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A17 : IAnalysisStrategy<List<string>, string>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs
index f63bb10..1a6efb5 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Interfaces;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A23 : IAnalysisStrategy<List<string>, decimal>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A25.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A25.cs
index 38b39ae..3cda672 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A25.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A25.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Interfaces;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A25 : IAnalysisStrategy<List<string>, decimal>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs
index 05847d1..3815e85 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Interfaces;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A5 : IAnalysisStrategy<List<string>, decimal>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs
index 9e7a8ad..b75d733 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Interfaces;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A7 : IAnalysisStrategy<List<string>, decimal>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs
index 9f99a80..a3a0b38 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Protocol.Interfaces;
 
-namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
+namespace JiShe.CollectBus.Protocol.T37612012.Appendix
 {
     public class Appendix_A9 : IAnalysisStrategy<List<string>, decimal>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs
index f3e24f7..53ec062 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs
@@ -1,11 +1,11 @@
-using JiShe.CollectBus.Protocol.Interfaces;
+using System.Reflection;
+using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System.Reflection;
 using Volo.Abp;
 using Volo.Abp.Modularity;
 
-namespace JiShe.CollectBus.Protocol.Contracts
+namespace JiShe.CollectBus.Protocol.T37612012
 {
     public class CollectBusProtocolT37612012Module : AbpModule
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs
index 6f8985a..5242c43 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs
@@ -1,12 +1,7 @@
-using JiShe.CollectBus.Common.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using System.Text.RegularExpressions;
+using JiShe.CollectBus.Common.Extensions;
 
-namespace JiShe.CollectBus.Protocol
+namespace JiShe.CollectBus.Protocol.T37612012
 {
     public static class Protocol3761Extensions
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketBuilder.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketBuilder.cs
index 1aa2a22..ab43cc8 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketBuilder.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketBuilder.cs
@@ -1,9 +1,9 @@
-using JiShe.CollectBus.Common.BuildSendDatas;
+using System.Reflection;
+using JiShe.CollectBus.Common.BuildSendDatas;
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Models;
-using System.Reflection;
 
-namespace JiShe.CollectBus.Protocol.Contracts.SendData
+namespace JiShe.CollectBus.Protocol.T37612012.SendData
 {
     /// <summary>
     /// 构建3761下发报文
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketRequest.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketRequest.cs
index df12e09..f02efc9 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketRequest.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketRequest.cs
@@ -1,4 +1,4 @@
-namespace JiShe.CollectBus.Protocol.Contracts.SendData
+namespace JiShe.CollectBus.Protocol.T37612012.SendData
 {
     /// <summary>
     /// 构建3761报文参数
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketResponse.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketResponse.cs
index c27906f..cd4ed6e 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketResponse.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketResponse.cs
@@ -1,4 +1,4 @@
-namespace JiShe.CollectBus.Protocol.Contracts.SendData
+namespace JiShe.CollectBus.Protocol.T37612012.SendData
 {
     /// <summary>
     /// 返回3761报文结果
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs
index 7c6175f..2e71564 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs
@@ -9,8 +9,9 @@ using JiShe.CollectBus.IotSystems.Devices;
 using JiShe.CollectBus.IotSystems.MessageReceiveds;
 using JiShe.CollectBus.IotSystems.Protocols;
 using JiShe.CollectBus.Kafka.Producer;
-using JiShe.CollectBus.Protocol.Contracts.Abstracts;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
+using JiShe.CollectBus.Protocol.Abstracts;
+using JiShe.CollectBus.Protocol.Models;
+using JiShe.CollectBus.Protocol.T37612012.SendData;
 using JiShe.CollectBus.Protocol3761;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,7 +19,7 @@ using Microsoft.Extensions.Logging;
 using TouchSocket.Sockets;
 using Volo.Abp.Domain.Repositories;
 
-namespace JiShe.CollectBus.Protocol
+namespace JiShe.CollectBus.Protocol.T37612012
 {
     public class T37612012ProtocolPlugin : ProtocolPlugin
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs b/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs
index cbd7422..cc20361 100644
--- a/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs
@@ -1,10 +1,9 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
-using System.Reflection;
 using Volo.Abp;
 using Volo.Abp.Modularity;
 
-namespace JiShe.CollectBus.Protocol
+namespace JiShe.CollectBus.Protocol.T6452007
 {
     public class JiSheCollectBusProtocolT6452007Module : AbpModule
     {
diff --git a/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketBuilder.cs b/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketBuilder.cs
index 6c3e69a..2d20272 100644
--- a/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketBuilder.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketBuilder.cs
@@ -1,11 +1,8 @@
-using FreeSql;
+using System.Reflection;
 using JiShe.CollectBus.Common.BuildSendDatas;
-using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Common.Models;
-using System.Reflection;
 
-namespace JiShe.CollectBus.Protocol.SendData
+namespace JiShe.CollectBus.Protocol.T6452007.SendData
 {
     /// <summary>
     /// 构建645-2007下发报文
diff --git a/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketRequest.cs b/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketRequest.cs
index b4b45b7..c367206 100644
--- a/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketRequest.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketRequest.cs
@@ -1,4 +1,4 @@
-namespace JiShe.CollectBus.Protocol.SendData
+namespace JiShe.CollectBus.Protocol.T6452007.SendData
 {
     /// <summary>
     /// 构建645报文参数
diff --git a/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketResponse.cs b/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketResponse.cs
index 6d8f90d..d37c7c7 100644
--- a/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketResponse.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketResponse.cs
@@ -1,4 +1,4 @@
-namespace JiShe.CollectBus.Protocol.SendData
+namespace JiShe.CollectBus.Protocol.T6452007.SendData
 {
     /// <summary>
     /// 返回645报文结果
diff --git a/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs
index fad7ed0..c6554a4 100644
--- a/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs
@@ -1,19 +1,16 @@
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.Common.Models;
-using JiShe.CollectBus.IotSystems.Devices;
 using JiShe.CollectBus.IotSystems.Protocols;
-using JiShe.CollectBus.Kafka.Producer;
-using JiShe.CollectBus.Protocol.Contracts.Abstracts;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
-using JiShe.CollectBus.Protocol.SendData;
+using JiShe.CollectBus.Protocol.Models;
+using JiShe.CollectBus.Protocol.T37612012;
+using JiShe.CollectBus.Protocol.T37612012.SendData;
+using JiShe.CollectBus.Protocol.T6452007.SendData;
 using Mapster;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using TouchSocket.Sockets;
-using Volo.Abp.Domain.Repositories;
 
-namespace JiShe.CollectBus.Protocol
+namespace JiShe.CollectBus.Protocol.T6452007
 {
     /// <summary>
     /// T6452007协议插件
diff --git a/protocols/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs
index cb6d42e..549f00a 100644
--- a/protocols/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs
@@ -1,5 +1,6 @@
 using JiShe.CollectBus.IotSystems.Protocols;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
+using JiShe.CollectBus.Protocol.Models;
+using JiShe.CollectBus.Protocol.T37612012;
 using Microsoft.Extensions.Logging;
 using TouchSocket.Sockets;
 
diff --git a/protocols/JiShe.CollectBus.Protocol/Abstracts/ProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol/Abstracts/ProtocolPlugin.cs
index 0bc18d4..c6779e5 100644
--- a/protocols/JiShe.CollectBus.Protocol/Abstracts/ProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Abstracts/ProtocolPlugin.cs
@@ -1,16 +1,14 @@
 using JiShe.CollectBus.Common.Consts;
-using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.FreeRedis;
 using JiShe.CollectBus.IotSystems.Protocols;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
 using JiShe.CollectBus.Protocol.Interfaces;
-using JiShe.CollectBus.Protocol3761;
+using JiShe.CollectBus.Protocol.Models;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using TouchSocket.Sockets;
 using Volo.Abp.Domain.Repositories;
 
-namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
+namespace JiShe.CollectBus.Protocol.Abstracts
 {
     public abstract class ProtocolPlugin : IProtocolPlugin
     {
diff --git a/protocols/JiShe.CollectBus.Protocol/Adapters/StandardFixedHeaderDataHandlingAdapter.cs b/protocols/JiShe.CollectBus.Protocol/Adapters/StandardFixedHeaderDataHandlingAdapter.cs
index 0984a8f..2f2e992 100644
--- a/protocols/JiShe.CollectBus.Protocol/Adapters/StandardFixedHeaderDataHandlingAdapter.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Adapters/StandardFixedHeaderDataHandlingAdapter.cs
@@ -1,12 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using JiShe.CollectBus.Protocol.Models;
 using TouchSocket.Core;
 
-namespace JiShe.CollectBus.Protocol.Contracts.Adapters
+namespace JiShe.CollectBus.Protocol.Adapters
 {
     public class StandardFixedHeaderDataHandlingAdapter : CustomFixedHeaderDataHandlingAdapter<CustomFixedHeaderRequestInfo>
     {
diff --git a/protocols/JiShe.CollectBus.Protocol/AnalysisData/Appendix.cs b/protocols/JiShe.CollectBus.Protocol/AnalysisData/Appendix.cs
index f68268c..6075363 100644
--- a/protocols/JiShe.CollectBus.Protocol/AnalysisData/Appendix.cs
+++ b/protocols/JiShe.CollectBus.Protocol/AnalysisData/Appendix.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Extensions;
 
-namespace JiShe.CollectBus.Protocol.Contracts.AnalysisData
+namespace JiShe.CollectBus.Protocol.AnalysisData
 {
     /// <summary>
     /// 附录
diff --git a/protocols/JiShe.CollectBus.Protocol/AnalysisStrategyContext.cs b/protocols/JiShe.CollectBus.Protocol/AnalysisStrategyContext.cs
index 8a524cc..cb66bcf 100644
--- a/protocols/JiShe.CollectBus.Protocol/AnalysisStrategyContext.cs
+++ b/protocols/JiShe.CollectBus.Protocol/AnalysisStrategyContext.cs
@@ -1,7 +1,7 @@
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JiShe.CollectBus.Protocol.Contracts
+namespace JiShe.CollectBus.Protocol
 {
 
     public class AnalysisStrategyContext(IServiceProvider provider)
diff --git a/protocols/JiShe.CollectBus.Protocol/Attributes/ProtocolNameAttribute.cs b/protocols/JiShe.CollectBus.Protocol/Attributes/ProtocolNameAttribute.cs
index a04af71..4fa46d5 100644
--- a/protocols/JiShe.CollectBus.Protocol/Attributes/ProtocolNameAttribute.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Attributes/ProtocolNameAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace JiShe.CollectBus.Protocol.Contracts.Attributes
+namespace JiShe.CollectBus.Protocol.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class ProtocolNameAttribute(string name) : Attribute
diff --git a/protocols/JiShe.CollectBus.Protocol/CollectBusProtocolModule.cs b/protocols/JiShe.CollectBus.Protocol/CollectBusProtocolModule.cs
index 4f181db..f044539 100644
--- a/protocols/JiShe.CollectBus.Protocol/CollectBusProtocolModule.cs
+++ b/protocols/JiShe.CollectBus.Protocol/CollectBusProtocolModule.cs
@@ -1,9 +1,6 @@
-using JiShe.CollectBus.FreeRedis.Options;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 
-namespace JiShe.CollectBus.Protocol.Contracts
+namespace JiShe.CollectBus.Protocol
 {
     public class CollectBusProtocolModule : AbpModule
     {
diff --git a/protocols/JiShe.CollectBus.Protocol/Interfaces/IProtocolPlugin.cs b/protocols/JiShe.CollectBus.Protocol/Interfaces/IProtocolPlugin.cs
index 91eba1a..b28f24b 100644
--- a/protocols/JiShe.CollectBus.Protocol/Interfaces/IProtocolPlugin.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Interfaces/IProtocolPlugin.cs
@@ -3,8 +3,7 @@ using System.Threading.Tasks;
 using JiShe.CollectBus.Common.Models;
 using JiShe.CollectBus.IotSystems.MessageReceiveds;
 using JiShe.CollectBus.IotSystems.Protocols;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
+using JiShe.CollectBus.Protocol.Models;
 using TouchSocket.Sockets;
 
 namespace JiShe.CollectBus.Protocol.Interfaces
diff --git a/protocols/JiShe.CollectBus.Protocol/Models/CustomFixedHeaderRequestInfo.cs b/protocols/JiShe.CollectBus.Protocol/Models/CustomFixedHeaderRequestInfo.cs
index 61ea887..def0753 100644
--- a/protocols/JiShe.CollectBus.Protocol/Models/CustomFixedHeaderRequestInfo.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Models/CustomFixedHeaderRequestInfo.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TouchSocket.Core;
+using TouchSocket.Core;
 
-namespace JiShe.CollectBus.Protocol.Contracts.Models
+namespace JiShe.CollectBus.Protocol.Models
 {
     public class CustomFixedHeaderRequestInfo : IFixedHeaderRequestInfo
     {
diff --git a/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildRequest.cs b/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildRequest.cs
index 31b386b..9936dc6 100644
--- a/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildRequest.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildRequest.cs
@@ -1,6 +1,4 @@
-using JiShe.CollectBus.Protocol.Contracts.Models;
-
-namespace JiShe.CollectBus.Protocol.Contracts.SendData
+namespace JiShe.CollectBus.Protocol.Models
 {
     /// <summary>
     /// 报文构建参数
diff --git a/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildResponse.cs b/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildResponse.cs
index 09afc47..b371460 100644
--- a/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildResponse.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildResponse.cs
@@ -1,4 +1,4 @@
-namespace JiShe.CollectBus.Protocol.Contracts.SendData
+namespace JiShe.CollectBus.Protocol.Models
 {
     /// <summary>
     /// 报文构建返回结果
diff --git a/protocols/JiShe.CollectBus.Protocol/Models/SubProtocolBuildRequest.cs b/protocols/JiShe.CollectBus.Protocol/Models/SubProtocolBuildRequest.cs
index c104ea7..09a5c55 100644
--- a/protocols/JiShe.CollectBus.Protocol/Models/SubProtocolBuildRequest.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Models/SubProtocolBuildRequest.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.Protocol.Contracts.Models
+namespace JiShe.CollectBus.Protocol.Models
 {
     /// <summary>
     /// 子协议构建参数
diff --git a/protocols/JiShe.CollectBus.Protocol/Services/ProtocolService.cs b/protocols/JiShe.CollectBus.Protocol/Services/ProtocolService.cs
index c4cf931..0368151 100644
--- a/protocols/JiShe.CollectBus.Protocol/Services/ProtocolService.cs
+++ b/protocols/JiShe.CollectBus.Protocol/Services/ProtocolService.cs
@@ -1,14 +1,14 @@
-using JiShe.CollectBus.Common.Consts;
+using System.Text.RegularExpressions;
+using JiShe.CollectBus.Common.Consts;
 using JiShe.CollectBus.FreeRedis;
 using JiShe.CollectBus.IotSystems.Protocols;
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using System.Text.RegularExpressions;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
 
-namespace JiShe.CollectBus.Protocol.Contracts.Services
+namespace JiShe.CollectBus.Protocol.Services
 {
     public class ProtocolService : IProtocolService, ISingletonDependency
     {
diff --git a/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs b/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
index 33cb02c..ce2e5aa 100644
--- a/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
+++ b/services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
@@ -9,6 +9,7 @@ using JiShe.CollectBus.Interceptors;
 using JiShe.CollectBus.IoTDB;
 using JiShe.CollectBus.Kafka;
 using JiShe.CollectBus.Mappers;
+using JiShe.CollectBus.Protocol;
 using JiShe.CollectBus.Protocol.Contracts;
 using JiShe.CollectBus.ScheduledMeterReading;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
index 2b0df9e..4b62649 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@@ -18,8 +18,6 @@ using JiShe.CollectBus.IotSystems.MeterReadingRecords;
 using JiShe.CollectBus.IotSystems.Watermeter;
 using JiShe.CollectBus.Kafka.Internal;
 using JiShe.CollectBus.Kafka.Producer;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -28,6 +26,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using JiShe.CollectBus.Protocol.Models;
 
 namespace JiShe.CollectBus.ScheduledMeterReading
 {
diff --git a/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
index da0854d..99880af 100644
--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
@@ -15,8 +15,6 @@ using JiShe.CollectBus.IotSystems.MeterReadingRecords;
 using JiShe.CollectBus.IotSystems.Watermeter;
 using JiShe.CollectBus.Kafka.Internal;
 using JiShe.CollectBus.Kafka.Producer;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using JiShe.CollectBus.Protocol.Contracts.SendData;
 using JiShe.CollectBus.Protocol.Interfaces;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
@@ -25,6 +23,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using JiShe.CollectBus.Protocol.Models;
 
 
 namespace JiShe.CollectBus.ScheduledMeterReading
diff --git a/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs
index 990ff51..3fd32fb 100644
--- a/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs
+++ b/services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs
@@ -12,6 +12,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using JiShe.CollectBus.Protocol;
 using TouchSocket.Sockets;
 
 namespace JiShe.CollectBus.Subscribers