From 78defd91d9f1f6c378680c373e7f022caee75290 Mon Sep 17 00:00:00 2001 From: me262 Date: Mon, 31 May 2021 17:28:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtable=5Fprefix?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/view/model/common.go | 2 +- data/view/model/model.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/view/model/common.go b/data/view/model/common.go index 916d954..547efd3 100755 --- a/data/view/model/common.go +++ b/data/view/model/common.go @@ -52,7 +52,7 @@ func GetTablePrefixName(name string) string { // tablePrefix := config.GetTablePrefix() //如果设置了表前缀 if tablePrefix != "" { - return fmt.Sprintf("%v.%v", tablePrefix, name) + name = tablePrefix + name } return name diff --git a/data/view/model/model.go b/data/view/model/model.go index 9a3d628..c6a65e7 100755 --- a/data/view/model/model.go +++ b/data/view/model/model.go @@ -57,12 +57,12 @@ func (m *_Model) GetPackage() genstruct.GenPackage { var pkg genstruct.GenPackage pkg.SetPackage(m.info.PackageName) //package name - // tablePrefix := config.GetTablePrefix() + tablePrefix := config.GetTablePrefix() for _, tab := range m.info.TabList { var sct genstruct.GenStruct - sct.SetTableName(tab.Name) + sct.SetTableName(tablePrefix + tab.Name) //如果设置了表前缀 // if tablePrefix != "" { From ae72f8d9a3712225a26c75e2a20a46247a869e2b Mon Sep 17 00:00:00 2001 From: me262 Date: Mon, 31 May 2021 17:29:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8DpkgName=20=3D?= =?UTF-8?q?=3D=20"."=E6=97=B6windows=E4=B8=8B=E8=8E=B7=E5=8F=96=E5=8C=85?= =?UTF-8?q?=E5=90=8D=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/view/model/gencnf/gencnf.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/view/model/gencnf/gencnf.go b/data/view/model/gencnf/gencnf.go index 8b712c5..fe2c93a 100644 --- a/data/view/model/gencnf/gencnf.go +++ b/data/view/model/gencnf/gencnf.go @@ -98,7 +98,9 @@ func (m *cnfModel) GetPkgName() string { } if len(pkgName) == 0 || pkgName == "." { - list = strings.Split(tools.GetModelPath(), "/") + curDir := tools.GetModelPath() + curDir = strings.Replace(curDir, "\\", "/", -1) + list = strings.Split(curDir, "/") if len(list) > 0 { pkgName = list[len(list)-1] }