From 21a745a4f7cced34f69946c15ba1a63b54cb018c Mon Sep 17 00:00:00 2001 From: walon Date: Wed, 17 Nov 2021 10:19:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=8D=E6=9E=84=E3=80=91=20config/r?= =?UTF-8?q?ust=5Fjson/mod=5Fheader.tpl=20=E6=94=B9=E5=90=8D=E4=B8=BA=20inc?= =?UTF-8?q?lude.tpl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs | 5 ++--- src/Luban.Server/Luban.Server.csproj | 2 +- .../config/rust_json/{mod_header.tpl => include.tpl} | 0 3 files changed, 3 insertions(+), 4 deletions(-) rename src/Luban.Server/Templates/config/rust_json/{mod_header.tpl => include.tpl} (100%) diff --git a/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs b/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs index 2d74c19..c1392e6 100644 --- a/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs @@ -23,7 +23,7 @@ namespace Luban.Job.Cfg.Generate var lines = new List(); GenerateCodeMonolithic(ctx, RenderFileUtil.GetFileOrDefault(ctx.GenArgs.OutputCodeMonolithicFile, "mod.rs"), lines, ls => { - var template = StringTemplateUtil.GetTemplate("config/rust_json/mod_header"); + var template = StringTemplateUtil.GetTemplate("config/rust_json/include"); var result = template.RenderCode(ctx.ExportTypes); ls.Add(result); }, null); @@ -53,8 +53,7 @@ namespace Luban.Job.Cfg.Generate public override string RenderService(string name, string module, List tables) { var template = StringTemplateUtil.GetTemplate("config/rust_json/tables"); - var result = template.RenderCode(new - { + var result = template.RenderCode(new { Name = name, Namespace = module, Tables = tables, diff --git a/src/Luban.Server/Luban.Server.csproj b/src/Luban.Server/Luban.Server.csproj index 97fa148..efc58c0 100644 --- a/src/Luban.Server/Luban.Server.csproj +++ b/src/Luban.Server/Luban.Server.csproj @@ -179,7 +179,7 @@ PreserveNewest - + PreserveNewest diff --git a/src/Luban.Server/Templates/config/rust_json/mod_header.tpl b/src/Luban.Server/Templates/config/rust_json/include.tpl similarity index 100% rename from src/Luban.Server/Templates/config/rust_json/mod_header.tpl rename to src/Luban.Server/Templates/config/rust_json/include.tpl