From 0e3782dd48609b140072311eda9a10d659568888 Mon Sep 17 00:00:00 2001 From: walon Date: Sat, 26 Feb 2022 11:04:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91config=20ge?= =?UTF-8?q?n=5Fgype=20'code=5Fcs=5Fjson'=20=E6=94=B9=E5=90=8D=E4=B8=BA=20'?= =?UTF-8?q?code=5Fcs=5Fdotnet=5Fjson'=EF=BC=8C=E4=B8=8E'code=5Fcs=5Funity?= =?UTF-8?q?=5Fjson'=20=E5=8C=BA=E5=88=86=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E8=AF=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/GenArgs.cs | 2 +- .../{CsCodeJsonRender.cs => CsCodeDotNetJsonRender.cs} | 6 +++--- src/Luban.Server/Luban.Server.csproj | 6 +++--- .../Templates/config/{cs_json => cs_dotnet_json}/bean.tpl | 0 .../Templates/config/{cs_json => cs_dotnet_json}/table.tpl | 0 .../Templates/config/{cs_json => cs_dotnet_json}/tables.tpl | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename src/Luban.Job.Cfg/Source/Generate/{CsCodeJsonRender.cs => CsCodeDotNetJsonRender.cs} (50%) rename src/Luban.Server/Templates/config/{cs_json => cs_dotnet_json}/bean.tpl (100%) rename src/Luban.Server/Templates/config/{cs_json => cs_dotnet_json}/table.tpl (100%) rename src/Luban.Server/Templates/config/{cs_json => cs_dotnet_json}/tables.tpl (100%) diff --git a/src/Luban.Job.Cfg/Source/GenArgs.cs b/src/Luban.Job.Cfg/Source/GenArgs.cs index 2d6a5bb..139e348 100644 --- a/src/Luban.Job.Cfg/Source/GenArgs.cs +++ b/src/Luban.Job.Cfg/Source/GenArgs.cs @@ -8,7 +8,7 @@ namespace Luban.Job.Cfg [Option('s', "service", Required = true, HelpText = "service")] public string Service { get; set; } - [Option("gen_types", Required = true, HelpText = "code_cs_bin,code_cs_json,code_cs_unity_json,code_cs_unity_editor_json,code_lua_bin,code_java_bin,code_java_json,code_go_bin,code_go_json,code_cpp_bin,code_cpp_ue_editor_json,code_python2_json,code_python3_json,code_typescript_bin,code_typescript_json,code_rust_json,code_protobuf,code_template,code_flatbuffers,data_bin,data_lua,data_json,data_json2,data_json_monolithic,data_resources,data_template,data_protobuf_bin,data_protobuf_json,data_flatbuffers_json,convert_json,convert_lua,convert_xlsx . can be multi")] + [Option("gen_types", Required = true, HelpText = "code_cs_bin,code_cs_dotnet_json,code_cs_unity_json,code_cs_unity_editor_json,code_lua_bin,code_java_bin,code_java_json,code_go_bin,code_go_json,code_cpp_bin,code_cpp_ue_editor_json,code_python2_json,code_python3_json,code_typescript_bin,code_typescript_json,code_rust_json,code_protobuf,code_template,code_flatbuffers,data_bin,data_lua,data_json,data_json2,data_json_monolithic,data_resources,data_template,data_protobuf_bin,data_protobuf_json,data_flatbuffers_json,convert_json,convert_lua,convert_xlsx . can be multi")] public string GenType { get; set; } [Option("input_data_dir", Required = true, HelpText = "input data dir")] diff --git a/src/Luban.Job.Cfg/Source/Generate/CsCodeJsonRender.cs b/src/Luban.Job.Cfg/Source/Generate/CsCodeDotNetJsonRender.cs similarity index 50% rename from src/Luban.Job.Cfg/Source/Generate/CsCodeJsonRender.cs rename to src/Luban.Job.Cfg/Source/Generate/CsCodeDotNetJsonRender.cs index 8657a44..d475095 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CsCodeJsonRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CsCodeDotNetJsonRender.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; namespace Luban.Job.Cfg.Generate { - [Render("code_cs_json")] - class CsCodeJsonRender : TemplateCodeRenderBase + [Render("code_cs_dotnet_json")] + class CsCodeDotNetJsonRender : TemplateCodeRenderBase { - protected override string RenderTemplateDir => "cs_json"; + protected override string RenderTemplateDir => "cs_dotnet_json"; } } diff --git a/src/Luban.Server/Luban.Server.csproj b/src/Luban.Server/Luban.Server.csproj index e3d714a..4382fe3 100644 --- a/src/Luban.Server/Luban.Server.csproj +++ b/src/Luban.Server/Luban.Server.csproj @@ -124,13 +124,13 @@ PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest diff --git a/src/Luban.Server/Templates/config/cs_json/bean.tpl b/src/Luban.Server/Templates/config/cs_dotnet_json/bean.tpl similarity index 100% rename from src/Luban.Server/Templates/config/cs_json/bean.tpl rename to src/Luban.Server/Templates/config/cs_dotnet_json/bean.tpl diff --git a/src/Luban.Server/Templates/config/cs_json/table.tpl b/src/Luban.Server/Templates/config/cs_dotnet_json/table.tpl similarity index 100% rename from src/Luban.Server/Templates/config/cs_json/table.tpl rename to src/Luban.Server/Templates/config/cs_dotnet_json/table.tpl diff --git a/src/Luban.Server/Templates/config/cs_json/tables.tpl b/src/Luban.Server/Templates/config/cs_dotnet_json/tables.tpl similarity index 100% rename from src/Luban.Server/Templates/config/cs_json/tables.tpl rename to src/Luban.Server/Templates/config/cs_dotnet_json/tables.tpl