From b0d64bb967708d39466379818a9dd39109f73072 Mon Sep 17 00:00:00 2001 From: walon Date: Sat, 27 Nov 2021 13:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20cfg=20go=E7=9A=84=E7=94=9F=E6=88=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Generate/GoCodeBinRender.cs | 9 ++------- src/Luban.Job.Cfg/Source/Generate/GoCodeJsonRender.cs | 11 ++--------- .../Source/Generate/TemplateRenderBase.cs | 5 ++++- src/Luban.Server/Templates/common/go/enum.tpl | 2 +- src/Luban.Server/Templates/config/go_bin/bean.tpl | 2 +- src/Luban.Server/Templates/config/go_bin/table.tpl | 2 +- src/Luban.Server/Templates/config/go_bin/tables.tpl | 2 +- src/Luban.Server/Templates/config/go_json/bean.tpl | 2 +- src/Luban.Server/Templates/config/go_json/table.tpl | 2 +- src/Luban.Server/Templates/config/go_json/tables.tpl | 2 +- 10 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/Generate/GoCodeBinRender.cs b/src/Luban.Job.Cfg/Source/Generate/GoCodeBinRender.cs index ae1de8d..3ff857c 100644 --- a/src/Luban.Job.Cfg/Source/Generate/GoCodeBinRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/GoCodeBinRender.cs @@ -10,30 +10,25 @@ namespace Luban.Job.Cfg.Generate { public override string Render(DefBean b) { - string package = DefAssembly.LocalAssebmly.TopModule; - var template = StringTemplateUtil.GetTemplate("config/go_bin/bean"); - var result = template.RenderCode(b, new Dictionary() { ["package"] = package }); + var result = template.RenderCode(b); return result; } public override string Render(DefTable p) { - string package = DefAssembly.LocalAssebmly.TopModule; var template = StringTemplateUtil.GetTemplate("config/go_bin/table"); - var result = template.RenderCode(p, new Dictionary() { ["package"] = package }); + var result = template.RenderCode(p); return result; } public override string RenderService(string name, string module, List tables) { - string package = DefAssembly.LocalAssebmly.TopModule; var template = StringTemplateUtil.GetTemplate("config/go_bin/tables"); var result = template.Render(new { Name = name, Namespace = module, Tables = tables, - Package = package, }); return result; } diff --git a/src/Luban.Job.Cfg/Source/Generate/GoCodeJsonRender.cs b/src/Luban.Job.Cfg/Source/Generate/GoCodeJsonRender.cs index 749af76..362a5cb 100644 --- a/src/Luban.Job.Cfg/Source/Generate/GoCodeJsonRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/GoCodeJsonRender.cs @@ -10,34 +10,27 @@ namespace Luban.Job.Cfg.Generate { public override string Render(DefBean b) { - string package = "cfg"; - var template = StringTemplateUtil.GetTemplate("config/go_json/bean"); - var result = template.RenderCode(b, new Dictionary() { ["package"] = package }); + var result = template.RenderCode(b); return result; } public override string Render(DefTable p) { - // TODO 目前只有普通表支持多态. 单例表和双key表都不支持 - string package = "cfg"; var template = StringTemplateUtil.GetTemplate("config/go_json/table"); - var result = template.RenderCode(p, new Dictionary() { ["package"] = package }); + var result = template.RenderCode(p); return result; } public override string RenderService(string name, string module, List tables) { - string package = "cfg"; - var template = StringTemplateUtil.GetTemplate("config/go_json/tables"); var result = template.Render(new { Name = name, Namespace = module, Tables = tables, - Package = package, }); return result; diff --git a/src/Luban.Job.Proto/Source/Generate/TemplateRenderBase.cs b/src/Luban.Job.Proto/Source/Generate/TemplateRenderBase.cs index 3a8e354..36dd4fb 100644 --- a/src/Luban.Job.Proto/Source/Generate/TemplateRenderBase.cs +++ b/src/Luban.Job.Proto/Source/Generate/TemplateRenderBase.cs @@ -16,7 +16,10 @@ namespace Luban.Job.Proto.Generate protected override string Render(DefEnum e) { - return RenderUtil.RenderCsEnumClass(e); + var template = StringTemplateUtil.GetTemplate($"common/{RenderTemplateDir}/enum"); + var result = template.Render(e); + + return result; } protected override string Render(DefBean b) diff --git a/src/Luban.Server/Templates/common/go/enum.tpl b/src/Luban.Server/Templates/common/go/enum.tpl index 8da49bb..34e2d8b 100644 --- a/src/Luban.Server/Templates/common/go/enum.tpl +++ b/src/Luban.Server/Templates/common/go/enum.tpl @@ -1,4 +1,4 @@ -package {{package}} +package {{x.top_module}} const ( {{~for item in x.items ~}} diff --git a/src/Luban.Server/Templates/config/go_bin/bean.tpl b/src/Luban.Server/Templates/config/go_bin/bean.tpl index 532928f..f1788dd 100644 --- a/src/Luban.Server/Templates/config/go_bin/bean.tpl +++ b/src/Luban.Server/Templates/config/go_bin/bean.tpl @@ -6,7 +6,7 @@ hierarchy_not_abstract_children = x.hierarchy_not_abstract_children -}} -package {{package}} +package {{x.top_module}} import ( "bright/serialization" diff --git a/src/Luban.Server/Templates/config/go_bin/table.tpl b/src/Luban.Server/Templates/config/go_bin/table.tpl index 0d06c9d..54401f1 100644 --- a/src/Luban.Server/Templates/config/go_bin/table.tpl +++ b/src/Luban.Server/Templates/config/go_bin/table.tpl @@ -9,7 +9,7 @@ index_field2 = x.index_field2 -}} -package {{package}} +package {{x.top_module}} import "bright/serialization" diff --git a/src/Luban.Server/Templates/config/go_bin/tables.tpl b/src/Luban.Server/Templates/config/go_bin/tables.tpl index 2057bcd..233963d 100644 --- a/src/Luban.Server/Templates/config/go_bin/tables.tpl +++ b/src/Luban.Server/Templates/config/go_bin/tables.tpl @@ -1,5 +1,5 @@ -package {{package}} +package {{namespace}} import "bright/serialization" diff --git a/src/Luban.Server/Templates/config/go_json/bean.tpl b/src/Luban.Server/Templates/config/go_json/bean.tpl index 1327744..67845bb 100644 --- a/src/Luban.Server/Templates/config/go_json/bean.tpl +++ b/src/Luban.Server/Templates/config/go_json/bean.tpl @@ -6,7 +6,7 @@ hierarchy_not_abstract_children = x.hierarchy_not_abstract_children -}} -package {{package}} +package {{x.top_module}} {{x.go_json_import}} diff --git a/src/Luban.Server/Templates/config/go_json/table.tpl b/src/Luban.Server/Templates/config/go_json/table.tpl index 1897dc7..ae924ef 100644 --- a/src/Luban.Server/Templates/config/go_json/table.tpl +++ b/src/Luban.Server/Templates/config/go_json/table.tpl @@ -9,7 +9,7 @@ index_field2 = x.index_field2 -}} -package {{package}} +package {{x.top_module}} {{~if x.is_map_table~}} type {{go_full_name}} struct { diff --git a/src/Luban.Server/Templates/config/go_json/tables.tpl b/src/Luban.Server/Templates/config/go_json/tables.tpl index 6ec059a..7584728 100644 --- a/src/Luban.Server/Templates/config/go_json/tables.tpl +++ b/src/Luban.Server/Templates/config/go_json/tables.tpl @@ -1,5 +1,5 @@ -package {{package}} +package {{namespace}} type JsonLoader func(string) ([]map[string]interface{}, error)