src/Sharing.DaoShu110/Controllers/PoliceDSController.cs

@@ -71,14 +71,13 @@ namespace Sharing.DaoShu110.Controllers
             // 测试Base64
             // kKeUhfS8zca5WTA9D2Z7z/GthYLHroPi8jLN2HduG2vK1PCjb56BZ3wLNCiA8V91ARHpOkE50xFdwBJhW+QKB7J2FRjJ6WUrzkKal75G3DCWzl+Fzto+XbkS5U5wUYnII2zSpdo4U6ILrrK2t2u8mFTd1i03+D1Ytv4TlUH5Jwg/xq00AeF/CVhes4+H5PPcxdU/h3KCDMq9Qaoxf6pALQCMBfatQdsDMw4MG0RK5DUbuaCuElOxfCjlDadZTLuVjHWHDw6wWG9sucqN3mrRllxytIDqIsLSdBi1KuCPaW+FhXf5/+v6Eipby8QEXXTPZxOW4m/Kp8cF87+rxBxRE7nIGAjdO2mKDyfiDeipENxKkQs6taTS52U2OG99Prfp+UAU1Uaj69gQ0IShMVqLgnESWhL5b/vIgO2mtYgIIZ7RpwlTuVqVZKxaFfPpjnQtGRFZPDPHVQcqQ7MMT3rjg6/AWVI/Jh7q+pdu18Y6cojl/EGd/XsNVip+uvAeXdCk
 
-            CToken_DaoShu cToken = new();
-            var sm4 = cToken.token1_sm4_mw;
+            var sm4 = CToken_Yibin.token1_sm4_mw;
 
             IApiResultR apiR;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token1_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token1_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -202,14 +201,13 @@ namespace Sharing.DaoShu110.Controllers
             // 退回 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
 
-            CToken_DaoShu cToken = new();
-            string sm4 = cToken.token4_sm4_mw;
+            string sm4 = CToken_Yibin.token4_sm4_mw;
 
             IApiResultR apiR;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token4_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token4_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -300,14 +298,14 @@ namespace Sharing.DaoShu110.Controllers
         {
             //{"startDate":"2023-04-01 10:43:17","endDate":"2023-04-17 10:43:17"}
             //gzWXSn3A2ZW9u3k9yrHdEqE5zRzto/Rud6LZ6JRJ1k59ou5nWABc8t8fR/sWU89lGweFQMsZkefowEBYzArADnSXjbKwfQj19UoF5RN/0mI=
-            CToken_DaoShu cToken = new();
-            string sm4 = cToken.token3_sm4_mw;
+            
+            string sm4 = CToken_Yibin.token3_sm4_mw;
 
             IApiResultR apiR = null;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token3_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token3_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -388,14 +386,13 @@ namespace Sharing.DaoShu110.Controllers
             // 测试Base64
             // 6RB6Hat8dpBfvCTtEpwotd/MlonxdmqZaa3TcLaua/xcjFv1SZJzKZPrhgsux63Gq/DXxtAQ25buLsI1fgFv3g==
 
-            CToken_DaoShu cToken = new();
-            string sm4 = cToken.token2_sm4_mw;
+            string sm4 = CToken_Yibin.token2_sm4_mw;
 
             IApiResultR apiR = null;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token2_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token2_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -482,14 +479,13 @@ namespace Sharing.DaoShu110.Controllers
             // sVGPN7BDsKnDLrd6NzrGx+2IH6vVAo6bjGSenIgCJATssZduYxBOLdQi7TVdsBCy7AGk15xjKRVe4AdovL6r49fxDvWjyDlxS8K4qkukEOtYs/VyP6WIdiKQL6PC3i/T
             // sVGPN7BDsKnDLrd6NzrGx+2IH6vVAo6bjGSenIgCJATssZduYxBOLdQi7TVdsBCy7AGk15xjKRVe4AdovL6r49fxDvWjyDlxS8K4qkukEOuaeRL4jMcFsN7HoUTHfDrk
 
-            CToken_DaoShu cToken = new();
-            string sm4 = cToken.token5_sm4_mw;
+            string sm4 = CToken_Yibin.token5_sm4_mw;
 
             IApiResultR apiR = null;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token5_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token5_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                 {
                     apiR = ApiResultR.Failed(dcsmMsg);
@@ -567,14 +563,13 @@ namespace Sharing.DaoShu110.Controllers
         [AllowAnonymous]
         public async Task<HttpResponseMessage> Get_Knowledge_Content()
         {
-            CToken_DaoShu cToken = new();
-            string sm4 = cToken.token6_sm4_mw;
+            string sm4 = CToken_Yibin.token6_sm4_mw;
 
             IApiResultR apiR;
             try
             {
                 // 验证dcsm
-                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), cToken.token6_dcsm);
+                string dcsmMsg = CComm.checkDcsm(Request.Headers["dcsm"].ToString(), CToken_Yibin.token6_dcsm);
                 if (!string.IsNullOrEmpty(dcsmMsg))
                     apiR = ApiResultR.Failed(dcsmMsg);
                 else

src/Sharing.DaoShu110/Extensions/CToken_DaoShu.cs

@@ -12,59 +12,59 @@
     {
         #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;
+        ////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;
+        ////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;
+        ////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;
+        ////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;
+        ////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;
+        ////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
     }

src/Sharing.Province/Controllers/ReceiveController.cs

@@ -150,7 +150,7 @@ namespace Sharing.Province.Controllers
         #endregion
 
         /// <summary>
-        /// 服务工单交办接口
+        /// 服务工单交办接口--已完成
         /// </summary>
         /// <param name="receiveCaseInfo"></param>
         /// <returns></returns>
@@ -258,7 +258,7 @@ namespace Sharing.Province.Controllers
         }
 
         /// <summary>
-        /// 服务工单退回反馈接口
+        /// 服务工单退回反馈接口--已完成
         /// </summary>
         /// <param name="receiveBackResult">退回反馈</param>
         /// <returns></returns>