xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【修复】补充遗漏的未回滚的代码

main
walon 2021-08-20 18:51:01 +08:00
parent 02481f03e1
commit af4038e810
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Luban.Job.Cfg/Source/Utils/DataExporterUtil.cs
View File

@ -30,6 +30,7 @@ namespace Luban.Job.Cfg.Utils
return bytes; return bytes;
} }
case "data_json": case "data_json":
case "data_json2":
{ {
// data_json与data_json2格式区别在于 // data_json与data_json2格式区别在于
// data_json的map格式是 [[key1,value1],[] ..] // data_json的map格式是 [[key1,value1],[] ..]
@ -41,7 +42,15 @@ namespace Luban.Job.Cfg.Utils
SkipValidation = false, SkipValidation = false,
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All), 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(); jsonWriter.Flush();
return System.Text.Encoding.UTF8.GetString(DataUtil.StreamToBytes(ss)); return System.Text.Encoding.UTF8.GetString(DataUtil.StreamToBytes(ss));
} }