From d000eebda5a00a2f14b47a63fab5da7faadf4f0b Mon Sep 17 00:00:00 2001 From: yanjiangtao <1054792432@qq.com> Date: Tue, 30 Mar 2021 20:23:40 +0800 Subject: [PATCH] =?UTF-8?q?Perfect=20annotation=20and=20remove=20redundant?= =?UTF-8?q?=20information=20output.=20=E5=AE=8C=E5=96=84=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ README_zh_cn.md | 2 ++ data/cmd/cmd.go | 4 ++-- data/config/MyIni.go | 6 +++--- data/view/model/def_ifs.go | 2 +- data/view/model/genmysql/genmysql.go | 4 +--- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1622d55..4b83572 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ is_null_to_point : false # database is 'DEFAULT NULL' then set element type as p is_web_tag: false is_web_tag_pk_hidden: false table_prefix: "" #table prefix +table_names: "" # Specified table generation, multiple tables with , separated db_info : host : "127.0.0.1" port : 3306 @@ -88,6 +89,7 @@ Flags: -p, --password string 密码. --port int 端口号 (default 3306) -s, --singular 是否禁用表名复数 + -b, --table_names string 表名称 -l, --url string url标签(json,url) -u, --user string 用户名. diff --git a/README_zh_cn.md b/README_zh_cn.md index aa20f13..f053391 100644 --- a/README_zh_cn.md +++ b/README_zh_cn.md @@ -55,6 +55,7 @@ is_null_to_point: false # 数据库默认 'DEFAULT NULL' 时设置结构为指 is_web_tag: false is_web_tag_pk_hidden: false table_prefix: "" #表前缀 +table_names: "" #指定表生成，多个表用,隔开 db_info: host : 127.0.0.1 port : 3306 @@ -101,6 +102,7 @@ Flags: -p, --password string 密码. --port int 端口号 (default 3306) -s, --singular 是否禁用表名复数 + -b, --table_names string 表名称 -l, --url string url标签(json,url) -u, --user string 用户名. diff --git a/data/cmd/cmd.go b/data/cmd/cmd.go index 5282182..6e57dcc 100644 --- a/data/cmd/cmd.go +++ b/data/cmd/cmd.go @@ -68,7 +68,7 @@ func init() { rootCmd.Flags().Int("port", 3306, "端口号") rootCmd.Flags().StringP("table_prefix", "t", "", "表前缀") - //增加表名称 + //add table name. 增加表名称 rootCmd.Flags().StringP("table_names", "b", "", "表名称") } @@ -122,7 +122,7 @@ func MergeMysqlDbInfo() { mycobra.IfReplace(rootCmd, "table_prefix", &tablePrefix) // 如果设置了，更新 config.SetTablePrefix(tablePrefix) - //更新tableNames + //update tableNames. 更新tableNames tableNames := config.GetTableNames() if tableNames != "" { tableNames = strings.Replace(tableNames, "'", "", -1) diff --git a/data/config/MyIni.go b/data/config/MyIni.go index bd3a75d..b9cb3d9 100644 --- a/data/config/MyIni.go +++ b/data/config/MyIni.go @@ -257,7 +257,7 @@ func GetWebTagType() int { return _map.WebTagType } -//获取设置的表名 +//GetTableNames get format tableNames by config. 获取格式化后设置的表名 func GetTableNames() string { var sb strings.Builder if _map.TableNames != "" { @@ -284,12 +284,12 @@ func GetTableNames() string { return sb.String() } -//获取设置的表名 +//GetOriginTableNames get origin tableNames. 获取原始的设置的表名 func GetOriginTableNames() string { return _map.TableNames } -//设置生成的表名 +//SetTableNames set tableNames. 设置生成的表名 func SetTableNames(tableNames string) { _map.TableNames = tableNames } diff --git a/data/view/model/def_ifs.go b/data/view/model/def_ifs.go index 789d3bf..dc50f6c 100644 --- a/data/view/model/def_ifs.go +++ b/data/view/model/def_ifs.go @@ -5,5 +5,5 @@ type IModel interface { GenModel() DBInfo GetDbName() string GetPkgName() string // Getting package names through config outdir configuration.通过config outdir 配置获取包名 - GetTableNames() string //获取设置表名 + GetTableNames() string // Getting tableNames by config. 获取设置的表名 } diff --git a/data/view/model/genmysql/genmysql.go b/data/view/model/genmysql/genmysql.go index 361275e..32141ad 100644 --- a/data/view/model/genmysql/genmysql.go +++ b/data/view/model/genmysql/genmysql.go @@ -40,7 +40,7 @@ func (m *mysqlModel) GetTableNames() string { return config.GetTableNames() } -// GetTableNames get table name.获取原始指定的表名 +// GetOriginTableNames get table name.获取原始指定的表名 func (m *mysqlModel) GetOriginTableNames() string { return config.GetOriginTableNames() } @@ -84,7 +84,6 @@ func (m *mysqlModel) getPackageInfo(orm *mysqldb.MySqlDB, info *model.DBInfo) { // } // tabls = newTabls // } - fmt.Println(tabls) for tabName, notes := range tabls { var tab model.TabInfo tab.Name = tabName @@ -111,7 +110,6 @@ func (m *mysqlModel) getPackageInfo(orm *mysqldb.MySqlDB, info *model.DBInfo) { info.TabList = append(info.TabList, tab) } - fmt.Println(info.TabList) // sort tables sort.Slice(info.TabList, func(i, j int) bool { return info.TabList[i].Name < info.TabList[j].Name