From 7bba9b44b5fc7e3daadcaba82b417216cbd9719d Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 13 Sep 2020 22:29:43 +0800 Subject: [PATCH] tpl:update tpl --- app/admin/models/dept.go | 2 +- app/admin/models/dictdata.go | 2 +- app/admin/models/dicttype.go | 2 +- app/admin/models/filedir.go | 2 +- app/admin/models/loginlog.go | 2 +- app/admin/models/menu.go | 2 +- app/admin/models/sysfileinfo.go | 2 +- cmd/migrate/migration/version/1599190683659_tables.go | 1 + template/vue.go.template | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/admin/models/dept.go b/app/admin/models/dept.go index 29544f5a..4ffe294a 100644 --- a/app/admin/models/dept.go +++ b/app/admin/models/dept.go @@ -9,7 +9,7 @@ import ( ) type SysDept struct { - DeptId int `json:"deptId" gorm:"primary_key;AUTO_INCREMENT"` //部门编码 + DeptId int `json:"deptId" gorm:"primary_key;auto_increment;"` //部门编码 ParentId int `json:"parentId" gorm:""` //上级部门 DeptPath string `json:"deptPath" gorm:"size:255;"` // DeptName string `json:"deptName" gorm:"size:128;"` //部门名称 diff --git a/app/admin/models/dictdata.go b/app/admin/models/dictdata.go index 72006f18..8ea45525 100644 --- a/app/admin/models/dictdata.go +++ b/app/admin/models/dictdata.go @@ -8,7 +8,7 @@ import ( ) type DictData struct { - DictCode int `gorm:"primary_key;AUTO_INCREMENT" json:"dictCode" example:"1"` //字典编码 + DictCode int `gorm:"primary_key;auto_increment;" json:"dictCode" example:"1"` //字典编码 DictSort int `gorm:"" json:"dictSort"` //显示顺序 DictLabel string `gorm:"size:128;" json:"dictLabel"` //数据标签 DictValue string `gorm:"size:255;" json:"dictValue"` //数据键值 diff --git a/app/admin/models/dicttype.go b/app/admin/models/dicttype.go index 08a6e4a9..bae6df85 100644 --- a/app/admin/models/dicttype.go +++ b/app/admin/models/dicttype.go @@ -10,7 +10,7 @@ import ( ) type DictType struct { - DictId int `gorm:"primary_key;AUTO_INCREMENT" json:"dictId"` + DictId int `gorm:"primary_key;auto_increment;" json:"dictId"` DictName string `gorm:"size:128;" json:"dictName"` //字典名称 DictType string `gorm:"size:128;" json:"dictType"` //字典类型 Status string `gorm:"size:4;" json:"status"` //状态 diff --git a/app/admin/models/filedir.go b/app/admin/models/filedir.go index 627c7e0c..5173c65f 100644 --- a/app/admin/models/filedir.go +++ b/app/admin/models/filedir.go @@ -8,7 +8,7 @@ import ( type SysFileDir struct { gorm.Model - Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` // + Id int `json:"id" gorm:"type:int(11);primary_key;auto_increment;"` // Label string `json:"label" gorm:"type:varchar(255);"` // 名称 PId int `json:"pId" gorm:"type:int(11);"` // 父id Sort int `json:"sort" gorm:""` //排序 diff --git a/app/admin/models/loginlog.go b/app/admin/models/loginlog.go index 810a9640..57b8c846 100644 --- a/app/admin/models/loginlog.go +++ b/app/admin/models/loginlog.go @@ -7,7 +7,7 @@ import ( ) type LoginLog struct { - InfoId int `json:"infoId" gorm:"primary_key;AUTO_INCREMENT"` //主键 + InfoId int `json:"infoId" gorm:"primary_key;auto_increment;"` //主键 Username string `json:"username" gorm:"size:128;"` //用户名 Status string `json:"status" gorm:"size:4;"` //状态 Ipaddr string `json:"ipaddr" gorm:"size:255;"` //ip地址 diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index f7970a1a..64e0919e 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -45,7 +45,7 @@ type MenuLable struct { } type Menus struct { - MenuId int `json:"menuId" gorm:"column:menu_id;primary_key"` + MenuId int `json:"menuId" gorm:"column:menu_id;primary_key;"` MenuName string `json:"menuName" gorm:"column:menu_name"` Title string `json:"title" gorm:"column:title"` Icon string `json:"icon" gorm:"column:icon"` diff --git a/app/admin/models/sysfileinfo.go b/app/admin/models/sysfileinfo.go index 07d5b591..d4cd2644 100644 --- a/app/admin/models/sysfileinfo.go +++ b/app/admin/models/sysfileinfo.go @@ -5,7 +5,7 @@ import ( ) type SysFileInfo struct { - Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` // id + Id int `json:"id" gorm:"type:int(11);primary_key;auto_increment;"` // id Type string `json:"type" gorm:"type:varchar(255);"` // 文件类型 Name string `json:"name" gorm:"type:varchar(255);"` // 文件名称 Size string `json:"size" gorm:"type:int(11);"` // 文件大小 diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index 313aa17d..50ac99a7 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -38,6 +38,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error { new(models.SysConfig), new(models.SysSetting), new(models.SysFileDir), + new(models.SysFileInfo), new(models.SysCategory), new(models.SysContent), ) diff --git a/template/vue.go.template b/template/vue.go.template index e2f1091a..253512d9 100644 --- a/template/vue.go.template +++ b/template/vue.go.template @@ -378,7 +378,7 @@ {{- end -}} // 文件 {{range .Columns}} - {{- if ne .HtmlType "file" -}} + {{- if eq .HtmlType "file" -}} fileShow{{.GoField}}: function() { this.fileOpen = true this.fileIndex = '{{.JsonField}}'