增加SharingConfiguration

src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -1,7 +1,6 @@
 using DataSharing.Application.Validators.HuiJu;
 using DataSharing.Application.Validators.XieTong;
 using DataSharing.Common;
-using DataSharing.DaoShu110;
 using DataSharing.DataExchange;
 using DataSharing.Province;
 using DataSharing.RawData;
@@ -31,6 +30,7 @@ using System.Security.Cryptography;
 using System.Text;
 using DataSharing.Police110.DaoShu110;
 using System.Web;
+using Microsoft.Extensions.Options;
 using XF.Domain.Cache;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
@@ -61,6 +61,7 @@ namespace DataSharing.Application.Receivers
         private readonly ITypedCache<ConfigurationInformationDto> _configurationInformationCache;
         private readonly IRepository<DsOrderVisitSend> _dsOrderVisitSendRepository;
         private readonly IRepository<DsUserTokenInfo> _dsUserTokenInfoRepository;
+        private readonly ISharingConfigurationManager _sharingConfigurationManager;
 
         /// <summary>
         /// 
@@ -101,7 +102,8 @@ namespace DataSharing.Application.Receivers
              IRepository<DsReceiveDataExchangeData> dsReceiveDataExchangeDataRepository,
              ITypedCache<ConfigurationInformationDto> configurationInformationCache,
              IRepository<DsOrderVisitSend> dsOrderVisitSendRepository,
-             IRepository<DsUserTokenInfo> dsUserTokenInfoRepository)
+             IRepository<DsUserTokenInfo> dsUserTokenInfoRepository,
+             ISharingConfigurationManager sharingConfigurationManager)
         {
             _mapper = mapper;
             _logger = logger;
@@ -122,6 +124,7 @@ namespace DataSharing.Application.Receivers
             _configurationInformationCache = configurationInformationCache;
             _dsOrderVisitSendRepository = dsOrderVisitSendRepository;
             _dsUserTokenInfoRepository = dsUserTokenInfoRepository;
+            _sharingConfigurationManager = sharingConfigurationManager;
         }
         #endregion
 
@@ -1550,6 +1553,19 @@ namespace DataSharing.Application.Receivers
                         //综治平台
                         if (item.Key == "001143")
                             await InitZzptPlatformsAsync(dto.Order, cancellationToken);
+
+                        //switch (_sharingOption.Value.CityCode)
+                        //{
+                        //    case ConfigurationConsts.YiBin:
+                        //        var a = _sharingOption.Value.YiBin.MediaCode;
+                        //        break;
+                        //}
+                        //todo 判断不同地市业务逻辑
+                        if(_sharingConfigurationManager.IsCity(ConfigurationConsts.YiBin))
+                        {
+                            var yibinConfig = _sharingConfigurationManager.GetYiBinConfig();
+                        }
+                        
                     }
                 }
             }

src/DataSharing.Host/StartupExtensions.cs

@@ -33,6 +33,7 @@ internal static class StartupExtensions
 
         services.Configure<IdentityConfiguration>(d => configuration.GetSection(nameof(IdentityConfiguration)).Bind(d));
         services.Configure<ChannelConfiguration>(d => configuration.GetSection(nameof(ChannelConfiguration)).Bind(d));
+        services.Configure<SharingConfiguration>(d => configuration.GetSection(nameof(SharingConfiguration)).Bind(d));
 
         // Add services to the container.
         services

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

@@ -194,5 +194,121 @@
     "BaseUrl": "http://open.hotline.12345lm.cn",
     "ApiKey": "sharing",
     "ApiSecret": "Fwkj@789"
+  },
+  //业务系统附件上传配置
+  "BusinessFile": {
+    "BaseUrl": "http://open.fs.12345lm.cn/",
+    "UploadUrlAddress": "file/upload",
+    "DownloadUrlAddress": "file/downloadfile",
+    "Source": "datasharing"
+  },
+  "SharingConfiguration": {
+    //系统市州编码
+    "CityCode": "511500",
+    "CityName": "宜宾市",
+    "YiBin": {
+      //省12345配置
+      "Province": {
+        "HuiJu": "http://59.225.208.26:8001/cns-sccthj-job-test/rest/",
+        "XieTong": "http://59.225.208.26:8001/cns-scxthj-rest-test/rest/",
+        "ClientId": "dc218a8e-94a3-4cf2-a846-9952b65a40b4",
+        "ClientSecret": "8838050f-529c-4887-ab6c-e4c3b3209813",
+        "MissedCallCount": 6, //未接通通话记录最多上传条数
+        "SendTaskStartTime": "2024-03-31"
+      },
+      //企业服务
+      "Enterprise": {
+        "AddressUrl": "http://10.12.185.227:8834/",
+        "ClientId": "1462598736",
+        "ClientSecret": "6nZtVK4rKfnsncGymUHB",
+        "TenantId": "000000"
+      },
+      //市州数据交换
+      "CityHandOver": {
+        "PushOrder": "CityHandOver.asmx/FlowWrite",
+        "PushOpinion": "CityHandOver.asmx/UndertakAdvice",
+        "NewPushOrder": "api/v1/CityDataExchange/city_hand_data",
+        "NewPushOpinion": "api/v1/CityDataExchange/city_undertak_advice_data",
+        "IsNew": true
+      },
+      //融媒体
+      "MediaCode": "FWYB0828",
+      //新老数据交换配置
+      "SendDataOld": {
+        "AddressUrl": "http://192.168.100.195:8066/",
+        "ClientID": "admin",
+        "Secret": "123456",
+        "IsSend": false
+      },
+      //综治平台
+      "ZzptPlatforms": {
+        "AddressUrl": "http://www.x157123.xyz:80/"
+      },
+      //110对接
+      "PoliceDS": {
+        //1、非警情分流推送服务_宜宾市
+        //   receive-工单受理
+        //   http://10.12.185.168:8001/service/api/ds/110To12345/chainAlarm
+        "token1_token": "b8aae0a998f5b79c9a35aecb888e1a58",
+        "token1_dcsm": "c9bc4e718d1917a9a68add90fecbe5bb60920e5ab85d9ecb6a6167db4352f42b8ae21ac67a6e2aab48b4c99cd9f93ec5fb017e202df969a91f74456c14e8770a",
+        "token1_sm2_public": "BS/H9JVlRdo8vbsZYQLTkeGGZBVjdkX+VJ82CX7n6i4NubmynRIaxvzoSsEAhbbvTDGm2DS96l95nK6Dkd0UZg==",
+        "token1_sm2_private": "GbjU4GFk0yaa/wTdzxeh5BOh8VNlqvnTcb7EUtDVvOY=",
+        "token1_sm4": "BKrW/v4jeRgsFg3HSbxEKnDi6rPceW0AdRiaa1rhEwAnraf8MnHdXzUQoQ7+zyjfghaK5G+zDz+wW+Ob27Jgxt91HkVmyL6+SjqV9ZnqNeGFgTBkQrHDySGz6jHKa12Sv7PZs8pjc716he3NNHZAkCI=",
+        "token1_sm4_mw": "4034d80c19bbd01d",
+
+        //4、警务警情分流推送服务_宜宾市
+        //   receive-工单办结
+        //   http://10.12.185.168:8001/service/api/ds/110To12345/chainDeal
+        "token4_token": "8806bfba29b997853bdb059a9ba9a3ae",
+        "token4_dcsm": "f5dce079e0f4acd6b6627b89fb5e72af5fa5775d3ee3b8c7876f546c5ebe723888df4a70c09f9aa5e096bb342d73e0c4793c851a7a8035e8683b07430f132bd3",
+        "token4_sm2_public": "P2IVWpFx38GQTDV3hgrxjlOdfPhLQNW2LyvAKmYqMz9UYHCtm/l3K73UIouMXs4jcmZjXyItepvKFv44g3YnXA==",
+        "token4_sm2_private": "yxIkRALHoOTxpiZ/jrvCDQatcR7k11Xhps7c92peU9w=",
+        "token4_sm4": "BCD88AXnIfMxe8PrUcubSbFRr07cOuDDEPzy754W3CzhOqjcpAcu1B9B6U46jyM4hEFPqkx+SS1PUAfRlG5tzYD1Z8SKsJTBUDGR6bTMRvCc+C/aps+IcRBfzjjRchtT1c5iok4CfiT4LoK5cmOHKKU=",
+        "token4_sm4_mw": "d731ff1282dda792",
+
+        //3、警务警情分流查询服务_宜宾市
+        //   send-工单受理
+        //   http://10.12.185.168:8001/service/api/ds/12345To110/chainAlarm
+        "token3_token": "b76ba1896c4880998a86b829cf79888a",
+        "token3_dcsm": "3cccc86e021c0ff7827537053ec1b6e4a57cbb49b77c9492257123703c5a6b711000f0842c035fe6d33eb2a947915af53a1ef501916ec7128bff9514d6184e2c",
+        "token3_sm2_public": "qaao4Xh8/eyYGeVOj1K8D7p3+OriP55azWDAbYVoZelMdluNrJuQWM2qPn+hjTHTBnIMAVK2HlHBx4oGfCxGdA==",
+        "token3_sm2_private": "8bSYM8P3b4I94qGt3XVx3bQddNCy/xVKo7o1b5LI4/M=",
+        "token3_sm4": "BIDhFaEu5NILR7byg/JfaPlJEm4dYWC+u9J1IqhtYeYY1AktOxp7cZWqfk/mWjw72pYGT7YRENCULbjZ2bxVG6UUv2pYukZWtYog34Vicu5IgC8ti4VpED9eGzGgtKJ/CT0KtAnjQPQL0PsVbCjTY5M=",
+        "token3_sm4_mw": "bbeb56d247354360",
+
+        //2、非警情分流查询服务_宜宾市
+        //   send-工单办结
+        //   http://10.12.185.168:8001/service/api/ds/12345To110/chainDeal
+        "token2_token": "1fbbac1b09b89d11bc569168aabb3c8b",
+        "token2_dcsm": "3873c1b1ff0ce3b8120d63509d3b85169cda4856b0a0d89625a4744641a343951d8ced868bd5c7fc60826403bd6314a02e5a26ba8808dae5a9d9f851555338d0",
+        "token2_sm2_public": "VgjJ7FfA23vY3Hr1pVrdbi3MZt7X0k/nMf9kwEyyC32CXgT2ccWBlxf3kGPXLO56HSBoo9IA7sSEG3eJYVQmLw==",
+        "token2_sm2_private": "QNTPy2nPBe2JY308G0LHO4r42iomDWcdedf81FapkWA=",
+        "token2_sm4": "BKNpLwBCT2MvXwhLRcZ6FoMm4GaXs6LXqVmEa5hMJ3d9G+vC/5j7xtQh9HRKIfSfXkDQI0EQS7UR4inEXks/AnKsLYGhmhRjyzM7AGpEsujr2vJTwcwIWpBmpuc7k0uBQ34bN+kopafIo5UVyk7rIek=",
+        "token2_sm4_mw": "2938d7acb2754a09",
+
+        //5、从公安网侧获取12345政务服务热线平台知识库列表
+        //   send-知识库列表
+        //   http://10.12.185.168:8001/service/api/ds/get_knowledge_info
+        "token5_token": "1fbbac1b09b89d11bc569168aabb3c8b",
+        "token5_dcsm": "3873c1b1ff0ce3b8120d63509d3b85169cda4856b0a0d89625a4744641a343951d8ced868bd5c7fc60826403bd6314a02e5a26ba8808dae5a9d9f851555338d0",
+        "token5_sm2_public": "VgjJ7FfA23vY3Hr1pVrdbi3MZt7X0k/nMf9kwEyyC32CXgT2ccWBlxf3kGPXLO56HSBoo9IA7sSEG3eJYVQmLw==",
+        "token5_sm2_private": "QNTPy2nPBe2JY308G0LHO4r42iomDWcdedf81FapkWA=",
+        "token5_sm4": "BKNpLwBCT2MvXwhLRcZ6FoMm4GaXs6LXqVmEa5hMJ3d9G+vC/5j7xtQh9HRKIfSfXkDQI0EQS7UR4inEXks/AnKsLYGhmhRjyzM7AGpEsujr2vJTwcwIWpBmpuc7k0uBQ34bN+kopafIo5UVyk7rIek=",
+        "token5_sm4_mw": "2938d7acb2754a09",
+
+        //6、从公安网侧获取12345政务服务热线平台知识内容
+        //   send-知识库内容
+        //   http://10.12.185.168:8001/service/api/ds/get_knowledge_content
+        "token6_token": "1fbbac1b09b89d11bc569168aabb3c8b",
+        "token6_dcsm": "3873c1b1ff0ce3b8120d63509d3b85169cda4856b0a0d89625a4744641a343951d8ced868bd5c7fc60826403bd6314a02e5a26ba8808dae5a9d9f851555338d0",
+        "token6_sm2_public": "VgjJ7FfA23vY3Hr1pVrdbi3MZt7X0k/nMf9kwEyyC32CXgT2ccWBlxf3kGPXLO56HSBoo9IA7sSEG3eJYVQmLw==",
+        "token6_sm2_private": "QNTPy2nPBe2JY308G0LHO4r42iomDWcdedf81FapkWA=",
+        "token6_sm4": "BKNpLwBCT2MvXwhLRcZ6FoMm4GaXs6LXqVmEa5hMJ3d9G+vC/5j7xtQh9HRKIfSfXkDQI0EQS7UR4inEXks/AnKsLYGhmhRjyzM7AGpEsujr2vJTwcwIWpBmpuc7k0uBQ34bN+kopafIo5UVyk7rIek=",
+        "token6_sm4_mw": "2938d7acb2754a09"
+      }
+    },
+    "ZiGong": {
+
+    }
   }
 }

src/DataSharing/ChannelConfigurationManager.cs

@@ -118,4 +118,26 @@ namespace DataSharing
             return _channelOption.Value.ZzptPlatforms;
         }
     }
+
+    public interface ISharingConfigurationManager
+    {
+        bool IsCity(string cityCode);
+
+        YiBin GetYiBinConfig();
+    }
+
+    public class SharingConfigurationManager : ISharingConfigurationManager, IScopeDependency
+    {
+        private readonly IOptionsSnapshot<SharingConfiguration> _sharingOption;
+
+        public SharingConfigurationManager(IOptionsSnapshot<SharingConfiguration> sharingOption)
+        {
+            _sharingOption = sharingOption;
+        }
+
+        public bool IsCity(string cityCode) =>
+            _sharingOption.Value.CityCode.Equals(cityCode, StringComparison.OrdinalIgnoreCase);
+
+        public YiBin GetYiBinConfig() => _sharingOption.Value.YiBin;
+    }
 }

src/DataSharing/ConfigurationConsts.cs

@@ -4,5 +4,7 @@
     {
         public const string SchemeDefault = "default";
         public const string SchemeSmart = "smart";
+
+        public const string YiBin = "511500";
     }
 }

src/DataSharing/SharingConfiguration.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataSharing
+{
+    public class SharingConfiguration
+    {
+        public string CityCode { get; set; }
+        public string CityName { get; set; }
+
+        public YiBin YiBin { get; set; }
+
+        public ZiGong ZiGong { get; set; }
+    }
+
+    public class YiBin
+    {
+        /// <summary>
+        /// 省12345
+        /// </summary>
+        public ConfigurationProvince Province { get; set; }
+
+        /// <summary>
+        /// 企业服务
+        /// </summary>
+        public ConfigurationEnterprise Enterprise { get; set; }
+
+        /// <summary>
+        /// 市州数据交换
+        /// </summary>
+        public ConfigurationCityHandOver CityHandOver { get; set; }
+        
+        /// <summary>
+        /// 道枢110
+        /// </summary>
+        public ConfigurationPoliceDS PoliceDS { get; set; }
+        
+        /// <summary>
+        /// 新老数据交换
+        /// </summary>
+        public ConfigurationSendDataOld SendDataOld { get; set; }
+
+        /// <summary>
+        /// 写入工单数据
+        /// </summary>
+        public ConfigurationHotlineClient HotlineClient { get; set; }
+
+        /// <summary>
+        /// 综治平台
+        /// </summary>
+        public ConvergenceZzptPlatforms ZzptPlatforms { get; set; }
+
+        /// <summary>
+        /// 融媒体
+        /// </summary>
+        public string MediaCode { get; set; }
+    }
+
+    public class ZiGong
+    {
+
+    }
+}