diff --git a/app/admin/apis/tools/systables.go b/app/admin/apis/tools/systables.go index 7b9896af..f4c9dc82 100644 --- a/app/admin/apis/tools/systables.go +++ b/app/admin/apis/tools/systables.go @@ -191,6 +191,8 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, column.IsPk = "1" column.Pk = true data.PkColumn = dbcolumn[i].ColumnName + column.GoField = strings.ToUpper(column.GoField) + column.JsonField = strings.ToUpper(column.JsonField) data.PkGoField = column.GoField data.PkJsonField = column.JsonField } @@ -202,7 +204,9 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, if strings.Contains(dbcolumn[i].ColumnType, "int") { if strings.Contains(dbcolumn[i].ColumnKey, "PR") { - column.GoType = "int" + column.GoType = "uint" + } else if strings.Contains(dbcolumn[i].ColumnType, "unsigned") { + column.GoType = "uint" } else { column.GoType = "string" } @@ -210,6 +214,9 @@ func genTableInit(tablesList []string, i int, c *gin.Context) (tools.SysTables, } else if strings.Contains(dbcolumn[i].ColumnType, "timestamp") { column.GoType = "time.Time" column.HtmlType = "datetime" + } else if strings.Contains(dbcolumn[i].ColumnType, "datetime") { + column.GoType = "time.Time" + column.HtmlType = "datetime" } else { column.GoType = "string" column.HtmlType = "input" diff --git a/app/admin/models/config.go b/app/admin/models/config.go index 6835bce2..2dcfa55a 100644 --- a/app/admin/models/config.go +++ b/app/admin/models/config.go @@ -22,12 +22,6 @@ type SysConfig struct { BaseModel } -func DataInit() { - //config1:=SysConfig{1, "主框架页-默认皮肤样式名称", "sys_index_skinName", "skin-blue", "Y", "蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow", "1", "1", "","",BaseModel{time.Now(), time.Now(), nil}} - // - //orm.Eloquent.Create(&config1) -} - func (SysConfig) TableName() string { return "sys_config" } 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/js.go.template b/template/js.go.template index fb91a490..db3d4a27 100644 --- a/template/js.go.template +++ b/template/js.go.template @@ -2,46 +2,46 @@ import request from '@/utils/request' // 查询{{.ClassName}}列表 export function list{{.ClassName}}(query) { -return request({ -url: '/api/v1/{{.ModuleName}}', -method: 'get', -params: query -}) + return request({ + url: '/api/v1/{{.ModuleName}}', + method: 'get', + params: query + }) } // 查询{{.ClassName}}详细 export function get{{.ClassName}} ({{.PkJsonField}}) { -return request({ -url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, -method: 'get' -}) + return request({ + url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, + method: 'get' + }) } // 新增{{.ClassName}} export function add{{.ClassName}}(data) { -return request({ -url: '/api/v1/{{.ModuleName}}', -method: 'post', -data: data -}) + return request({ + url: '/api/v1/{{.ModuleName}}', + method: 'post', + data: data + }) } // 修改{{.ClassName}} export function update{{.ClassName}}(data) { -return request({ -url: '/api/v1/{{.ModuleName}}/'+data.{{.PkJsonField}}, -method: 'put', -data: data -}) + return request({ + url: '/api/v1/{{.ModuleName}}/'+data.{{.PkJsonField}}, + method: 'put', + data: data + }) } // 删除{{.ClassName}} export function del{{.ClassName}}(data) { -return request({ -url: '/api/v1/{{.ModuleName}}', -method: 'delete', -data: data -}) + return request({ + url: '/api/v1/{{.ModuleName}}', + method: 'delete', + data: data + }) } diff --git a/template/model.go.template b/template/model.go.template index 7efd5ffc..3e47a8bc 100644 --- a/template/model.go.template +++ b/template/model.go.template @@ -1,7 +1,7 @@ package models import ( - "strconv" + "gorm.io/gorm" "go-admin/common/dto" orm "go-admin/common/global" @@ -29,7 +29,8 @@ type {{.ClassName}} struct { {{- else if eq .GoField "CreateBy" -}} {{- else if eq .GoField "UpdateBy" -}} {{- else }} - {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};comment:{{- if eq .ColumnComment "" -}}{{.GoField}}{{- else -}}{{.ColumnComment}}{{end -}}"` {{end -}} + {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" gorm:"type:{{.ColumnType}};comment:{{- if eq .ColumnComment "" -}}{{.GoField}}{{- else -}}{{.ColumnComment}}{{end -}}"` + {{end -}} {{- end }} DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` @@ -50,11 +51,11 @@ func (e *{{.ClassName}}) GetId() interface{} { } func (e *{{.ClassName}}) SetCreateBy(createBy uint) { - e.CreateBy = strconv.Itoa(int(createBy)) + e.CreateBy = createBy } func (e *{{.ClassName}}) SetUpdateBy(updateBy uint) { - e.UpdateBy = strconv.Itoa(int(updateBy)) + e.UpdateBy = updateBy } // 创建{{.ClassName}} diff --git a/template/v2/dto.go.template b/template/v2/dto.go.template index dccd3815..06b5f6e3 100644 --- a/template/v2/dto.go.template +++ b/template/v2/dto.go.template @@ -2,10 +2,11 @@ package dto import ( "github.com/gin-gonic/gin" + "gorm.io/gorm" + "go-admin/app/admin/models" "go-admin/common/dto" common "go-admin/common/models" - "gorm.io/gorm" ) type {{.ClassName}}Search struct { @@ -49,6 +50,10 @@ type {{.ClassName}}Control struct { {{- else if eq .GoField "CreatedAt" -}} {{- else if eq .GoField "UpdatedAt" -}} {{- else if eq .GoField "DeletedAt" -}} + {{- else if eq .GoField "CreateBy" }} + + {{.GoField}} uint `json:"{{.JsonField}}"` // {{.ColumnComment}} + {{- else if eq .GoField "UpdateBy" }} {{- else if eq .GoField "CreateBy" -}} {{.GoField}} uint `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` @@ -56,6 +61,9 @@ type {{.ClassName}}Control struct { {{.GoField}} uint `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` {{- else }} + + {{.GoField}} {{.GoType}} `json:"{{.JsonField}}"` // {{.ColumnComment}} + {{end -}} {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` {{end -}} {{- end }} } @@ -74,7 +82,7 @@ func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) { {{ range .Columns -}} {{$x := .Pk}} {{- if ($x) }} - Model: gorm.Model{ID: s.Id}, + Model: gorm.Model{ID: s.ID}, {{- else if eq .GoField "CreatedAt" -}} {{- else if eq .GoField "UpdatedAt" -}} {{- else if eq .GoField "DeletedAt" -}} @@ -83,7 +91,8 @@ func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) { CreateBy: s.CreateBy, UpdateBy: s.UpdateBy, }, - {{- else if eq .GoField "UpdateBy" -}} + + {{- else if eq .GoField "UpdateBy" -}} {{- else }} {{.GoField}}: s.{{.GoField}}, {{- end }} diff --git a/template/v2/model.go.template b/template/v2/model.go.template index 9b101069..57d712e1 100644 --- a/template/v2/model.go.template +++ b/template/v2/model.go.template @@ -1,6 +1,8 @@ package models import ( + "gorm.io/gorm" + {{- if eq .IsActions 2 -}} "go-admin/common/dto" @@ -8,7 +10,6 @@ import ( orm "go-admin/common/global" {{ end }} "go-admin/common/models" - "gorm.io/gorm" ) type {{.ClassName}} struct { @@ -40,7 +41,7 @@ func (e *{{.ClassName}}) Generate() models.ActiveRecord { } func (e *{{.ClassName}}) GetId() interface{} { - return e.ID + return e.{{.PkGoField}} } func (e *{{.ClassName}}) SetCreateBy(createBy uint) { 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}}'