diff --git a/app/admin/apis/go-admin.go b/app/admin/apis/go_admin.go similarity index 100% rename from app/admin/apis/go-admin.go rename to app/admin/apis/go_admin.go diff --git a/app/other/apis/tools/gen.go b/app/other/apis/tools/gen.go index 4b47a0fc..7760ad3c 100644 --- a/app/other/apis/tools/gen.go +++ b/app/other/apis/tools/gen.go @@ -168,6 +168,7 @@ func (e Gen) GenApiToFile(c *gin.Context) { func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { e.Context = c log := e.GetLogger() + tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1) basePath := "template/v4/" routerFile := basePath + "no_actions/router_check_role.go.template" @@ -223,8 +224,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { _ = pkg.PathCreate("./app/" + tab.PackageName + "/models/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName) + _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/" + tab.PackageName+ "/") + err = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.PackageName + "/" + tab.MLTBName+ "/") + if err != nil { + log.Error(err) + e.Error(500, err, fmt.Sprintf("views目录创建失败！错误详情：%s", err.Error())) + return + } var b1 bytes.Buffer err = t1.Execute(&b1, tab) @@ -240,13 +246,13 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { err = t6.Execute(&b6, tab) var b7 bytes.Buffer err = t7.Execute(&b7, tab) - pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go") - pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+".go") - pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go") - pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js") - pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue") - pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go") - pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.ModuleName+".go") + pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.TBName+".go") + pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.TBName+".go") + pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.TBName+".go") + pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.PackageName+"/"+tab.MLTBName+".js") + pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.PackageName+"/"+tab.MLTBName+"/index.vue") + pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.TBName+".go") + pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.TBName+".go") } @@ -365,19 +371,20 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { table := tools.SysTables{} id, err := pkg.StringToInt(c.Param("tableId")) - if err != nil{ + if err != nil { e.Logger.Error(err) - e.Error(500,err,fmt.Sprintf("tableId参数解析失败！错误详情：%s", err.Error())) + e.Error(500, err, fmt.Sprintf("tableId参数解析失败！错误详情：%s", err.Error())) return } table.TableId = id tab, _ := table.Get(e.Orm) + tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1) Mmenu := dto.SysMenuControl{} Mmenu.Title = tab.TableComment Mmenu.Icon = "pass" - Mmenu.Path = "/" + strings.Replace(tab.TBName, "_", "-", -1) + Mmenu.Path = "/" +tab.MLTBName Mmenu.MenuType = "M" Mmenu.Action = "无" Mmenu.ParentId = 0 @@ -393,13 +400,13 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { Cmenu.MenuName = tab.ClassName + "Manage" Cmenu.Title = tab.TableComment Cmenu.Icon = "pass" - Cmenu.Path = tab.TBName + Cmenu.Path = "/" + tab.PackageName + "/" + tab.MLTBName Cmenu.MenuType = "C" Cmenu.Action = "无" Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list" Cmenu.ParentId = Mmenu.MenuId Cmenu.NoCache = false - Cmenu.Component = "/" + tab.ModuleFrontName + "/index" + Cmenu.Component = "/" + tab.PackageName + "/" + tab.MLTBName + "/index" Cmenu.Sort = 0 Cmenu.Visible = "0" Cmenu.IsFrame = "0" diff --git a/app/other/models/tools/sys_columns.go b/app/other/models/tools/sys_columns.go index c7539e01..13ebf174 100644 --- a/app/other/models/tools/sys_columns.go +++ b/app/other/models/tools/sys_columns.go @@ -6,43 +6,43 @@ import ( ) type SysColumns struct { - ColumnId int `gorm:"primaryKey;autoIncrement" json:"columnId"` - TableId int `gorm:"" json:"tableId"` - ColumnName string `gorm:"size:128;" json:"columnName"` - ColumnComment string `gorm:"column:column_comment;size:128;" json:"columnComment"` - ColumnType string `gorm:"column:column_type;size:128;" json:"columnType"` - GoType string `gorm:"column:go_type;size:128;" json:"goType"` - GoField string `gorm:"column:go_field;size:128;" json:"goField"` - JsonField string `gorm:"column:json_field;size:128;" json:"jsonField"` - IsPk string `gorm:"column:is_pk;size:4;" json:"isPk"` - IsIncrement string `gorm:"column:is_increment;size:4;" json:"isIncrement"` - IsRequired string `gorm:"column:is_required;size:4;" json:"isRequired"` - IsInsert string `gorm:"column:is_insert;size:4;" json:"isInsert"` - IsEdit string `gorm:"column:is_edit;size:4;" json:"isEdit"` - IsList string `gorm:"column:is_list;size:4;" json:"isList"` - IsQuery string `gorm:"column:is_query;size:4;" json:"isQuery"` - QueryType string `gorm:"column:query_type;size:128;" json:"queryType"` - HtmlType string `gorm:"column:html_type;size:128;" json:"htmlType"` - DictType string `gorm:"column:dict_type;size:128;" json:"dictType"` - Sort int `gorm:"column:sort;" json:"sort"` - List string `gorm:"column:list;size:1;" json:"list"` - Pk bool `gorm:"column:pk;size:1;" json:"pk"` - Required bool `gorm:"column:required;size:1;" json:"required"` - SuperColumn bool `gorm:"column:super_column;size:1;" json:"superColumn"` - UsableColumn bool `gorm:"column:usable_column;size:1;" json:"usableColumn"` - Increment bool `gorm:"column:increment;size:1;" json:"increment"` - Insert bool `gorm:"column:insert;size:1;" json:"insert"` - Edit bool `gorm:"column:edit;size:1;" json:"edit"` - Query bool `gorm:"column:query;size:1;" json:"query"` - Remark string `gorm:"column:remark;size:255;" json:"remark"` - FkTableName string `gorm:"" json:"fkTableName"` - FkTableNameClass string `gorm:"" json:"fkTableNameClass"` - FkTableNamePackage string `gorm:"" json:"fkTableNamePackage"` - FkCol []SysColumns `gorm:"-" json:"fkCol"` - FkLabelId string `gorm:"" json:"fkLabelId"` - FkLabelName string `gorm:"size:255;" json:"fkLabelName"` - CreateBy int `gorm:"column:create_by;size:20;" json:"createBy"` - UpdateBy int `gorm:"column:update_By;size:20;" json:"updateBy"` + ColumnId int `gorm:"primaryKey;autoIncrement" json:"columnId"` + TableId int `gorm:"" json:"tableId"` + ColumnName string `gorm:"size:128;" json:"columnName"` + ColumnComment string `gorm:"column:column_comment;size:128;" json:"columnComment"` + ColumnType string `gorm:"column:column_type;size:128;" json:"columnType"` + GoType string `gorm:"column:go_type;size:128;" json:"goType"` + GoField string `gorm:"column:go_field;size:128;" json:"goField"` + JsonField string `gorm:"column:json_field;size:128;" json:"jsonField"` + IsPk string `gorm:"column:is_pk;size:4;" json:"isPk"` + IsIncrement string `gorm:"column:is_increment;size:4;" json:"isIncrement"` + IsRequired string `gorm:"column:is_required;size:4;" json:"isRequired"` + IsInsert string `gorm:"column:is_insert;size:4;" json:"isInsert"` + IsEdit string `gorm:"column:is_edit;size:4;" json:"isEdit"` + IsList string `gorm:"column:is_list;size:4;" json:"isList"` + IsQuery string `gorm:"column:is_query;size:4;" json:"isQuery"` + QueryType string `gorm:"column:query_type;size:128;" json:"queryType"` + HtmlType string `gorm:"column:html_type;size:128;" json:"htmlType"` + DictType string `gorm:"column:dict_type;size:128;" json:"dictType"` + Sort int `gorm:"column:sort;" json:"sort"` + List string `gorm:"column:list;size:1;" json:"list"` + Pk bool `gorm:"column:pk;size:1;" json:"pk"` + Required bool `gorm:"column:required;size:1;" json:"required"` + SuperColumn bool `gorm:"column:super_column;size:1;" json:"superColumn"` + UsableColumn bool `gorm:"column:usable_column;size:1;" json:"usableColumn"` + Increment bool `gorm:"column:increment;size:1;" json:"increment"` + Insert bool `gorm:"column:insert;size:1;" json:"insert"` + Edit bool `gorm:"column:edit;size:1;" json:"edit"` + Query bool `gorm:"column:query;size:1;" json:"query"` + Remark string `gorm:"column:remark;size:255;" json:"remark"` + FkTableName string `gorm:"" json:"fkTableName"` + FkTableNameClass string `gorm:"" json:"fkTableNameClass"` + FkTableNamePackage string `gorm:"" json:"fkTableNamePackage"` + FkCol []SysColumns `gorm:"-" json:"fkCol"` + FkLabelId string `gorm:"" json:"fkLabelId"` + FkLabelName string `gorm:"size:255;" json:"fkLabelName"` + CreateBy int `gorm:"column:create_by;size:20;" json:"createBy"` + UpdateBy int `gorm:"column:update_By;size:20;" json:"updateBy"` models.BaseModel } diff --git a/app/other/models/tools/sys_tables.go b/app/other/models/tools/sys_tables.go index 8fe42913..fa808bb0 100644 --- a/app/other/models/tools/sys_tables.go +++ b/app/other/models/tools/sys_tables.go @@ -12,6 +12,7 @@ import ( type SysTables struct { TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 + MLTBName string `gorm:"-" json:"-"` //表名称 TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 ClassName string `gorm:"size:255;" json:"className"` //类名 TplCategory string `gorm:"size:255;" json:"tplCategory"` // @@ -188,16 +189,17 @@ func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) { t, ok := tableMap[e.Columns[i].FkTableName] if ok { e.Columns[i].FkTableNameClass = t.ClassName - e.Columns[i].FkTableNamePackage = t.ModuleName + t.MLTBName = strings.Replace(t.TBName, "_", "-", -1) + e.Columns[i].FkTableNamePackage = t.MLTBName } else { tableNameList := strings.Split(e.Columns[i].FkTableName, "_") e.Columns[i].FkTableNameClass = "" - e.Columns[i].FkTableNamePackage = "" + //e.Columns[i].FkTableNamePackage = "" for a := 0; a < len(tableNameList); a++ { strStart := string([]byte(tableNameList[a])[:1]) strEnd := string([]byte(tableNameList[a])[1:]) e.Columns[i].FkTableNameClass += strings.ToUpper(strStart) + strEnd - e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd) + //e.Columns[i].FkTableNamePackage += strings.ToLower(strStart) + strings.ToLower(strEnd) } } } diff --git a/common/global/adm.go b/common/global/adm.go index d009242a..677cbc94 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -2,7 +2,7 @@ package global const ( // Version go-admin version info - Version = "2.0.0-beta.7" + Version = "2.0.0-beta.8" ) var (