TANG JIANG 1 ano atrás
pai
commit
d22d8d8d5a

+ 63 - 0
src/Sharing.Api/config/appsettings.Development.json

@@ -46,12 +46,75 @@
       "BaseUrl": "http://localhost:6028/",
       "UrlAddress": "CityHandOver.asmx/FlowWrite"
     },
+    //融媒体
     "MediaCode": {
       "MediaCode": "FWYB0828"
     },
     //系统市州编码
     "CityCode": {
       "AreaCode": "511500"
+    },
+    //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"
     }
   },
   "IdentityUrl": "http://identity.fw.com",

+ 21 - 18
src/Sharing.DaoShu110/Controllers/PoliceDSController.cs

@@ -29,6 +29,7 @@ namespace Sharing.DaoShu110.Controllers
         private readonly IRepository<PoliceSendChainDealDs> _policeSendChainDealDsRepository;
         private readonly IRepository<KnowledgeRawData> _knowledgeRawDataRepository;
         private readonly IHotlineClient _hotlineClient;
+        private readonly IChannelConfigurationManager _channelConfigurationManager;
 
         /// <summary>
         /// 
@@ -44,7 +45,7 @@ namespace Sharing.DaoShu110.Controllers
         public PoliceDSController(IMapper mapper, ICapPublisher capPublisher,
             IRepository<PoliceReceiveChainAlarmDs> policeReceiveChainAlarmDsRepository, IRepository<PoliceReceiveChainDealDs> policeReceiveChainDealDsRepository,
              IRepository<PoliceSendChainAlarmDs> policeSendChainAlarmDsRepository, IRepository<PoliceSendChainDealDs> policeSendChainDealDsRepository,
-             IRepository<KnowledgeRawData> knowledgeRawDataRepository, IHotlineClient hotlineClient)
+             IRepository<KnowledgeRawData> knowledgeRawDataRepository, IHotlineClient hotlineClient, IChannelConfigurationManager channelConfigurationManager)
         {
             _mapper = mapper;
             _capPublisher = capPublisher;
@@ -54,6 +55,7 @@ namespace Sharing.DaoShu110.Controllers
             _policeSendChainDealDsRepository = policeSendChainDealDsRepository;
             _knowledgeRawDataRepository = knowledgeRawDataRepository;
             _hotlineClient = hotlineClient;
+            _channelConfigurationManager = channelConfigurationManager;
         }
 
         #region receive-工单受理-已完成
@@ -70,14 +72,14 @@ namespace Sharing.DaoShu110.Controllers
             // {"LSH":"510300202304070001202304070001","JJYBH":"1001","JJDBH":"510300202304070001202304070001","BJDH":"13555555555","BJDHYHM":"李四","LXDH":"13555555555","BJDZ":"报警地址","JQLBDM":"","JQLBMC":"","BJNR":"报警内容","GXDWDM":"","GXDWMC":"","GXDWDH":"","BJSJ":"2023-04-07 10:43:17","TSSJ":"2023-04-07 10:43:21","JJDWDM":"12345","JJDWMC":"12345","JJLX":"1","XZQHDM":"510300"}
             // 测试Base64
             // kKeUhfS8zca5WTA9D2Z7z/GthYLHroPi8jLN2HduG2vK1PCjb56BZ3wLNCiA8V91ARHpOkE50xFdwBJhW+QKB7J2FRjJ6WUrzkKal75G3DCWzl+Fzto+XbkS5U5wUYnII2zSpdo4U6ILrrK2t2u8mFTd1i03+D1Ytv4TlUH5Jwg/xq00AeF/CVhes4+H5PPcxdU/h3KCDMq9Qaoxf6pALQCMBfatQdsDMw4MG0RK5DUbuaCuElOxfCjlDadZTLuVjHWHDw6wWG9sucqN3mrRllxytIDqIsLSdBi1KuCPaW+FhXf5/+v6Eipby8QEXXTPZxOW4m/Kp8cF87+rxBxRE7nIGAjdO2mKDyfiDeipENxKkQs6taTS52U2OG99Prfp+UAU1Uaj69gQ0IShMVqLgnESWhL5b/vIgO2mtYgIIZ7RpwlTuVqVZKxaFfPpjnQtGRFZPDPHVQcqQ7MMT3rjg6/AWVI/Jh7q+pdu18Y6cojl/EGd/XsNVip+uvAeXdCk
-
-            var sm4 = CToken_Yibin.token1_sm4_mw;
+            var configurationPoliceDS = _channelConfigurationManager.GetConfigurationPoliceDS();
+            var sm4 = configurationPoliceDS.token1_sm4_mw;
 
             IApiResultR apiR;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token1_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceDS.token1_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -200,14 +202,14 @@ namespace Sharing.DaoShu110.Controllers
             // 办结 Jv5JJHwByfD4CXMb1l4PtPsgC6UmNeRfws6mEKz24rackMA28z27tu2GRlIyq0qmbeYeEM0nY783aUxb0jlqSQlk+xtc6cop/CvZI5vczHIsXhtfNozkW/hlx/R43ecuKEvyMzEHwf3EuBZ7jsY1zGuJe61K6YTkmCt6+Xndbd585ZMluNJNIA0qZPbT08jVDiI+wa9ot3HA7AEuDqNxJwfU7NfqoTk6Ml5nnuPkdmp55VKeoLZspAgBflEtFJyppIsN0VQyJkrn+ADQFOPcTpedx5H6+V+2MYM9+5pE/Re17S+s3cA53vWHsf6KhHnCm3M9qtbocu0TtpAEfyMEBQOIRn4pSEJ1i98fpD3xjzuxddkGPOBvhYrh8Tf3IbNTNpNozEda2a0RFmBCQyfzLvEdk4ZK/obYDKncePIRrE3ZtO2QAeAa3H6V532MxcniZJ4mIqHsKShR2Q8uxdsR5Q==
             // 退回 Jv5JJHwByfD4CXMb1l4PtPsgC6UmNeRfws6mEKz24rackMA28z27tu2GRlIyq0qm1U2lexAxHJK7Bhoyw7CNiEXjiobQjSKF2RWOrUHZINPed01DQRTw2pIL03EFsrQpEjsslviumN+BTn/cuJQp8zD2ifPclM87jEJfP2EY6D+UGvUfSebT9mMghSo2VaUeqFzlRKpJmcU6XjV7C65zddc8DEXuYzt0zqATyhac9AO3RGB5SEw9MX1olV8WwPgV4h3OkTTVZ+Dq5co/eb28YIBN+Rshjpv82RusV2thgfvudOyCDZcRDbjh6pEdtj/lvVH/BU2cDo3ch17KtzsPE+xkQvJ68zaAnS8f/klQrFrDHlkmTMi6rEa605yUhhPZFz0Jba+Axizil38YbHV9A1YoxoJNjFXIyL90yCMznb4joMQPRRddp5ky/CbT9r0q283gKBdAY6/v+ywPdalFjg==
             // 回访 Jv5JJHwByfD4CXMb1l4PtPsgC6UmNeRfws6mEKz24rackMA28z27tu2GRlIyq0qmvLqUgIfd0QkyZbzT0iQZwEXjiobQjSKF2RWOrUHZINPed01DQRTw2pIL03EFsrQpEjsslviumN+BTn/cuJQp8zD2ifPclM87jEJfP2EY6D8cMxuK/4X9pyxRWKIQtLFdh4ieC9bhojhr2XxStPHmDV4c3oNEybczbb7IXsaW2FCGMI4SLF7Z+VXDSpCGpFX+0dyUUQPnoRrgU7wndkn/6VYi2Axm19MBkwK+Wm5v85oVQ1HFptf5leUiSXomF9XCPtgWbLOFzu313JW7WQvjgllM7usjI2mbyGtQ5EMXyOGJ/AmAupELpMYVwjoGAKy6B/GE1HFyPiLAazsUE3jfaLPxn/Gld0Ef2glG1SQ/vakDtyvyoJDE83pYvBesmQMx
-
-            string sm4 = CToken_Yibin.token4_sm4_mw;
+            var configurationPoliceDS = _channelConfigurationManager.GetConfigurationPoliceDS();
+            string sm4 = configurationPoliceDS.token4_sm4_mw;
 
             IApiResultR apiR;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token4_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceDS.token4_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -298,14 +300,14 @@ namespace Sharing.DaoShu110.Controllers
         {
             //{"startDate":"2023-04-01 10:43:17","endDate":"2023-04-17 10:43:17"}
             //gzWXSn3A2ZW9u3k9yrHdEqE5zRzto/Rud6LZ6JRJ1k59ou5nWABc8t8fR/sWU89lGweFQMsZkefowEBYzArADnSXjbKwfQj19UoF5RN/0mI=
-            
-            string sm4 = CToken_Yibin.token3_sm4_mw;
+            var configurationPoliceDS = _channelConfigurationManager.GetConfigurationPoliceDS();
+            string sm4 = configurationPoliceDS.token3_sm4_mw;
 
             IApiResultR apiR = null;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token3_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceDS.token3_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -385,14 +387,14 @@ namespace Sharing.DaoShu110.Controllers
 
             // 测试Base64
             // 6RB6Hat8dpBfvCTtEpwotd/MlonxdmqZaa3TcLaua/xcjFv1SZJzKZPrhgsux63Gq/DXxtAQ25buLsI1fgFv3g==
-
-            string sm4 = CToken_Yibin.token2_sm4_mw;
+            var configurationPoliceDS = _channelConfigurationManager.GetConfigurationPoliceDS();
+            string sm4 = configurationPoliceDS.token2_sm4_mw;
 
             IApiResultR apiR = null;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token2_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceDS.token2_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -478,14 +480,14 @@ namespace Sharing.DaoShu110.Controllers
             // 测试Base64
             // sVGPN7BDsKnDLrd6NzrGx+2IH6vVAo6bjGSenIgCJATssZduYxBOLdQi7TVdsBCy7AGk15xjKRVe4AdovL6r49fxDvWjyDlxS8K4qkukEOtYs/VyP6WIdiKQL6PC3i/T
             // sVGPN7BDsKnDLrd6NzrGx+2IH6vVAo6bjGSenIgCJATssZduYxBOLdQi7TVdsBCy7AGk15xjKRVe4AdovL6r49fxDvWjyDlxS8K4qkukEOuaeRL4jMcFsN7HoUTHfDrk
-
-            string sm4 = CToken_Yibin.token5_sm4_mw;
+            var configurationPoliceDS = _channelConfigurationManager.GetConfigurationPoliceDS();
+            string sm4 = configurationPoliceDS.token5_sm4_mw;
 
             IApiResultR apiR = null;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token5_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceDS.token5_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -563,13 +565,14 @@ namespace Sharing.DaoShu110.Controllers
         [AllowAnonymous]
         public async Task<HttpResponseMessage> Get_Knowledge_Content()
         {
-            string sm4 = CToken_Yibin.token6_sm4_mw;
+            var configurationPoliceDS = _channelConfigurationManager.GetConfigurationPoliceDS();
+            string sm4 = configurationPoliceDS.token6_sm4_mw;
 
             IApiResultR apiR;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token6_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), configurationPoliceDS.token6_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                     apiR = ApiResultR.Failed(dcsmMsg);
                 else

+ 0 - 71
src/Sharing.DaoShu110/Extensions/CToken_DaoShu.cs

@@ -1,71 +0,0 @@
-namespace Sharing.DaoShu110.Extensions
-{
-    /// <summary>
-    /// 道枢
-    /// 
-    /// 德阳12345
-    /// 宜宾12345
-    /// 阿坝12345
-    /// 对接110Token
-    /// </summary>
-    public class CToken_DaoShu
-    {
-        #region 初始化
-
-        ////1、非警情分流推送服务_德阳市
-        ////   receive-工单受理
-        //public string token1_token = CToken_Yibin.token1_token;
-        //public string token1_dcsm = CToken_Yibin.token1_dcsm;
-        //public string token1_sm2_public = CToken_Yibin.token1_sm2_public;
-        //public string token1_sm2_private = CToken_Yibin.token1_sm2_private;
-        //public string token1_sm4 = CToken_Yibin.token1_sm4;
-        //public string token1_sm4_mw = CToken_Yibin.token1_sm4_mw;
-
-        ////4、警务警情分流推送服务_自贡市
-        ////   receive-工单办结
-        //public string token4_token = CToken_Yibin.token4_token;
-        //public string token4_dcsm = CToken_Yibin.token4_dcsm;
-        //public string token4_sm2_public = CToken_Yibin.token4_sm2_public;
-        //public string token4_sm2_private = CToken_Yibin.token4_sm2_private;
-        //public string token4_sm4 = CToken_Yibin.token4_sm4;
-        //public string token4_sm4_mw = CToken_Yibin.token4_sm4_mw;
-
-        ////3、警务警情分流查询服务_自贡市
-        ////   send-工单受理
-        //public string token3_token = CToken_Yibin.token3_token;
-        //public string token3_dcsm = CToken_Yibin.token3_dcsm;
-        //public string token3_sm2_public = CToken_Yibin.token3_sm2_public;
-        //public string token3_sm2_private = CToken_Yibin.token3_sm2_private;
-        //public string token3_sm4 = CToken_Yibin.token3_sm4;
-        //public string token3_sm4_mw = CToken_Yibin.token3_sm4_mw;
-
-        ////2、非警情分流查询服务_自贡市
-        ////   send-工单办结
-        //public string token2_token = CToken_Yibin.token2_token;
-        //public string token2_dcsm = CToken_Yibin.token2_dcsm;
-        //public string token2_sm2_public = CToken_Yibin.token2_sm2_public;
-        //public string token2_sm2_private = CToken_Yibin.token2_sm2_private;
-        //public string token2_sm4 = CToken_Yibin.token2_sm4;
-        //public string token2_sm4_mw = CToken_Yibin.token2_sm4_mw;
-
-        ////5、从公安网侧获取12345政务服务热线平台知识库列表
-        ////   send-知识库列表
-        //public string token5_token = CToken_Yibin.token5_token;
-        //public string token5_dcsm = CToken_Yibin.token5_dcsm;
-        //public string token5_sm2_public = CToken_Yibin.token5_sm2_public;
-        //public string token5_sm2_private = CToken_Yibin.token5_sm2_private;
-        //public string token5_sm4 = CToken_Yibin.token5_sm4;
-        //public string token5_sm4_mw = CToken_Yibin.token5_sm4_mw;
-
-        ////6、从公安网侧获取12345政务服务热线平台知识内容
-        ////   send-知识库内容
-        //public string token6_token = CToken_Yibin.token6_token;
-        //public string token6_dcsm = CToken_Yibin.token6_dcsm; 
-        //public string token6_sm2_public = CToken_Yibin.token6_sm2_public;
-        //public string token6_sm2_private = CToken_Yibin.token6_sm2_private;
-        //public string token6_sm4 = CToken_Yibin.token6_sm4;
-        //public string token6_sm4_mw = CToken_Yibin.token6_sm4_mw;
-
-        #endregion
-    }
-}

+ 0 - 69
src/Sharing.DaoShu110/Extensions/CToken_Yibin.cs

@@ -1,69 +0,0 @@
-namespace Sharing.DaoShu110.Extensions
-{
-    /// <summary>
-    /// 宜宾12345
-    /// 对接110Token
-    /// </summary>
-    public static class CToken_Yibin
-    {
-        //1、非警情分流推送服务_宜宾市
-        //   receive-工单受理
-        //   http://10.12.185.168:8001/service/api/ds/110To12345/chainAlarm
-        public static string token1_token = "b8aae0a998f5b79c9a35aecb888e1a58";
-        public static string token1_dcsm = "c9bc4e718d1917a9a68add90fecbe5bb60920e5ab85d9ecb6a6167db4352f42b8ae21ac67a6e2aab48b4c99cd9f93ec5fb017e202df969a91f74456c14e8770a";
-        public static string token1_sm2_public = "BS/H9JVlRdo8vbsZYQLTkeGGZBVjdkX+VJ82CX7n6i4NubmynRIaxvzoSsEAhbbvTDGm2DS96l95nK6Dkd0UZg==";
-        public static string token1_sm2_private = "GbjU4GFk0yaa/wTdzxeh5BOh8VNlqvnTcb7EUtDVvOY=";
-        public static string token1_sm4 = "BKrW/v4jeRgsFg3HSbxEKnDi6rPceW0AdRiaa1rhEwAnraf8MnHdXzUQoQ7+zyjfghaK5G+zDz+wW+Ob27Jgxt91HkVmyL6+SjqV9ZnqNeGFgTBkQrHDySGz6jHKa12Sv7PZs8pjc716he3NNHZAkCI=";
-        public static string token1_sm4_mw = "4034d80c19bbd01d";
-
-        //4、警务警情分流推送服务_宜宾市
-        //   receive-工单办结
-        //   http://10.12.185.168:8001/service/api/ds/110To12345/chainDeal
-        public static string token4_token = "8806bfba29b997853bdb059a9ba9a3ae";
-        public static string token4_dcsm = "f5dce079e0f4acd6b6627b89fb5e72af5fa5775d3ee3b8c7876f546c5ebe723888df4a70c09f9aa5e096bb342d73e0c4793c851a7a8035e8683b07430f132bd3";
-        public static string token4_sm2_public = "P2IVWpFx38GQTDV3hgrxjlOdfPhLQNW2LyvAKmYqMz9UYHCtm/l3K73UIouMXs4jcmZjXyItepvKFv44g3YnXA==";
-        public static string token4_sm2_private = "yxIkRALHoOTxpiZ/jrvCDQatcR7k11Xhps7c92peU9w=";
-        public static string token4_sm4 = "BCD88AXnIfMxe8PrUcubSbFRr07cOuDDEPzy754W3CzhOqjcpAcu1B9B6U46jyM4hEFPqkx+SS1PUAfRlG5tzYD1Z8SKsJTBUDGR6bTMRvCc+C/aps+IcRBfzjjRchtT1c5iok4CfiT4LoK5cmOHKKU=";
-        public static string token4_sm4_mw = "d731ff1282dda792";
-
-        //3、警务警情分流查询服务_宜宾市
-        //   send-工单受理
-        //   http://10.12.185.168:8001/service/api/ds/12345To110/chainAlarm
-        public static string token3_token = "b76ba1896c4880998a86b829cf79888a";
-        public static string token3_dcsm = "3cccc86e021c0ff7827537053ec1b6e4a57cbb49b77c9492257123703c5a6b711000f0842c035fe6d33eb2a947915af53a1ef501916ec7128bff9514d6184e2c";
-        public static string token3_sm2_public = "qaao4Xh8/eyYGeVOj1K8D7p3+OriP55azWDAbYVoZelMdluNrJuQWM2qPn+hjTHTBnIMAVK2HlHBx4oGfCxGdA==";
-        public static string token3_sm2_private = "8bSYM8P3b4I94qGt3XVx3bQddNCy/xVKo7o1b5LI4/M=";
-        public static string token3_sm4 = "BIDhFaEu5NILR7byg/JfaPlJEm4dYWC+u9J1IqhtYeYY1AktOxp7cZWqfk/mWjw72pYGT7YRENCULbjZ2bxVG6UUv2pYukZWtYog34Vicu5IgC8ti4VpED9eGzGgtKJ/CT0KtAnjQPQL0PsVbCjTY5M=";
-        public static string token3_sm4_mw = "bbeb56d247354360";
-
-        //2、非警情分流查询服务_宜宾市
-        //   send-工单办结
-        //   http://10.12.185.168:8001/service/api/ds/12345To110/chainDeal
-        public static string token2_token = "1fbbac1b09b89d11bc569168aabb3c8b";
-        public static string token2_dcsm = "3873c1b1ff0ce3b8120d63509d3b85169cda4856b0a0d89625a4744641a343951d8ced868bd5c7fc60826403bd6314a02e5a26ba8808dae5a9d9f851555338d0";
-        public static string token2_sm2_public = "VgjJ7FfA23vY3Hr1pVrdbi3MZt7X0k/nMf9kwEyyC32CXgT2ccWBlxf3kGPXLO56HSBoo9IA7sSEG3eJYVQmLw==";
-        public static string token2_sm2_private = "QNTPy2nPBe2JY308G0LHO4r42iomDWcdedf81FapkWA=";
-        public static string token2_sm4 = "BKNpLwBCT2MvXwhLRcZ6FoMm4GaXs6LXqVmEa5hMJ3d9G+vC/5j7xtQh9HRKIfSfXkDQI0EQS7UR4inEXks/AnKsLYGhmhRjyzM7AGpEsujr2vJTwcwIWpBmpuc7k0uBQ34bN+kopafIo5UVyk7rIek=";
-        public static string token2_sm4_mw = "2938d7acb2754a09";
-
-        //5、从公安网侧获取12345政务服务热线平台知识库列表
-        //   send-知识库列表
-        //   http://10.12.185.168:8001/service/api/ds/get_knowledge_info
-        public static string token5_token = "1fbbac1b09b89d11bc569168aabb3c8b";
-        public static string token5_dcsm = "3873c1b1ff0ce3b8120d63509d3b85169cda4856b0a0d89625a4744641a343951d8ced868bd5c7fc60826403bd6314a02e5a26ba8808dae5a9d9f851555338d0";
-        public static string token5_sm2_public = "VgjJ7FfA23vY3Hr1pVrdbi3MZt7X0k/nMf9kwEyyC32CXgT2ccWBlxf3kGPXLO56HSBoo9IA7sSEG3eJYVQmLw==";
-        public static string token5_sm2_private = "QNTPy2nPBe2JY308G0LHO4r42iomDWcdedf81FapkWA=";
-        public static string token5_sm4 = "BKNpLwBCT2MvXwhLRcZ6FoMm4GaXs6LXqVmEa5hMJ3d9G+vC/5j7xtQh9HRKIfSfXkDQI0EQS7UR4inEXks/AnKsLYGhmhRjyzM7AGpEsujr2vJTwcwIWpBmpuc7k0uBQ34bN+kopafIo5UVyk7rIek=";
-        public static string token5_sm4_mw = "2938d7acb2754a09";
-
-        //6、从公安网侧获取12345政务服务热线平台知识内容
-        //   send-知识库内容
-        //   http://10.12.185.168:8001/service/api/ds/get_knowledge_content
-        public static string token6_token = "1fbbac1b09b89d11bc569168aabb3c8b";
-        public static string token6_dcsm = "3873c1b1ff0ce3b8120d63509d3b85169cda4856b0a0d89625a4744641a343951d8ced868bd5c7fc60826403bd6314a02e5a26ba8808dae5a9d9f851555338d0";
-        public static string token6_sm2_public = "VgjJ7FfA23vY3Hr1pVrdbi3MZt7X0k/nMf9kwEyyC32CXgT2ccWBlxf3kGPXLO56HSBoo9IA7sSEG3eJYVQmLw==";
-        public static string token6_sm2_private = "QNTPy2nPBe2JY308G0LHO4r42iomDWcdedf81FapkWA=";
-        public static string token6_sm4 = "BKNpLwBCT2MvXwhLRcZ6FoMm4GaXs6LXqVmEa5hMJ3d9G+vC/5j7xtQh9HRKIfSfXkDQI0EQS7UR4inEXks/AnKsLYGhmhRjyzM7AGpEsujr2vJTwcwIWpBmpuc7k0uBQ34bN+kopafIo5UVyk7rIek=";
-        public static string token6_sm4_mw = "2938d7acb2754a09";
-    }
-}

+ 71 - 0
src/Sharing/ChannelConfiguration.cs

@@ -26,6 +26,11 @@ public class ChannelConfiguration
     /// 融媒体
     /// </summary>
     public ConvergenceMediaCode MediaCode { get; set; }
+
+    /// <summary>
+    /// 道枢110
+    /// </summary>
+    public ConfigurationPoliceDS PoliceDS { get; set; }
 }
 
 /// <summary>
@@ -122,4 +127,70 @@ public class ConfigurationCityCode
     /// 
     /// </summary>
     public string AreaCode { get; set; } = string.Empty;
+}
+
+/// <summary>
+/// 道枢110
+/// </summary>
+public class ConfigurationPoliceDS
+{
+    //1、非警情分流推送服务_宜宾市
+    //   receive-工单受理
+    //   http://10.12.185.168:8001/service/api/ds/110To12345/chainAlarm
+    public string token1_token { get; set; }
+    public string token1_dcsm { get; set; }
+    public string token1_sm2_public { get; set; }
+    public string token1_sm2_private { get; set; }
+    public string token1_sm4 { get; set; }
+    public string token1_sm4_mw { get; set; }
+
+    //4、警务警情分流推送服务_宜宾市
+    //   receive-工单办结
+    //   http://10.12.185.168:8001/service/api/ds/110To12345/chainDeal
+    public string token4_token { get; set; }
+    public string token4_dcsm { get; set; }
+    public string token4_sm2_public { get; set; }
+    public string token4_sm2_private { get; set; }
+    public string token4_sm4 { get; set; }
+    public string token4_sm4_mw { get; set; }
+
+    //3、警务警情分流查询服务_宜宾市
+    //   send-工单受理
+    //   http://10.12.185.168:8001/service/api/ds/12345To110/chainAlarm
+    public string token3_token { get; set; }
+    public string token3_dcsm { get; set; }
+    public string token3_sm2_public { get; set; }
+    public string token3_sm2_private { get; set; }
+    public string token3_sm4 { get; set; }
+    public string token3_sm4_mw { get; set; }
+
+    //2、非警情分流查询服务_宜宾市
+    //   send-工单办结
+    //   http://10.12.185.168:8001/service/api/ds/12345To110/chainDeal
+    public string token2_token { get; set; }
+    public string token2_dcsm { get; set; }
+    public string token2_sm2_public { get; set; }
+    public string token2_sm2_private { get; set; }
+    public string token2_sm4 { get; set; }
+    public string token2_sm4_mw { get; set; }
+
+    //5、从公安网侧获取12345政务服务热线平台知识库列表
+    //   send-知识库列表
+    //   http://10.12.185.168:8001/service/api/ds/get_knowledge_info
+    public string token5_token { get; set; }
+    public string token5_dcsm { get; set; }
+    public string token5_sm2_public { get; set; }
+    public string token5_sm2_private { get; set; }
+    public string token5_sm4 { get; set; }
+    public string token5_sm4_mw { get; set; }
+
+    //6、从公安网侧获取12345政务服务热线平台知识内容
+    //   send-知识库内容
+    //   http://10.12.185.168:8001/service/api/ds/get_knowledge_content
+    public string token6_token { get; set; }
+    public string token6_dcsm { get; set; }
+    public string token6_sm2_public { get; set; }
+    public string token6_sm2_private { get; set; }
+    public string token6_sm4 { get; set; }
+    public string token6_sm4_mw { get; set; }
 }

+ 9 - 0
src/Sharing/ChannelConfigurationManager.cs

@@ -63,5 +63,14 @@ namespace Sharing
         {
             return _channelOption.Value.CityCode;
         }
+
+        /// <summary>
+        /// 道枢110
+        /// </summary>
+        /// <returns></returns>
+        public ConfigurationPoliceDS GetConfigurationPoliceDS()
+        {
+            return _channelOption.Value.PoliceDS;
+        }
     }
 }

+ 6 - 0
src/Sharing/IChannelConfigurationManager.cs

@@ -31,4 +31,10 @@ public interface IChannelConfigurationManager
     /// </summary>
     /// <returns></returns>
     ConvergenceMediaCode GetConfigurationMediaCode();
+
+    /// <summary>
+    /// 道枢110
+    /// </summary>
+    /// <returns></returns>
+    ConfigurationPoliceDS GetConfigurationPoliceDS();
 }