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<string, object>() { ["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<string, object>() { ["package"] = package });
+            var result = template.RenderCode(p);
             return result;
         }
 
         public override string RenderService(string name, string module, List<DefTable> 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<string, object>() { ["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<string, object>() { ["package"] = package });
+            var result = template.RenderCode(p);
 
             return result;
         }
 
         public override string RenderService(string name, string module, List<DefTable> 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)