refactor: 重构引用关系

src/DataSharing.Application/DataSharing.Application.csproj

@@ -13,8 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\DataSharing.Police110\DataSharing.Police110.csproj" />
     <ProjectReference Include="..\DataSharing.Repository\DataSharing.Repository.csproj" />
-    <ProjectReference Include="..\DataSharing\DataSharing.csproj" />
+    <ProjectReference Include="..\DataSharing.YiBin\DataSharing.YiBin.csproj" />
+    <ProjectReference Include="..\DataSharing.ZiGong\DataSharing.ZiGong.csproj" />
   </ItemGroup>
 
 </Project>

src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -2,7 +2,6 @@
 using DataSharing.Application.Validators.XieTong;
 using DataSharing.Common;
 using DataSharing.DataExchange;
-using DataSharing.Police110.DaoShu110;
 using DataSharing.Province;
 using DataSharing.RawData;
 using DataSharing.SendTask;
@@ -29,6 +28,7 @@ using Microsoft.Extensions.Logging;
 using System.Security.Cryptography;
 using System.Text;
 using System.Web;
+using DataSharing.Police110.DaoShu110;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;

src/DataSharing.Host/Controllers/ConvergenceMediaController.cs

@@ -1,5 +1,4 @@
 using DataSharing.Common;
-using DataSharing.ConvergenceMedia;
 using DataSharing.FwDataExchange;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
@@ -7,6 +6,7 @@ using DataSharing.Share.Dtos.Common;
 using DataSharing.Share.Dtos.ConvergenceMedia;
 using DataSharing.Share.Dtos.HotlineSetting;
 using DataSharing.Share.Enums;
+using DataSharing.YiBin.ConvergenceMedia;
 using DotNetCore.CAP;
 using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.Order;

src/DataSharing.Host/Controllers/EnterpriseController.cs

@@ -1,8 +1,8 @@
 using DataSharing.Application.Identity;
-using DataSharing.Enterprise;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.Enterprise;
+using DataSharing.YiBin.Enterprise;
 using DotNetCore.CAP;
 using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
 using Hotline.Share.Dtos.File;

src/DataSharing.Host/Controllers/OtherPlatformsYBController.cs

@@ -1,11 +1,11 @@
 using DataSharing.Common;
-using DataSharing.ConvergenceMedia;
 using DataSharing.FwDataExchange;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.Common;
 using DataSharing.Share.Dtos.HotlineSetting;
 using DataSharing.Share.Dtos.OtherPlatformsYB;
+using DataSharing.YiBin.ConvergenceMedia;
 using DotNetCore.CAP;
 using MapsterMapper;
 using MediatR;

src/DataSharing.Host/Controllers/WllzYBController.cs

@@ -1,11 +1,11 @@
 using DataSharing.Common;
-using DataSharing.ConvergenceMedia;
 using DataSharing.FwDataExchange;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.Common;
 using DataSharing.Share.Dtos.HotlineSetting;
 using DataSharing.Share.Dtos.OtherPlatformsYB;
+using DataSharing.YiBin.ConvergenceMedia;
 using DotNetCore.CAP;
 using MapsterMapper;
 using MediatR;

src/DataSharing.Host/Controllers/ZzptYBController.cs

@@ -1,11 +1,11 @@
 using DataSharing.Common;
-using DataSharing.ConvergenceMedia;
 using DataSharing.FwDataExchange;
 using DataSharing.RawData;
 using DataSharing.Share.Dtos;
 using DataSharing.Share.Dtos.Common;
 using DataSharing.Share.Dtos.HotlineSetting;
 using DataSharing.Share.Dtos.OtherPlatformsYB;
+using DataSharing.YiBin.ConvergenceMedia;
 using DotNetCore.CAP;
 using MapsterMapper;
 using MediatR;

src/DataSharing.Host/DataSharing.Host.csproj

@@ -23,8 +23,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DataSharing.Application\DataSharing.Application.csproj" />
-    <ProjectReference Include="..\DataSharing.YiBin\DataSharing.YiBin.csproj" />
-    <ProjectReference Include="..\DataSharing.ZiGong\DataSharing.ZiGong.csproj" />
   </ItemGroup>
 
 </Project>

src/DataSharing.Host/config/appsettings.Development.json

@@ -99,7 +99,7 @@
     "CityCode": "511500",
     "CityName": "宜宾市",
 
-    "YiBin": {
+    "CityYiBin": {
       //企业服务
       "Enterprise": {
         "AddressUrl": "http://10.12.185.227:8834/",
@@ -188,7 +188,7 @@
       }
     },
 
-    "ZiGong": {
+    "CityZiGong": {
       //新老数据交换配置
       "SendDataOld": {
         "AddressUrl": "http://192.168.100.195:8066/",

src/DataSharing.Police110/DataSharing.Police110.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DataSharing.Share\DataSharing.Share.csproj" />
+    <ProjectReference Include="..\DataSharing\DataSharing.csproj" />
   </ItemGroup>
 
 

src/DataSharing.YiBin/DataSharing.YiBin.csproj

@@ -11,7 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DataSharing.Share\DataSharing.Share.csproj" />
+    <ProjectReference Include="..\DataSharing.Police110\DataSharing.Police110.csproj" />
+    <ProjectReference Include="..\DataSharing\DataSharing.csproj" />
   </ItemGroup>
 
 </Project>

src/DataSharing.YiBin/Enterprise/EnterprisePusherProviderService.cs

@@ -2,6 +2,7 @@
 using DataSharing.Share.Dtos.Enterprise;
 using Microsoft.Extensions.Logging;
 using System.Net;
+using DataSharing.SendTask;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
 

src/DataSharing/SendTask/SendTaskDataService.cs → src/DataSharing.YiBin/SendTaskDataService.cs

@@ -1,11 +1,12 @@
 using DataSharing.DataExchange;
 using DataSharing.OtherPlatformsYB;
-using DataSharing.Police110.Enterprise;
 using DataSharing.Province;
+using DataSharing.SendTask;
+using DataSharing.YiBin.Enterprise;
 using Microsoft.Extensions.Logging;
 using XF.Domain.Dependency;
 
-namespace DataSharing.SendTask
+namespace DataSharing.YiBin
 {
     /// <summary>
     /// 执行推送任务

src/DataSharing.ZiGong/DataSharing.ZiGong.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DataSharing.Share\DataSharing.Share.csproj" />
+    <ProjectReference Include="..\DataSharing\DataSharing.csproj" />
   </ItemGroup>
 
 </Project>

src/DataSharing/ChannelConfigurationManager.cs

@@ -60,9 +60,9 @@ namespace DataSharing
 
         string GetCityName();
 
-        YiBin GetYiBinConfig();
+        CityYiBin GetYiBinConfig();
 
-        ZiGong GetZiGongConfig();
+        CityZiGong GetZiGongConfig();
     }
 
     /// <summary>
@@ -83,8 +83,8 @@ namespace DataSharing
         public string GetCityCode() => _sharingOption.Value.CityCode;
         public string GetCityName() => _sharingOption.Value.CityName;
 
-        public YiBin GetYiBinConfig() => _sharingOption.Value.YiBin;
+        public CityYiBin GetYiBinConfig() => _sharingOption.Value.YiBin;
 
-        public ZiGong GetZiGongConfig() => _sharingOption.Value.ZiGong;
+        public CityZiGong GetZiGongConfig() => _sharingOption.Value.ZiGong;
     }
 }

src/DataSharing/DataSharing.csproj

@@ -22,7 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DataSharing.Police110\DataSharing.Police110.csproj" />
     <ProjectReference Include="..\DataSharing.Share\DataSharing.Share.csproj" />
   </ItemGroup>
 

src/DataSharing/SharingConfiguration.cs

@@ -5,12 +5,12 @@
         public string CityCode { get; set; }
         public string CityName { get; set; }
 
-        public YiBin YiBin { get; set; }
+        public CityYiBin YiBin { get; set; }
 
-        public ZiGong ZiGong { get; set; }
+        public CityZiGong ZiGong { get; set; }
     }
 
-    public class YiBin
+    public class CityYiBin
     {
         /// <summary>
         /// 企业服务
@@ -34,7 +34,7 @@
 
     }
 
-    public class ZiGong
+    public class CityZiGong
     {
         /// <summary>
         /// 新老数据交换