src/DataSharing.Host/Controllers/Police110/PoliceDSController.cs

@@ -400,9 +400,13 @@ namespace DataSharing.Host.Controllers.Police110
                         else
                         {
                             var dto = _mapper.Map<IReadOnlyList<ChainAlarm_DSNew>>(listData);
-                            var da = System.Text.Json.JsonSerializer.Serialize(dto, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+                            var daoShuDe= DaoShuDeResponse<IReadOnlyList<ChainAlarm_DSNew>>.Succeed(dto, "调用成功");
                             // 返回数据
-                            apiR = DaoShuDeResponse<string>.Succeed(da, "调用成功");
+                            string jsonResultok = System.Text.Json.JsonSerializer.Serialize(daoShuDe, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+                            jsonResultok = System.Text.RegularExpressions.Regex.Unescape(jsonResultok);
+                            // 加密：json通过sm4加密转base64
+                            string base64ok = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResultok);
+                            return OpenResponse.Ok(base64ok);
                         }
                     }
                 }
@@ -421,8 +425,6 @@ namespace DataSharing.Host.Controllers.Police110
             string base64 = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResult);
 
             _logger.LogInformation($"输出：" + $"\r\n\r\nbase64：{base64}\r\nJson：{jsonResult}");
-            //var resp = new HttpResponseMessage(HttpStatusCode.OK);
-            //resp.Content = new StringContent(base64, Encoding.UTF8, "text/plain");
             return OpenResponse.Ok(base64);
         }
 
@@ -502,9 +504,13 @@ namespace DataSharing.Host.Controllers.Police110
                         else
                         {
                             var dto = _mapper.Map<IReadOnlyList<ChainDeal_DSNew>>(listData);
-                            var da = System.Text.Json.JsonSerializer.Serialize(dto, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+                            var daoShuDe = DaoShuDeResponse<IReadOnlyList<ChainDeal_DSNew>>.Succeed(dto, "调用成功");
                             // 返回数据
-                            apiR = DaoShuDeResponse<string>.Succeed(da, "调用成功");
+                            string jsonResultok = System.Text.Json.JsonSerializer.Serialize(daoShuDe, ProvinceJsonSerializerOptions.UnStandardDatetimeJsonOptions);
+                            jsonResultok = System.Text.RegularExpressions.Regex.Unescape(jsonResultok);
+                            // 加密：json通过sm4加密转base64
+                            string base64ok = Sm4Crypto.Encrypt_ECB_Base64(sm4, jsonResultok);
+                            return OpenResponse.Ok(base64ok);
                         }
                     }
                 }