From 1d6698fac7e41cfa21bdc5e21154c2a987c00e4d Mon Sep 17 00:00:00 2001 From: walon Date: Sat, 19 Jun 2021 11:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=80=A7=E3=80=91excel?= =?UTF-8?q?=E3=80=81lua=E3=80=81xml=E3=80=81json=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BF=87=E6=BB=A4=20=E3=80=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91datetime=20=E7=B1=BB=E5=9E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=86=8D=E5=9C=A8=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E7=A1=AE=E5=AE=9Autc=E6=97=B6=E9=97=B4=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=AF=BC=E5=87=BA=E6=97=B6=E6=A0=B9=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E5=8C=BA=E5=86=8D=E7=A1=AE=E5=AE=9A=EF=BC=88=E8=B7=9Ftext?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= =?UTF-8?q?=EF=BC=8C=E5=8D=B3=E6=89=80=E6=9C=89=E5=8E=9F=E5=A7=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E6=97=B6=E4=BF=9D=E6=8C=81=E4=B8=8D?= =?UTF-8?q?=E5=8F=98=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=AF=BC=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E6=89=8D=E5=81=9A=E8=BD=AC=E6=8D=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + config/Datas/test/table_one.xlsx | Bin 9516 -> 9402 bytes config/Datas/test/tag_datas/j_not_tag.json | 4 ++ config/Datas/test/tag_datas/j_tag_any.json | 5 ++ config/Datas/test/tag_datas/j_tag_ignore.json | 5 ++ config/Datas/test/tag_datas/j_tag_test.json | 5 ++ config/Datas/test/tag_datas/not_tag.lua | 5 ++ config/Datas/test/tag_datas/tag.xlsx | Bin 0 -> 10149 bytes config/Datas/test/tag_datas/tag_any.lua | 5 ++ .../Datas/test/tag_datas/tag_not_export.lua | 5 ++ config/Datas/test/tag_datas/tag_test.lua | 5 ++ config/Datas/test/tag_datas/x_not_tag.xml | 4 ++ config/Datas/test/tag_datas/x_tag_any.xml | 5 ++ config/Datas/test/tag_datas/x_tag_no.xml | 5 ++ config/Datas/test/tag_datas/x_tag_test.xml | 5 ++ config/Defines/test.xml | 6 ++ .../生成lua数据_不包含测试数据.bat | 11 ++++ ...=> 生成lua数据_包含测试数据.bat} | 0 .../Source/Cache/FileRecordCacheManager.cs | 10 +-- .../Source/DataSources/AbstractDataSource.cs | 27 +++++++- .../DataSources/Binary/BinaryDataSource.cs | 4 +- .../DataSources/Excel/ExcelDataSource.cs | 13 ++-- .../Source/DataSources/Excel/Sheet.cs | 61 +++++++----------- .../Source/DataSources/Json/JsonDataSource.cs | 19 +++++- .../Source/DataSources/Lua/LuaDataSource.cs | 27 ++++++-- .../Source/DataSources/Xml/XmlDataSource.cs | 15 ++++- .../Source/DataVisitors/BinaryExportor.cs | 2 +- .../Source/DataVisitors/IsDefaultValue.cs | 4 +- .../Source/DataVisitors/JsonExportor.cs | 2 +- .../Source/DataVisitors/LuaExportor.cs | 2 +- src/Luban.Job.Cfg/Source/Datas/DDateTime.cs | 20 +++++- src/Luban.Job.Cfg/Source/Datas/Record.cs | 5 +- src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs | 44 ++++++++++--- src/Luban.Job.Cfg/Source/JobController.cs | 14 ++-- .../Source/TypeVisitors/ExcelDataCreator.cs | 2 +- .../Source/TypeVisitors/JsonDataCreator.cs | 2 +- .../Source/TypeVisitors/LuaDataCreator.cs | 2 +- .../Source/TypeVisitors/XmlDataCreator.cs | 2 +- .../Source/Utils/DataLoaderUtil.cs | 16 ++--- src/Luban.Job.Cfg/Source/Utils/DataUtil.cs | 23 +++++-- src/Luban.Job.Cfg/Source/ValidatorContext.cs | 2 +- 41 files changed, 283 insertions(+), 111 deletions(-) create mode 100644 config/Datas/test/tag_datas/j_not_tag.json create mode 100644 config/Datas/test/tag_datas/j_tag_any.json create mode 100644 config/Datas/test/tag_datas/j_tag_ignore.json create mode 100644 config/Datas/test/tag_datas/j_tag_test.json create mode 100644 config/Datas/test/tag_datas/not_tag.lua create mode 100644 config/Datas/test/tag_datas/tag.xlsx create mode 100644 config/Datas/test/tag_datas/tag_any.lua create mode 100644 config/Datas/test/tag_datas/tag_not_export.lua create mode 100644 config/Datas/test/tag_datas/tag_test.lua create mode 100644 config/Datas/test/tag_datas/x_not_tag.xml create mode 100644 config/Datas/test/tag_datas/x_tag_any.xml create mode 100644 config/Datas/test/tag_datas/x_tag_no.xml create mode 100644 config/Datas/test/tag_datas/x_tag_test.xml create mode 100644 config/生成lua数据_不包含测试数据.bat rename config/{生成lua数据.bat => 生成lua数据_包含测试数据.bat} (100%) diff --git a/.gitignore b/.gitignore index 0336fe7..2dd2119 100644 --- a/.gitignore +++ b/.gitignore @@ -268,3 +268,4 @@ __pycache__/ /config/output_code /config/output_data /config/output_lua +/config/output_lua_without_test diff --git a/config/Datas/test/table_one.xlsx b/config/Datas/test/table_one.xlsx index 7b5a98e3f5f9af7e9e9fa8aed23a234f01408e07..8b9c6d8c1b5ea24ba689eec082cc5ab968cba6de 100644 GIT binary patch delta 2561 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 A9smFU delta 2676 zcmY+GX*|>o5XbjG*1B>N7V8LMU5Ub?6{4cGLN*Gab#0D)TH2gR?!TiVvTP#T<6Jp% zMp1I)Dod;siBPUq?c;e~JfG*8SM&MI%$u3{{$`qNEA6USJg~Pp-H3Y-5Qq<0;*p`S zP{Pp{{5c)#SiNke@W49u$IBi zW~fMPh-c}cVz@r-@QHeDiqkPW-<86<$$Dm*U$}GhAAWSI^hE}g-*rv8vT2|6pfr6aF- zwasyNy{eYX#D8d(77BibH(%gtnDQivW~uR7zkr>sW9$?&1Wmg4Q^eL^Z`==Z7lLKE zd8^5!cg(IacLV&QPiuRQcdu}LxC8JN++u85`UXIi7Q0Q80>b z3r{z5ZaWKR+sZa#GMYwBAPmA#b(&(2K>$+nz)n}aiXKh5?{f#QH8R}T0^ zhW}=#$q}nvX$x3`!@qr7t1tHeUO$(S0|j!ku{BB&aWUUaO4|vT+u>i$%$NlpO=%gA z&K0MKD@T~$3Tf-V&IxR~yz4>W%@jn5DMc7LM4-4VNJjRWtnGH+c;P`~ z3r%|VW&8sBlFo^`5Y5D-qRx)t?29#?q;JEtjBn6Lt!=e|gsGG@~Ljq9ep3sJOLv;oh) zz1$|+G;K4{=OR6&`tR*asLoqDLe=~ z&DXmgM?(kJI?BjpqbqPtvOgZTXV%L}327*9SH9@!wgC6M@7aEpYOywm^Q_FVzMv5! zNvRh}sUJSmTy;4TJfcM}RjnWU2uE<$*N&E&j+{$an#gs**p>A_Yz^{>jL4bc*bm2V zVPX7KVdnR?%tSx+cU^tKk8bc#vk{(T&>QT}5kwJD$%0yVhW~Wsig%DsKQ4JR*f4P{ay2I<}p-JWN* zS}zo}1O=X>CuLDgzJ%4VhS-oLoMxy5&xCK9mq6e1-mxd>r_Ta#mi^71etDFHs~(3c z2k{3qBtAIMF4CuEG;r_Dq#iiKy>HzP){sC}{%(H`v}4Q%8=znNxE z4y!xbZkztvm(t~47|JJ?88myT!TUV%IL*xBJMz*d0t5naI8YE!h7hb}3JJgjb(f3B za=;)^{+>RFfq+4z1cd-ppXx#hCq^nycj#%-0g#G-trXgZz>h*2=?0GU2r}T_-j0A7NeUmbJ}G16%36 z3qy1Z|1!Wwd&-wK!GqskM){GvkmsgWCzm6-Y6l!P^5T4E>Jr)sa4!L9%sdWuzCl)SJI*b7QE$7_7 zjp&^xYOl(ufhi}uP+|!mxH(q6Z*qHqJAhGaD?~=7u+NqgA>eFYv@m|#G zs_Inml4gjbg8z&7-k}b17b=1UN^Vv@5+)p(>dd@3Oj)U(W!?VNvh_=MqaQEW+9Qp{+9e#7hjqwd zS6j7|>FO{uB|I2Y#QuEZVCz5qtoVba-xQCka-tV~ozj4qYuwU5> Xa!L+xR6YigRshnKRd}40{!aM|&DG<8 diff --git a/config/Datas/test/tag_datas/j_not_tag.json b/config/Datas/test/tag_datas/j_not_tag.json new file mode 100644 index 0000000..24bff63 --- /dev/null +++ b/config/Datas/test/tag_datas/j_not_tag.json @@ -0,0 +1,4 @@ +{ + "id":2001, + "value": "导出" +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/j_tag_any.json b/config/Datas/test/tag_datas/j_tag_any.json new file mode 100644 index 0000000..7a3c6e9 --- /dev/null +++ b/config/Datas/test/tag_datas/j_tag_any.json @@ -0,0 +1,5 @@ +{ + "__tag__":"any", + "id":2004, + "value": "导出" +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/j_tag_ignore.json b/config/Datas/test/tag_datas/j_tag_ignore.json new file mode 100644 index 0000000..a7415db --- /dev/null +++ b/config/Datas/test/tag_datas/j_tag_ignore.json @@ -0,0 +1,5 @@ +{ + "__tag__":"no", + "id":2002, + "value": "忽略" +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/j_tag_test.json b/config/Datas/test/tag_datas/j_tag_test.json new file mode 100644 index 0000000..bfa461e --- /dev/null +++ b/config/Datas/test/tag_datas/j_tag_test.json @@ -0,0 +1,5 @@ +{ + "__tag__":"测试", + "id":2003, + "value": "导出" +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/not_tag.lua b/config/Datas/test/tag_datas/not_tag.lua new file mode 100644 index 0000000..76b5d3c --- /dev/null +++ b/config/Datas/test/tag_datas/not_tag.lua @@ -0,0 +1,5 @@ + +return { + id = 100, + value = "导出", +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/tag.xlsx b/config/Datas/test/tag_datas/tag.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..9a15a80259cc6d0b2e5ebdc3bd403fe37796dc90 GIT binary patch literal 10149 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 VkML9XVn9nRR!~1+r2WI_{{by8uT1~| literal 0 HcmV?d00001 diff --git a/config/Datas/test/tag_datas/tag_any.lua b/config/Datas/test/tag_datas/tag_any.lua new file mode 100644 index 0000000..1ebb530 --- /dev/null +++ b/config/Datas/test/tag_datas/tag_any.lua @@ -0,0 +1,5 @@ +return { + __tag__ = "随便", + id = 104, + value="导出", +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/tag_not_export.lua b/config/Datas/test/tag_datas/tag_not_export.lua new file mode 100644 index 0000000..6e0e3ae --- /dev/null +++ b/config/Datas/test/tag_datas/tag_not_export.lua @@ -0,0 +1,5 @@ +return { + __tag__ = "no", + id = 101, + value="不导出", +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/tag_test.lua b/config/Datas/test/tag_datas/tag_test.lua new file mode 100644 index 0000000..b853e1c --- /dev/null +++ b/config/Datas/test/tag_datas/tag_test.lua @@ -0,0 +1,5 @@ +return { + __tag__ = "test", + id = 102, + value="测试", +} \ No newline at end of file diff --git a/config/Datas/test/tag_datas/x_not_tag.xml b/config/Datas/test/tag_datas/x_not_tag.xml new file mode 100644 index 0000000..9cb7ac1 --- /dev/null +++ b/config/Datas/test/tag_datas/x_not_tag.xml @@ -0,0 +1,4 @@ + + 3001 + export + \ No newline at end of file diff --git a/config/Datas/test/tag_datas/x_tag_any.xml b/config/Datas/test/tag_datas/x_tag_any.xml new file mode 100644 index 0000000..4a1d24c --- /dev/null +++ b/config/Datas/test/tag_datas/x_tag_any.xml @@ -0,0 +1,5 @@ + + <__tag__>any + 3004 + 其他 + \ No newline at end of file diff --git a/config/Datas/test/tag_datas/x_tag_no.xml b/config/Datas/test/tag_datas/x_tag_no.xml new file mode 100644 index 0000000..5251b04 --- /dev/null +++ b/config/Datas/test/tag_datas/x_tag_no.xml @@ -0,0 +1,5 @@ + + <__tag__>no + 3002 + 不导出 + \ No newline at end of file diff --git a/config/Datas/test/tag_datas/x_tag_test.xml b/config/Datas/test/tag_datas/x_tag_test.xml new file mode 100644 index 0000000..9a49e72 --- /dev/null +++ b/config/Datas/test/tag_datas/x_tag_test.xml @@ -0,0 +1,5 @@ + + <__tag__>test + 3003 + 测试 + \ No newline at end of file diff --git a/config/Defines/test.xml b/config/Defines/test.xml index 44a65bc..e77324e 100644 --- a/config/Defines/test.xml +++ b/config/Defines/test.xml @@ -196,4 +196,10 @@ + + + + + + \ No newline at end of file diff --git a/config/生成lua数据_不包含测试数据.bat b/config/生成lua数据_不包含测试数据.bat new file mode 100644 index 0000000..ee10521 --- /dev/null +++ b/config/生成lua数据_不包含测试数据.bat @@ -0,0 +1,11 @@ +..\src\Luban.Client\bin\Debug\net5.0\Luban.Client.exe ^ + -h %LUBAN_SERVER_IP% ^ + -j cfg ^ + -- ^ + -d Defines/__root__.xml ^ + --input_data_dir Datas ^ + --output_data_dir output_lua_without_test ^ + -s client ^ + --gen_types data_lua + +pause \ No newline at end of file diff --git a/config/生成lua数据.bat b/config/生成lua数据_包含测试数据.bat similarity index 100% rename from config/生成lua数据.bat rename to config/生成lua数据_包含测试数据.bat diff --git a/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs b/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs index 85d25d6..bfe2314 100644 --- a/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs +++ b/src/Luban.Job.Cfg/Source/Cache/FileRecordCacheManager.cs @@ -35,15 +35,15 @@ namespace Luban.Job.Cfg.Cache } } - private readonly ConcurrentDictionary<(string, string, string, bool), FileRecordCache> _caches = new ConcurrentDictionary<(string, string, string, bool), FileRecordCache>(); + private readonly ConcurrentDictionary<(string MD5, string SheetName), FileRecordCache> _caches = new(); private readonly object _shrinkLocker = new object(); - public bool TryGetCacheLoadedRecords(DefTable table, string md5, string originFile, string sheetName, bool exportTestData, out List cacheRecords) + public bool TryGetCacheLoadedRecords(DefTable table, string md5, string originFile, string sheetName, out List cacheRecords) { // TODO text localization check cacheRecords = null; - if (!_caches.TryGetValue((table.Assembly.TimeZone.Id, md5, sheetName, exportTestData), out var r)) + if (!_caches.TryGetValue((md5, sheetName), out var r)) { return false; } @@ -60,11 +60,11 @@ namespace Luban.Job.Cfg.Cache } } - public void AddCacheLoadedRecords(DefTable table, string md5, string sheetName, bool exportTestData, List cacheRecords) + public void AddCacheLoadedRecords(DefTable table, string md5, string sheetName, List cacheRecords) { lock (_shrinkLocker) { - _caches[(table.Assembly.TimeZone.Id, md5, sheetName, exportTestData)] = new FileRecordCache(table, cacheRecords); + _caches[(md5, sheetName)] = new FileRecordCache(table, cacheRecords); if (_caches.Count > CACHE_FILE_HIGH_WATER_MARK) { s_logger.Info("ShrinkCaches. cache count > high CACHE_FILE_HIGH_WATER_MARK:{}", CACHE_FILE_HIGH_WATER_MARK); diff --git a/src/Luban.Job.Cfg/Source/DataSources/AbstractDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/AbstractDataSource.cs index f6d53a0..132beb9 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/AbstractDataSource.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/AbstractDataSource.cs @@ -7,9 +7,32 @@ namespace Luban.Job.Cfg.DataSources { abstract class AbstractDataSource { - public abstract DType ReadOne(TBean type); + public const string TAG_KEY = "__tag__"; - public abstract List ReadMulti(TBean type); + public static bool IsIgnoreTag(string tagName) + { + return !string.IsNullOrWhiteSpace(tagName) && + ( + tagName.Equals("false", System.StringComparison.OrdinalIgnoreCase) + || tagName.Equals("no", System.StringComparison.OrdinalIgnoreCase) + || tagName.Equals("##", System.StringComparison.Ordinal) + || tagName.Equals("", System.StringComparison.Ordinal) + ); + } + + public static bool IsTestTag(string tagName) + { + return !string.IsNullOrWhiteSpace(tagName) && + (tagName.Equals("test", System.StringComparison.OrdinalIgnoreCase) + || tagName.Equals("", System.StringComparison.Ordinal) + ); + } + + public string RawUrl { get; protected set; } + + public abstract Record ReadOne(TBean type); + + public abstract List ReadMulti(TBean type); public abstract void Load(string rawUrl, string sheetName, Stream stream, bool exportDebugData); } diff --git a/src/Luban.Job.Cfg/Source/DataSources/Binary/BinaryDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Binary/BinaryDataSource.cs index 43ecb78..2e3407a 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Binary/BinaryDataSource.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Binary/BinaryDataSource.cs @@ -13,12 +13,12 @@ namespace Luban.Job.Cfg.DataSources.Binary throw new NotImplementedException(); } - public override List ReadMulti(TBean type) + public override List ReadMulti(TBean type) { throw new NotImplementedException(); } - public override DType ReadOne(TBean type) + public override Record ReadOne(TBean type) { throw new NotImplementedException(); } diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/ExcelDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/ExcelDataSource.cs index 37303b2..20099fa 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Excel/ExcelDataSource.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/ExcelDataSource.cs @@ -21,6 +21,7 @@ namespace Luban.Job.Cfg.DataSources.Excel public override void Load(string rawUrl, string sheetName, Stream stream, bool exportTestData) { s_logger.Trace("{filename} {sheet}", rawUrl, sheetName); + RawUrl = rawUrl; string ext = Path.GetExtension(rawUrl); using (var reader = ext != ".csv" ? ExcelReaderFactory.CreateReader(stream) : ExcelReaderFactory.CreateCsvReader(stream)) { @@ -30,7 +31,7 @@ namespace Luban.Job.Cfg.DataSources.Excel { try { - var sheet = ReadSheet(reader, exportTestData); + var sheet = ReadSheet(rawUrl, reader); if (sheet != null) { _sheets.Add(sheet); @@ -50,15 +51,15 @@ namespace Luban.Job.Cfg.DataSources.Excel } } - private Sheet ReadSheet(IExcelDataReader reader, bool exportTestData) + private Sheet ReadSheet(string url, IExcelDataReader reader) { - var sheet = new Sheet(reader.Name ?? "", exportTestData); + var sheet = new Sheet(url, reader.Name ?? ""); return sheet.Load(reader) ? sheet : null; } - public override List ReadMulti(TBean type) + public override List ReadMulti(TBean type) { - var datas = new List(); + var datas = new List(); foreach (var sheet in _sheets) { try @@ -73,7 +74,7 @@ namespace Luban.Job.Cfg.DataSources.Excel return datas; } - public override DType ReadOne(TBean type) + public override Record ReadOne(TBean type) { var datas = ReadMulti(type); switch (datas.Count) diff --git a/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs b/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs index 7c55073..c62bc25 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Excel/Sheet.cs @@ -16,14 +16,14 @@ namespace Luban.Job.Cfg.DataSources.Excel private int TitleRows { get; set; } = 3; // 默认有三行是标题行. 第一行是字段名，第二行是中文描述，第三行是注释 + public string RawUrl { get; } + public string Name { get; } private List> _rowColumns; private Title _rootTitle; - private bool ExportTestData { get; } - public class Title { public int FromIndex { get; set; } @@ -206,10 +206,10 @@ namespace Luban.Job.Cfg.DataSources.Excel } } - public Sheet(string name, bool exportTestData) + public Sheet(string rawUrl, string name) { + this.RawUrl = rawUrl; this.Name = name; - this.ExportTestData = exportTestData; } public bool Load(IExcelDataReader reader) @@ -292,35 +292,17 @@ namespace Luban.Job.Cfg.DataSources.Excel return true; } - private bool NotExport(List row) + private string GetRowTag(List row) { if (row.Count == 0) { - return true; + return null; } if (row[0].Value == null) { - return false; - } - - string exportFlag = row[0].Value.ToString().Trim().ToLower(); - switch (exportFlag) - { - case "false": - case "否": return true; - case "true": - case "是": return false; - case "test": - case "测试": - { - if (!ExportTestData) - { - s_logger.Debug("忽略测试数据. row:{row}", row); - } - return !ExportTestData; - } - default: throw new Exception($"不支持的excel 导出标记: {exportFlag}"); + return null; } + return row[0].Value.ToString().Trim(); } private void InitSubTitles(Title parentTitle, List> rows, CellRange[] mergeCells, int maxDepth, int depth, int fromColumn, int toColumn) @@ -519,15 +501,16 @@ namespace Luban.Job.Cfg.DataSources.Excel throw new Exception($"没有定义任何有效 列"); } _rootTitle.SortSubTitles(); - foreach (var title in _rootTitle.SubTitleList) - { - // s_logger.Info("============ sheet:{sheet} title:{title}", Name, title); - } + //foreach (var title in _rootTitle.SubTitleList) + //{ + // // s_logger.Info("============ sheet:{sheet} title:{title}", Name, title); + //} // 删除标题行 this._rowColumns.RemoveRange(0, Math.Min(TitleRows + titleRowNum - 1, this._rowColumns.Count)); - this._rowColumns.RemoveAll(row => NotExport(row)); + // 删除忽略的记录行 + this._rowColumns.RemoveAll(row => AbstractDataSource.IsIgnoreTag(GetRowTag(row))); } @@ -604,11 +587,11 @@ namespace Luban.Job.Cfg.DataSources.Excel - public List ReadMulti(TBean type, bool enableMultiRowRecord) + public List ReadMulti(TBean type, bool enableMultiRowRecord) { - var datas = new List(); + var datas = new List(); - for (DType data; (data = ReadOne(type, enableMultiRowRecord)) != null;) + for (Record data; (data = ReadOne(type, enableMultiRowRecord)) != null;) { datas.Add(data); } @@ -616,7 +599,7 @@ namespace Luban.Job.Cfg.DataSources.Excel } private int curReadIndex = 0; - public DType ReadOne(TBean type, bool enableMultiRowRecord) + public Record ReadOne(TBean type, bool enableMultiRowRecord) { if (!enableMultiRowRecord) { @@ -625,7 +608,9 @@ namespace Luban.Job.Cfg.DataSources.Excel { return null; } - return ExcelNamedRowDataCreator.Ins.ReadExcel(new NamedRow(_rootTitle, row), type); + bool isTest = AbstractDataSource.IsTestTag(GetRowTag(row)); + var data = (DBean)ExcelNamedRowDataCreator.Ins.ReadExcel(new NamedRow(_rootTitle, row), type); + return new Record(data, RawUrl, isTest); } else { @@ -634,7 +619,9 @@ namespace Luban.Job.Cfg.DataSources.Excel { return null; } - return ExcelNamedRowDataCreator.Ins.ReadExcel(new NamedRow(_rootTitle, rows), type); + bool isTest = AbstractDataSource.IsTestTag(GetRowTag(rows[0])); + var data = (DBean)ExcelNamedRowDataCreator.Ins.ReadExcel(new NamedRow(_rootTitle, rows), type); + return new Record(data, RawUrl, isTest); } } } diff --git a/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs index 5c83b33..f0ca351 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Json/JsonDataSource.cs @@ -15,17 +15,30 @@ namespace Luban.Job.Cfg.DataSources.Json public override void Load(string rawUrl, string sheetName, Stream stream, bool exportDebugData) { + RawUrl = rawUrl; this._data = JsonDocument.Parse(stream).RootElement; } - public override List ReadMulti(TBean type) + public override List ReadMulti(TBean type) { throw new NotImplementedException(); } - public override DType ReadOne(TBean type) + public override Record ReadOne(TBean type) { - return type.Apply(JsonDataCreator.Ins, _data, (DefAssembly)type.Bean.AssemblyBase); + bool isTest = false; + if (_data.TryGetProperty(TAG_KEY, out var tagEle)) + { + var tagName = tagEle.GetString(); + if (IsIgnoreTag(tagName)) + { + return null; + } + isTest = IsTestTag(tagName); + } + + var data = (DBean)type.Apply(JsonDataCreator.Ins, _data, (DefAssembly)type.Bean.AssemblyBase); + return new Record(data, RawUrl, isTest); } } } diff --git a/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs index e6a74c5..4b293a6 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Lua/LuaDataSource.cs @@ -18,25 +18,42 @@ namespace Luban.Job.Cfg.DataSources.Lua public override void Load(string rawUrl, string sheetName, Stream stream, bool exportDebugData) { + RawUrl = rawUrl; _env = LuaManager.CreateEnvironment(); _dataTable = (LuaTable)_env.DoChunk(new StreamReader(stream, Encoding.UTF8), rawUrl)[0]; } - public override List ReadMulti(TBean type) + public override List ReadMulti(TBean type) { - var records = new List(); + var records = new List(); foreach (LuaTable t in _dataTable.Values.Values) { - records.Add(type.Apply(LuaDataCreator.Ins, t, (DefAssembly)type.Bean.AssemblyBase)); + Record r = ReadRecord(t, type); + if (r != null) + { + records.Add(r); + } } return records; } - public override DType ReadOne(TBean type) + public override Record ReadOne(TBean type) { - return type.Apply(LuaDataCreator.Ins, _dataTable, (DefAssembly)type.Bean.AssemblyBase); + return ReadRecord(_dataTable, type); + } + + protected Record ReadRecord(LuaTable table, TBean type) + { + string tagName = table.GetValue(TAG_KEY)?.ToString(); + if (IsIgnoreTag(tagName)) + { + return null; + } + var data = (DBean)type.Apply(LuaDataCreator.Ins, table, (DefAssembly)type.Bean.AssemblyBase); + var isTest = IsTestTag(tagName); + return new Record(data, RawUrl, isTest); } } } diff --git a/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs b/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs index d3736e2..0abf98c 100644 --- a/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs +++ b/src/Luban.Job.Cfg/Source/DataSources/Xml/XmlDataSource.cs @@ -12,19 +12,28 @@ namespace Luban.Job.Cfg.DataSources.Xml class XmlDataSource : AbstractDataSource { private XElement _doc; + public override void Load(string rawUrl, string sheetName, Stream stream, bool exportDebugData) { + RawUrl = rawUrl; _doc = XElement.Load(stream); } - public override List ReadMulti(TBean type) + public override List ReadMulti(TBean type) { throw new NotSupportedException(); } - public override DType ReadOne(TBean type) + public override Record ReadOne(TBean type) { - return type.Apply(XmlDataCreator.Ins, _doc, (DefAssembly)type.Bean.AssemblyBase); + string tagName = _doc.Element(TAG_KEY)?.Value; + if (IsIgnoreTag(tagName)) + { + return null; + } + var data = (DBean)type.Apply(XmlDataCreator.Ins, _doc, (DefAssembly)type.Bean.AssemblyBase); + bool isTest = IsTestTag(tagName); + return new Record(data, RawUrl, isTest); } } } diff --git a/src/Luban.Job.Cfg/Source/DataVisitors/BinaryExportor.cs b/src/Luban.Job.Cfg/Source/DataVisitors/BinaryExportor.cs index 671c865..4927196 100644 --- a/src/Luban.Job.Cfg/Source/DataVisitors/BinaryExportor.cs +++ b/src/Luban.Job.Cfg/Source/DataVisitors/BinaryExportor.cs @@ -183,7 +183,7 @@ namespace Luban.Job.Cfg.DataVisitors public void Accept(DDateTime type, DefAssembly ass, ByteBuf x) { - x.WriteInt(type.UnixTime); + x.WriteInt(type.GetUnixTime(ass.TimeZone)); } } } diff --git a/src/Luban.Job.Cfg/Source/DataVisitors/IsDefaultValue.cs b/src/Luban.Job.Cfg/Source/DataVisitors/IsDefaultValue.cs index c36d4bf..c138d4f 100644 --- a/src/Luban.Job.Cfg/Source/DataVisitors/IsDefaultValue.cs +++ b/src/Luban.Job.Cfg/Source/DataVisitors/IsDefaultValue.cs @@ -70,7 +70,7 @@ namespace Luban.Job.Cfg.DataVisitors public bool Accept(DBytes type) { - throw new NotImplementedException(); + throw new NotSupportedException(); } public bool Accept(DText type) @@ -120,7 +120,7 @@ namespace Luban.Job.Cfg.DataVisitors public bool Accept(DDateTime type) { - return type.UnixTime == 0; + throw new NotSupportedException(); } } } diff --git a/src/Luban.Job.Cfg/Source/DataVisitors/JsonExportor.cs b/src/Luban.Job.Cfg/Source/DataVisitors/JsonExportor.cs index a3f2ce2..cb58a3c 100644 --- a/src/Luban.Job.Cfg/Source/DataVisitors/JsonExportor.cs +++ b/src/Luban.Job.Cfg/Source/DataVisitors/JsonExportor.cs @@ -191,7 +191,7 @@ namespace Luban.Job.Cfg.DataVisitors public void Accept(DDateTime type, DefAssembly ass, Utf8JsonWriter x) { - x.WriteNumberValue(type.UnixTime); + x.WriteNumberValue(type.GetUnixTime(ass.TimeZone)); } } } diff --git a/src/Luban.Job.Cfg/Source/DataVisitors/LuaExportor.cs b/src/Luban.Job.Cfg/Source/DataVisitors/LuaExportor.cs index 1d25f4a..dedab22 100644 --- a/src/Luban.Job.Cfg/Source/DataVisitors/LuaExportor.cs +++ b/src/Luban.Job.Cfg/Source/DataVisitors/LuaExportor.cs @@ -247,7 +247,7 @@ namespace Luban.Job.Cfg.DataVisitors public void Accept(DDateTime type, DefAssembly ass, StringBuilder line) { - line.Append(type.UnixTime); + line.Append(type.GetUnixTime(ass.TimeZone)); } } } diff --git a/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs b/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs index a1c658c..30d931b 100644 --- a/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs +++ b/src/Luban.Job.Cfg/Source/Datas/DDateTime.cs @@ -7,12 +7,28 @@ namespace Luban.Job.Cfg.Datas { public DateTime Time { get; } - public int UnixTime { get; } + //public int UnixTime { get; } + private readonly int _localTime; public DDateTime(DateTime time) { this.Time = time; - this.UnixTime = (int)new DateTimeOffset(time).ToUnixTimeSeconds(); + // time.Kind == DateTimeKind.Unspecified + // DateTimeOffsetLocal + this._localTime = (int)new DateTimeOffset(time).ToUnixTimeSeconds(); + } + + public int GetUnixTime(TimeZoneInfo asTimeZone) + { + if (asTimeZone == null || asTimeZone == TimeZoneInfo.Local) + { + return this._localTime; + } + else + { + var destDateTime = TimeZoneInfo.ConvertTime(Time, asTimeZone, TimeZoneInfo.Utc); + return (int)new DateTimeOffset(destDateTime).ToUnixTimeSeconds(); + } } public override void Apply(IDataActionVisitor visitor, T x) diff --git a/src/Luban.Job.Cfg/Source/Datas/Record.cs b/src/Luban.Job.Cfg/Source/Datas/Record.cs index cfe442a..5f5d6af 100644 --- a/src/Luban.Job.Cfg/Source/Datas/Record.cs +++ b/src/Luban.Job.Cfg/Source/Datas/Record.cs @@ -14,10 +14,13 @@ namespace Luban.Job.Cfg.Datas public int Index { get; set; } - public Record(DBean data, string source) + public bool IsTest { get; } + + public Record(DBean data, string source, bool isTest) { Data = data; Source = source; + IsTest = isTest; } } } diff --git a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs index c943363..54234ae 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs @@ -19,6 +19,19 @@ namespace Luban.Job.Cfg.Defs public List FinalRecords { get; set; } + private List _notTestRecords; + public List NotTestRecords + { + get + { + if (_notTestRecords == null) + { + _notTestRecords = FinalRecords.Where(r => !r.IsTest).ToList(); + } + return _notTestRecords; + } + } + public Dictionary FinalRecordMap { get; set; } public TableDataInfo(List mainRecords, List branchRecords) @@ -34,13 +47,19 @@ namespace Luban.Job.Cfg.Defs public Service CfgTargetService { get; private set; } + private readonly string _branchName; + private readonly bool _exportTestData; + public Branch TargetBranch { get; private set; } public TimeZoneInfo TimeZone { get; } - public DefAssembly(TimeZoneInfo timezone) + public DefAssembly(string branchName, TimeZoneInfo timezone, bool exportTestData, RemoteAgent agent) { + this._branchName = branchName; this.TimeZone = timezone; + this._exportTestData = exportTestData; + this.Agent = agent; } public bool NeedExport(List groups) @@ -100,11 +119,17 @@ namespace Luban.Job.Cfg.Defs // _recordsByTables[table.FullName].FinalRecordMap = recordMap; //} - public List GetTableDataList(DefTable table) + public List GetTableAllDataList(DefTable table) { return _recordsByTables[table.FullName].FinalRecords; } + public List GetTableExportDataList(DefTable table) + { + var tableDataInfo = _recordsByTables[table.FullName]; + return _exportTestData ? tableDataInfo.FinalRecords : tableDataInfo.NotTestRecords; + } + public TableDataInfo GetTableDataInfo(DefTable table) { return _recordsByTables[table.FullName]; @@ -147,9 +172,8 @@ namespace Luban.Job.Cfg.Defs return refTypes.Values.ToList(); } - public void Load(string outputService, string branchName, Defines defines, RemoteAgent agent) + public void Load(string outputService, Defines defines) { - this.Agent = agent; SupportDatetimeType = true; TopModule = defines.TopModule; @@ -161,12 +185,12 @@ namespace Luban.Job.Cfg.Defs throw new ArgumentException($"service:{outputService} not exists"); } - if (!string.IsNullOrWhiteSpace(branchName)) + if (!string.IsNullOrWhiteSpace(_branchName)) { - TargetBranch = defines.Branches.Find(b => b.Name == branchName); + TargetBranch = defines.Branches.Find(b => b.Name == _branchName); if (TargetBranch == null) { - throw new Exception($"branch {branchName} not in valid branch set"); + throw new Exception($"branch {_branchName} not in valid branch set"); } } @@ -211,7 +235,7 @@ namespace Luban.Job.Cfg.Defs } catch (Exception) { - agent.Error("precompile type:{0} error", type.FullName); + this.Agent.Error("precompile type:{0} error", type.FullName); throw; } } @@ -225,7 +249,7 @@ namespace Luban.Job.Cfg.Defs } catch (Exception) { - agent.Error("compile type:{0} error", type.FullName); + this.Agent.Error("compile type:{0} error", type.FullName); s_logger.Error("compile type:{0} error", type.FullName); throw; } @@ -240,7 +264,7 @@ namespace Luban.Job.Cfg.Defs } catch (Exception) { - agent.Error("post compile type:{0} error", type.FullName); + this.Agent.Error("post compile type:{0} error", type.FullName); s_logger.Error("post compile type:{0} error", type.FullName); throw; } diff --git a/src/Luban.Job.Cfg/Source/JobController.cs b/src/Luban.Job.Cfg/Source/JobController.cs index cae212b..2fc980d 100644 --- a/src/Luban.Job.Cfg/Source/JobController.cs +++ b/src/Luban.Job.Cfg/Source/JobController.cs @@ -208,11 +208,11 @@ namespace Luban.Job.Cfg var rawDefines = loader.BuildDefines(); - TimeZoneInfo timeZoneInfo = string.IsNullOrEmpty(args.TimeZone) ? TimeZoneInfo.Local : TimeZoneInfo.FindSystemTimeZoneById(args.TimeZone); + TimeZoneInfo timeZoneInfo = string.IsNullOrEmpty(args.TimeZone) ? null : TimeZoneInfo.FindSystemTimeZoneById(args.TimeZone); - var ass = new DefAssembly(timeZoneInfo); + var ass = new DefAssembly(args.BranchName, timeZoneInfo, args.ExportTestData, agent); - ass.Load(args.Service, args.BranchName, rawDefines, agent); + ass.Load(args.Service, rawDefines); var targetService = ass.CfgTargetService; @@ -948,7 +948,7 @@ class Vector4: { tasks.Add(Task.Run(() => { - var content = DataExporterUtil.ToOutputData(c, ass.GetTableDataList(c), genType); + var content = DataExporterUtil.ToOutputData(c, ass.GetTableExportDataList(c), genType); var file = genType.EndsWith("json") ? c.JsonOutputDataFile : c.OutputDataFile; var md5 = FileUtil.CalcMD5(content); CacheManager.Ins.AddCache(file, md5, content); @@ -965,7 +965,7 @@ class Vector4: { allJsonTask.Add(Task.Run(() => { - return DataExporterUtil.ToOutputData(c, ass.GetTableDataList(c), "data_json"); + return DataExporterUtil.ToOutputData(c, ass.GetTableExportDataList(c), "data_json"); })); } await Task.WhenAll(allJsonTask); @@ -1010,7 +1010,7 @@ class Vector4: { tasks.Add(Task.Run(() => { - var content = DataExporterUtil.ToOutputData(c, ass.GetTableDataList(c), genType); + var content = DataExporterUtil.ToOutputData(c, ass.GetTableExportDataList(c), genType); var file = $"{c.Name}.lua"; var md5 = FileUtil.CalcMD5(content); CacheManager.Ins.AddCache(file, md5, content); @@ -1027,7 +1027,7 @@ class Vector4: { genDataTasks.Add(Task.Run(() => { - return DataExporterUtil.ExportResourceList(ass.GetTableDataList(c)); + return DataExporterUtil.ExportResourceList(ass.GetTableExportDataList(c)); })); } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelDataCreator.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelDataCreator.cs index 19a95b4..681cee2 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/ExcelDataCreator.cs @@ -436,7 +436,7 @@ namespace Luban.Job.Cfg.TypeVisitors { return null; } - return DataUtil.CreateDateTime(d.ToString(), ass.TimeZone); + return DataUtil.CreateDateTime(d.ToString()); } } } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/JsonDataCreator.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/JsonDataCreator.cs index c817711..ce6e9b4 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/JsonDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/JsonDataCreator.cs @@ -197,7 +197,7 @@ namespace Luban.Job.Cfg.TypeVisitors public DType Accept(TDateTime type, JsonElement x, DefAssembly ass) { - return DataUtil.CreateDateTime(x.GetString(), ass.TimeZone); + return DataUtil.CreateDateTime(x.GetString()); } public DType Accept(TVector2 type, JsonElement x, DefAssembly ass) diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/LuaDataCreator.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/LuaDataCreator.cs index c5d65ac..73cd942 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/LuaDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/LuaDataCreator.cs @@ -257,7 +257,7 @@ namespace Luban.Job.Cfg.TypeVisitors public DType Accept(TDateTime type, object x, DefAssembly ass) { - return DataUtil.CreateDateTime(x.ToString(), ass.TimeZone); + return DataUtil.CreateDateTime(x.ToString()); } } } diff --git a/src/Luban.Job.Cfg/Source/TypeVisitors/XmlDataCreator.cs b/src/Luban.Job.Cfg/Source/TypeVisitors/XmlDataCreator.cs index 3f287c0..706a6f9 100644 --- a/src/Luban.Job.Cfg/Source/TypeVisitors/XmlDataCreator.cs +++ b/src/Luban.Job.Cfg/Source/TypeVisitors/XmlDataCreator.cs @@ -193,7 +193,7 @@ namespace Luban.Job.Cfg.TypeVisitors public DType Accept(TDateTime type, XElement x, DefAssembly ass) { - return DataUtil.CreateDateTime(x.Value, ass.TimeZone); + return DataUtil.CreateDateTime(x.Value); } } } diff --git a/src/Luban.Job.Cfg/Source/Utils/DataLoaderUtil.cs b/src/Luban.Job.Cfg/Source/Utils/DataLoaderUtil.cs index 14b1fff..dae266c 100644 --- a/src/Luban.Job.Cfg/Source/Utils/DataLoaderUtil.cs +++ b/src/Luban.Job.Cfg/Source/Utils/DataLoaderUtil.cs @@ -85,7 +85,7 @@ namespace Luban.Job.Cfg.Utils tasks.Add(Task.Run(async () => { - if (FileRecordCacheManager.Ins.TryGetCacheLoadedRecords(table, file.MD5, actualFile, file.SheetName, exportTestData, out var cacheRecords)) + if (FileRecordCacheManager.Ins.TryGetCacheLoadedRecords(table, file.MD5, actualFile, file.SheetName, out var cacheRecords)) { return cacheRecords; } @@ -96,7 +96,7 @@ namespace Luban.Job.Cfg.Utils RenderFileUtil.IsExcelFile(file.ActualFile), exportTestData); - FileRecordCacheManager.Ins.AddCacheLoadedRecords(table, file.MD5, file.SheetName, exportTestData, res); + FileRecordCacheManager.Ins.AddCacheLoadedRecords(table, file.MD5, file.SheetName, res); return res; })); @@ -176,21 +176,15 @@ namespace Luban.Job.Cfg.Utils var dataSource = DataSourceFactory.Create(originFile, sheetName, new MemoryStream(content), exportTestData); try { - List datas; if (multiRecord) { - datas = dataSource.ReadMulti(recordType); + return dataSource.ReadMulti(recordType); } else { - datas = new List { dataSource.ReadOne(recordType) }; + Record record = dataSource.ReadOne(recordType); + return record != null ? new List { record } : new List(); } - var records = new List(datas.Count); - foreach (var data in datas) - { - records.Add(new Record((DBean)data, originFile)); - } - return records; } catch (Exception e) { diff --git a/src/Luban.Job.Cfg/Source/Utils/DataUtil.cs b/src/Luban.Job.Cfg/Source/Utils/DataUtil.cs index fb21d79..1af1222 100644 --- a/src/Luban.Job.Cfg/Source/Utils/DataUtil.cs +++ b/src/Luban.Job.Cfg/Source/Utils/DataUtil.cs @@ -39,16 +39,25 @@ namespace Luban.Job.Cfg.Utils return new DVector4(new System.Numerics.Vector4(float.Parse(values[0]), float.Parse(values[1]), float.Parse(values[2]), float.Parse(values[3]))); } - public static DDateTime CreateDateTime(string x, TimeZoneInfo timeZoneInfo) - { + //public static DDateTime CreateDateTime(string x, TimeZoneInfo timeZoneInfo) + //{ - DateTime dateTime = DateTime.ParseExact(x, - new string[] { + // DateTime dateTime = DateTime.ParseExact(x, + // new string[] { + // "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM-dd", + // //"yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM/dd", + // }, + // System.Globalization.CultureInfo.InvariantCulture); + // return new DDateTime(TimeZoneInfo.ConvertTimeToUtc(dateTime, timeZoneInfo)); + //} + private static readonly string[] dateTimeFormats = new string[] { "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM-dd", //"yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM/dd", - }, - System.Globalization.CultureInfo.InvariantCulture); - return new DDateTime(TimeZoneInfo.ConvertTimeToUtc(dateTime, timeZoneInfo)); + }; + public static DDateTime CreateDateTime(string x) + { + DateTime dateTime = DateTime.ParseExact(x, dateTimeFormats, System.Globalization.CultureInfo.InvariantCulture); + return new DDateTime(dateTime); } public static byte[] StreamToBytes(Stream stream) diff --git a/src/Luban.Job.Cfg/Source/ValidatorContext.cs b/src/Luban.Job.Cfg/Source/ValidatorContext.cs index 55add5d..047ff06 100644 --- a/src/Luban.Job.Cfg/Source/ValidatorContext.cs +++ b/src/Luban.Job.Cfg/Source/ValidatorContext.cs @@ -81,7 +81,7 @@ namespace Luban.Job.Cfg { tasks.Add(Task.Run(() => { - var records = t.Assembly.GetTableDataList(t); + var records = t.Assembly.GetTableAllDataList(t); var visitor = new ValidatorVisitor(this); try {