From af4038e8109d80ffa319d33a0541a0eb8e055295 Mon Sep 17 00:00:00 2001 From: walon Date: Fri, 20 Aug 2021 18:51:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E9=81=97=E6=BC=8F=E7=9A=84=E6=9C=AA=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs b/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs index d69027e..6dcd02e 100644 --- a/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs +++ b/src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs @@ -30,6 +30,7 @@ namespace Luban.Job.Cfg.Utils return bytes; } case "data_json": + case "data_json2": { // data_json与data_json2格式区别在于 // data_json的map格式是 [[key1,value1],[] ..] @@ -41,7 +42,15 @@ namespace Luban.Job.Cfg.Utils SkipValidation = false, Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All), }); - Json2Exportor.Ins.WriteAsObject(table, records, table.Assembly, jsonWriter); + if (dataType == "data_json") + { + JsonExportor.Ins.WriteAsArray(records, table.Assembly, jsonWriter); + } + else + { + + Json2Exportor.Ins.WriteAsObject(table, records, table.Assembly, jsonWriter); + } jsonWriter.Flush(); return System.Text.Encoding.UTF8.GetString(DataUtil.StreamToBytes(ss)); }