From f22f654c91319b1646950151ef45ec1288b7f1e9 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Wed, 24 Feb 2021 14:22:33 +0800 Subject: [PATCH] =?UTF-8?q?format=F0=9F=A5=9A=20=EF=BC=9A=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BB=E9=94=AEkey=E5=92=8C=E8=87=AA=E5=A2=9E?= =?UTF-8?q?=E9=95=BFtag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/dept.go | 2 +- app/admin/models/menu.go | 4 ++-- app/admin/models/post.go | 2 +- app/admin/models/role.go | 2 +- app/admin/models/sys_dept.go | 2 +- app/admin/models/sys_menu.go | 4 ++-- app/admin/models/syscontent.go | 2 +- app/admin/models/sysjob.go | 2 +- app/admin/models/system/role_menu.go | 6 +++--- app/admin/models/system/sys_post.go | 2 +- app/admin/models/system/sys_role.go | 2 +- app/admin/models/sysuser.go | 2 +- app/admin/models/tools/syscolumns.go | 2 +- app/admin/models/tools/systables.go | 2 +- cmd/migrate/migration/version/dictdata.go | 2 +- cmd/migrate/migration/version/dicttype.go | 2 +- common/models/migrate.go | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/admin/models/dept.go b/app/admin/models/dept.go index 8e31d7ca..1d791f5f 100644 --- a/app/admin/models/dept.go +++ b/app/admin/models/dept.go @@ -9,7 +9,7 @@ import ( ) type SysDepts struct { - DeptId int `json:"deptId" gorm:"primary_key;auto_increment;"` //部门编码 + DeptId int `json:"deptId" gorm:"primaryKey;autoIncrement;"` //部门编码 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/menu.go b/app/admin/models/menu.go index a50175db..3ac32455 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -9,7 +9,7 @@ import ( ) type Menu struct { - MenuId int `json:"menuId" gorm:"primary_key;AUTO_INCREMENT"` + MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` MenuName string `json:"menuName" gorm:"size:128;"` Title string `json:"title" gorm:"size:128;"` Icon string `json:"icon" gorm:"size:128;"` @@ -46,7 +46,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;primaryKey;autoIncrement;"` 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/post.go b/app/admin/models/post.go index bbfcf1c5..0b509561 100644 --- a/app/admin/models/post.go +++ b/app/admin/models/post.go @@ -6,7 +6,7 @@ import ( ) type Post struct { - PostId int `gorm:"primary_key;AUTO_INCREMENT" json:"postId"` //岗位编号 + PostId int `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号 PostName string `gorm:"size:128;" json:"postName"` //岗位名称 PostCode string `gorm:"size:128;" json:"postCode"` //岗位代码 Sort int `gorm:"" json:"sort"` //岗位排序 diff --git a/app/admin/models/role.go b/app/admin/models/role.go index ec125b83..e4773013 100644 --- a/app/admin/models/role.go +++ b/app/admin/models/role.go @@ -10,7 +10,7 @@ import ( ) type SysRole struct { - RoleId int `json:"roleId" gorm:"primary_key;AUTO_INCREMENT"` // 角色编码 + RoleId int `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码 RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 Status string `json:"status" gorm:"size:4;"` // RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 diff --git a/app/admin/models/sys_dept.go b/app/admin/models/sys_dept.go index fbd2f2d3..530e9b40 100644 --- a/app/admin/models/sys_dept.go +++ b/app/admin/models/sys_dept.go @@ -3,7 +3,7 @@ package models import "go-admin/common/models" type SysDept struct { - DeptId int `json:"deptId" gorm:"primary_key;auto_increment;"` //部门编码 + DeptId int `json:"deptId" gorm:"primaryKey;autoIncrement;"` //部门编码 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/sys_menu.go b/app/admin/models/sys_menu.go index b5343cb8..9e2f240e 100644 --- a/app/admin/models/sys_menu.go +++ b/app/admin/models/sys_menu.go @@ -3,7 +3,7 @@ package models import "go-admin/common/models" type SysMenu struct { - MenuId int `json:"menuId" gorm:"primary_key;AUTO_INCREMENT"` + MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` MenuName string `json:"menuName" gorm:"size:128;"` Title string `json:"title" gorm:"size:128;"` Icon string `json:"icon" gorm:"size:128;"` @@ -29,7 +29,7 @@ type SysMenu struct { } type SysMenus struct { - MenuId int `json:"menuId" gorm:"column:menu_id;primary_key;"` + MenuId int `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"` 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/syscontent.go b/app/admin/models/syscontent.go index c68a54bc..0acf332d 100644 --- a/app/admin/models/syscontent.go +++ b/app/admin/models/syscontent.go @@ -6,7 +6,7 @@ import ( ) type SysContent struct { - Id int `json:"id" gorm:"type:int(11);primary_key;auto_increment"` // id + Id int `json:"id" gorm:"type:int(11);primaryKey;autoIncrement"` // id CateId string `json:"cateId" gorm:"type:int(11);"` // 分类id Name string `json:"name" gorm:"type:varchar(255);"` // 名称 Status string `json:"status" gorm:"type:int(1);"` // 状态 diff --git a/app/admin/models/sysjob.go b/app/admin/models/sysjob.go index 3997b094..c18e37a9 100644 --- a/app/admin/models/sysjob.go +++ b/app/admin/models/sysjob.go @@ -9,7 +9,7 @@ import ( ) type SysJob struct { - JobId int `json:"jobId" gorm:"primary_key;AUTO_INCREMENT"` // 编码 + JobId int `json:"jobId" gorm:"primaryKey;autoIncrement"` // 编码 JobName string `json:"jobName" gorm:"size:255;"` // 名称 JobGroup string `json:"jobGroup" gorm:"size:255;"` // 任务分组 JobType int `json:"jobType" gorm:"size:1;"` // 任务类型 diff --git a/app/admin/models/system/role_menu.go b/app/admin/models/system/role_menu.go index 12f234fd..6ba97d8d 100644 --- a/app/admin/models/system/role_menu.go +++ b/app/admin/models/system/role_menu.go @@ -12,9 +12,9 @@ import ( type RoleMenu struct { RoleId int `gorm:""` MenuId int `gorm:""` - RoleName string `gorm:"size:128)"` - CreateBy string `gorm:"size:128)"` - UpdateBy string `gorm:"size:128)"` + RoleName string `gorm:"size:128"` + CreateBy string `gorm:"size:128"` + UpdateBy string `gorm:"size:128"` } func (RoleMenu) TableName() string { diff --git a/app/admin/models/system/sys_post.go b/app/admin/models/system/sys_post.go index 352f7064..c1954a22 100644 --- a/app/admin/models/system/sys_post.go +++ b/app/admin/models/system/sys_post.go @@ -3,7 +3,7 @@ package system import "go-admin/common/models" type SysPost struct { - PostId int `gorm:"primary_key;AUTO_INCREMENT" json:"postId"` //岗位编号 + PostId int `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号 PostName string `gorm:"size:128;" json:"postName"` //岗位名称 PostCode string `gorm:"size:128;" json:"postCode"` //岗位代码 Sort int `gorm:"" json:"sort"` //岗位排序 diff --git a/app/admin/models/system/sys_role.go b/app/admin/models/system/sys_role.go index 4588da82..3ae0fe05 100644 --- a/app/admin/models/system/sys_role.go +++ b/app/admin/models/system/sys_role.go @@ -3,7 +3,7 @@ package system import "go-admin/common/models" type SysRole struct { - RoleId int `json:"roleId" gorm:"primary_key;AUTO_INCREMENT"` // 角色编码 + RoleId int `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码 RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 Status string `json:"status" gorm:"size:4;"` // RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 diff --git a/app/admin/models/sysuser.go b/app/admin/models/sysuser.go index fa5db4f7..c273365d 100644 --- a/app/admin/models/sysuser.go +++ b/app/admin/models/sysuser.go @@ -39,7 +39,7 @@ type LoginM struct { } type SysUserId struct { - UserId int `gorm:"primary_key;AUTO_INCREMENT" json:"userId"` // 编码 + UserId int `gorm:"primaryKey;autoIncrement" json:"userId"` // 编码 } type SysUserB struct { diff --git a/app/admin/models/tools/syscolumns.go b/app/admin/models/tools/syscolumns.go index 9bcbd83b..830db6df 100644 --- a/app/admin/models/tools/syscolumns.go +++ b/app/admin/models/tools/syscolumns.go @@ -6,7 +6,7 @@ import ( ) type SysColumns struct { - ColumnId int `gorm:"primary_key;auto_increment" json:"columnId"` + 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"` diff --git a/app/admin/models/tools/systables.go b/app/admin/models/tools/systables.go index 4275b8bd..d0c6746a 100644 --- a/app/admin/models/tools/systables.go +++ b/app/admin/models/tools/systables.go @@ -8,7 +8,7 @@ import ( ) type SysTables struct { - TableId int `gorm:"primary_key;auto_increment" json:"tableId"` //表编码 + TableId int `gorm:"primaryKey;autoIncrement" json:"tableId"` //表编码 TBName string `gorm:"column:table_name;size:255;" json:"tableName"` //表名称 TableComment string `gorm:"size:255;" json:"tableComment"` //表备注 ClassName string `gorm:"size:255;" json:"className"` //类名 diff --git a/cmd/migrate/migration/version/dictdata.go b/cmd/migrate/migration/version/dictdata.go index c330d977..7ee0f7c5 100644 --- a/cmd/migrate/migration/version/dictdata.go +++ b/cmd/migrate/migration/version/dictdata.go @@ -5,7 +5,7 @@ import ( ) type DictData struct { - DictCode int `gorm:"primary_key;auto_increment;" json:"dictCode" example:"1"` //字典编码 + DictCode int `gorm:"primaryKey;autoIncrement;" 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/cmd/migrate/migration/version/dicttype.go b/cmd/migrate/migration/version/dicttype.go index 73fff340..61c6aa18 100644 --- a/cmd/migrate/migration/version/dicttype.go +++ b/cmd/migrate/migration/version/dicttype.go @@ -5,7 +5,7 @@ import ( ) type DictType struct { - DictId int `gorm:"primary_key;auto_increment;" json:"dictId"` + DictId int `gorm:"primaryKey;autoIncrement;" 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/common/models/migrate.go b/common/models/migrate.go index 0a70d042..5573cb22 100644 --- a/common/models/migrate.go +++ b/common/models/migrate.go @@ -3,7 +3,7 @@ package models import "time" type Migration struct { - Version string `gorm:"primary_key"` + Version string `gorm:"primaryKey"` ApplyTime time.Time `gorm:"autoCreateTime"` }