diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index 54ddc15..bc4daed 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -263,7 +263,7 @@ func (e *Gen) genApiToFile(c *gin.Context, tab tools.SysTables) { GenerateTime string }{tab, i}) - pkg.FileCreate(b1, "./cmd/migrate/migration/version/"+i+"_migrate.go") + pkg.FileCreate(b1, "./cmd/migrate/migration/version-local/"+i+"_migrate.go") } diff --git a/cmd/migrate/migration/models/by.go b/cmd/migrate/migration/models/by.go new file mode 100644 index 0000000..c9dd906 --- /dev/null +++ b/cmd/migrate/migration/models/by.go @@ -0,0 +1,22 @@ +package models + +import ( + "time" + + "gorm.io/gorm" +) + +type ControlBy struct { + CreateBy int `json:"createBy" gorm:"index;comment:创建者"` + UpdateBy int `json:"updateBy" gorm:"index;comment:更新者"` +} + +type Model struct { + Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` +} + +type ModelTime struct { + CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"` + UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"` + DeletedAt gorm.DeletedAt `json:"-" gorm:"index;comment:删除时间"` +} diff --git a/cmd/migrate/migration/models/casbinrule.go b/cmd/migrate/migration/models/casbinrule.go new file mode 100644 index 0000000..014e2fd --- /dev/null +++ b/cmd/migrate/migration/models/casbinrule.go @@ -0,0 +1,16 @@ +package models + +//sys_casbin_rule +type CasbinRule struct { + PType string `json:"p_type" gorm:"size:100;"` + V0 string `json:"v0" gorm:"size:100;"` + V1 string `json:"v1" gorm:"size:100;"` + V2 string `json:"v2" gorm:"size:100;"` + V3 string `json:"v3" gorm:"size:100;"` + V4 string `json:"v4" gorm:"size:100;"` + V5 string `json:"v5" gorm:"size:100;"` +} + +func (CasbinRule) TableName() string { + return "sys_casbin_rule" +} diff --git a/cmd/migrate/migration/version/dictdata.go b/cmd/migrate/migration/models/dictdata.go similarity index 94% rename from cmd/migrate/migration/version/dictdata.go rename to cmd/migrate/migration/models/dictdata.go index efbc9e1..8758ce2 100644 --- a/cmd/migrate/migration/version/dictdata.go +++ b/cmd/migrate/migration/models/dictdata.go @@ -1,8 +1,4 @@ -package version - -import ( - "go-admin/app/admin/models" -) +package models type DictData struct { DictCode int `gorm:"primaryKey;autoIncrement;" json:"dictCode" example:"1"` //字典编码 @@ -18,7 +14,7 @@ type DictData struct { CreateBy string `gorm:"size:64;" json:"createBy"` // UpdateBy string `gorm:"size:64;" json:"updateBy"` // Remark string `gorm:"size:255;" json:"remark"` //备注 - models.BaseModel + BaseModel } func (DictData) TableName() string { diff --git a/cmd/migrate/migration/version/dicttype.go b/cmd/migrate/migration/models/dicttype.go similarity index 87% rename from cmd/migrate/migration/version/dicttype.go rename to cmd/migrate/migration/models/dicttype.go index 61c6aa1..56cf516 100644 --- a/cmd/migrate/migration/version/dicttype.go +++ b/cmd/migrate/migration/models/dicttype.go @@ -1,8 +1,4 @@ -package version - -import ( - "go-admin/app/admin/models" -) +package models type DictType struct { DictId int `gorm:"primaryKey;autoIncrement;" json:"dictId"` @@ -12,7 +8,7 @@ type DictType struct { CreateBy string `gorm:"size:11;" json:"createBy"` //创建者 UpdateBy string `gorm:"size:11;" json:"updateBy"` //更新者 Remark string `gorm:"size:255;" json:"remark"` //备注 - models.BaseModel + BaseModel } func (DictType) TableName() string { diff --git a/cmd/migrate/migration/models/initdb.go b/cmd/migrate/migration/models/initdb.go new file mode 100644 index 0000000..9bb37a2 --- /dev/null +++ b/cmd/migrate/migration/models/initdb.go @@ -0,0 +1,55 @@ +package models + +import ( + "fmt" + "go-admin/common/global" + "gorm.io/gorm" + "io/ioutil" + "log" + "strings" +) + +func InitDb(db *gorm.DB) (err error) { + filePath := "config/db.sql" + err = ExecSql(db, filePath) + if global.Driver == "postgres" { + filePath = "config/pg.sql" + err = ExecSql(db, filePath) + } + return err +} + +func ExecSql(db *gorm.DB, filePath string) error { + sql, err := Ioutil(filePath) + if err != nil { + fmt.Println("数据库基础数据初始化脚本读取失败!原因:", err.Error()) + return err + } + sqlList := strings.Split(sql, ";") + for i := 0; i < len(sqlList)-1; i++ { + if strings.Contains(sqlList[i], "--") { + fmt.Println(sqlList[i]) + continue + } + sql := strings.Replace(sqlList[i]+";", "\n", "", 0) + sql = strings.TrimSpace(sql) + if err = db.Exec(sql).Error; err != nil { + log.Printf("error sql: %s", sql) + if !strings.Contains(err.Error(), "Query was empty") { + return err + } + } + } + return nil +} + +func Ioutil(filePath string) (string, error) { + if contents, err := ioutil.ReadFile(filePath); err == nil { + //因为contents是[]byte类型,直接转换成string类型后会多一行空格,需要使用strings.Replace替换换行符 + result := strings.Replace(string(contents), "\n", "", 1) + fmt.Println("Use ioutil.ReadFile to read a file:", result) + return result, nil + } else { + return "", err + } +} diff --git a/cmd/migrate/migration/models/model.go b/cmd/migrate/migration/models/model.go new file mode 100644 index 0000000..4a1c439 --- /dev/null +++ b/cmd/migrate/migration/models/model.go @@ -0,0 +1,11 @@ +package models + +import ( + "time" +) + +type BaseModel struct { + CreatedAt time.Time `json:"createdAt"` + UpdatedAt time.Time `json:"updatedAt"` + DeletedAt *time.Time `json:"deletedAt"` +} diff --git a/cmd/migrate/migration/version/post.go b/cmd/migrate/migration/models/post.go similarity index 98% rename from cmd/migrate/migration/version/post.go rename to cmd/migrate/migration/models/post.go index 12be3f1..1b56516 100644 --- a/cmd/migrate/migration/version/post.go +++ b/cmd/migrate/migration/models/post.go @@ -1,4 +1,4 @@ -package version +package models import ( "time" diff --git a/cmd/migrate/migration/models/role.go b/cmd/migrate/migration/models/role.go new file mode 100644 index 0000000..be34187 --- /dev/null +++ b/cmd/migrate/migration/models/role.go @@ -0,0 +1,20 @@ +package models + +type SysRole struct { + 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;"` //角色代码 + RoleSort int `json:"roleSort" gorm:""` //角色排序 + Flag string `json:"flag" gorm:"size:128;"` // + CreateBy string `json:"createBy" gorm:"size:128;"` // + UpdateBy string `json:"updateBy" gorm:"size:128;"` // + Remark string `json:"remark" gorm:"size:255;"` //备注 + Admin bool `json:"admin" gorm:"size:4;"` + DataScope string `json:"dataScope" gorm:"size:128;"` + BaseModel +} + +func (SysRole) TableName() string { + return "sys_role" +} diff --git a/cmd/migrate/migration/models/role_dept.go b/cmd/migrate/migration/models/role_dept.go new file mode 100644 index 0000000..0a794e0 --- /dev/null +++ b/cmd/migrate/migration/models/role_dept.go @@ -0,0 +1,11 @@ +package models + +//sys_role_dept +type SysRoleDept struct { + RoleId int `gorm:"size:11;primaryKey"` + DeptId int `gorm:"size:11;primaryKey"` +} + +func (SysRoleDept) TableName() string { + return "sys_role_dept" +} diff --git a/cmd/migrate/migration/models/rolemenu.go b/cmd/migrate/migration/models/rolemenu.go new file mode 100644 index 0000000..d6688ef --- /dev/null +++ b/cmd/migrate/migration/models/rolemenu.go @@ -0,0 +1,13 @@ +package models + +type RoleMenu struct { + RoleId int `gorm:""` + MenuId int `gorm:""` + RoleName string `gorm:"size:128)"` + CreateBy string `gorm:"size:128)"` + UpdateBy string `gorm:"size:128)"` +} + +func (RoleMenu) TableName() string { + return "sys_role_menu" +} diff --git a/cmd/migrate/migration/models/sys_config.go b/cmd/migrate/migration/models/sys_config.go new file mode 100644 index 0000000..f8b53f2 --- /dev/null +++ b/cmd/migrate/migration/models/sys_config.go @@ -0,0 +1,17 @@ +package models + +type SysConfig struct { + Model + ConfigName string `json:"configName" gorm:"type:varchar(128);comment:ConfigName"` // + ConfigKey string `json:"configKey" gorm:"type:varchar(128);comment:ConfigKey"` // + ConfigValue string `json:"configValue" gorm:"type:varchar(255);comment:ConfigValue"` // + ConfigType string `json:"configType" gorm:"type:varchar(64);comment:ConfigType"` + IsFrontend int `json:"isFrontend" gorm:"type:varchar(64);comment:是否前台"` // + Remark string `json:"remark" gorm:"type:varchar(128);comment:Remark"` // + ControlBy + ModelTime +} + +func (SysConfig) TableName() string { + return "sys_config" +} diff --git a/cmd/migrate/migration/models/sys_dept.go b/cmd/migrate/migration/models/sys_dept.go new file mode 100644 index 0000000..2fc66a7 --- /dev/null +++ b/cmd/migrate/migration/models/sys_dept.go @@ -0,0 +1,19 @@ +package models + +type SysDept struct { + 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;"` //部门名称 + Sort int `json:"sort" gorm:""` //排序 + Leader string `json:"leader" gorm:"size:128;"` //负责人 + Phone string `json:"phone" gorm:"size:11;"` //手机 + Email string `json:"email" gorm:"size:64;"` //邮箱 + Status string `json:"status" gorm:"size:4;"` //状态 + ControlBy + ModelTime +} + +func (SysDept) TableName() string { + return "sys_dept" +} diff --git a/cmd/migrate/migration/models/sys_file_dir.go b/cmd/migrate/migration/models/sys_file_dir.go new file mode 100644 index 0000000..83181f0 --- /dev/null +++ b/cmd/migrate/migration/models/sys_file_dir.go @@ -0,0 +1,16 @@ +package models + +type SysFileDir struct { + Model + Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称 + PId int `json:"pId" gorm:"type:int(11);comment:上级目录"` // 上级目录 + Sort string `json:"sort" gorm:"type:bigint(20);comment:排序"` // 排序 + Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 + Children []SysFileDir `json:"children,omitempty" gorm:"-"` // 下级信息 + ControlBy + ModelTime +} + +func (SysFileDir) TableName() string { /**/ + return "sys_file_dir" +} diff --git a/cmd/migrate/migration/models/sys_file_info.go b/cmd/migrate/migration/models/sys_file_info.go new file mode 100644 index 0000000..66fe851 --- /dev/null +++ b/cmd/migrate/migration/models/sys_file_info.go @@ -0,0 +1,18 @@ +package models + +type SysFileInfo struct { + Model + Type string `json:"type" gorm:"type:varchar(255);comment:类型"` // + Name string `json:"name" gorm:"type:varchar(255);comment:名称"` // + Size string `json:"size" gorm:"type:int(11);comment:大小"` // + PId int `json:"pId" gorm:"type:int(11);comment:目录"` // + Source string `json:"source" gorm:"type:varchar(255);comment:来源"` // + Url string `json:"url" gorm:"type:varchar(255);comment:地址"` // + FullUrl string `json:"fullUrl" gorm:"type:varchar(255);comment:全地址"` // + ControlBy + ModelTime +} + +func (SysFileInfo) TableName() string { + return "sys_file_info" +} diff --git a/cmd/migrate/migration/models/sys_login_log.go b/cmd/migrate/migration/models/sys_login_log.go new file mode 100644 index 0000000..f4a878b --- /dev/null +++ b/cmd/migrate/migration/models/sys_login_log.go @@ -0,0 +1,26 @@ +package models + +import ( + "time" +) + +type SysLoginLog struct { + Model + Username string `json:"username" gorm:"type:varchar(128);comment:用户名"` + Status string `json:"status" gorm:"type:varchar(4);comment:状态"` + Ipaddr string `json:"ipaddr" gorm:"type:varchar(255);comment:ip地址"` + LoginLocation string `json:"loginLocation" gorm:"type:varchar(255);comment:归属地"` + Browser string `json:"browser" gorm:"type:varchar(255);comment:浏览器"` + Os string `json:"os" gorm:"type:varchar(255);comment:系统"` + Platform string `json:"platform" gorm:"type:varchar(255);comment:固件"` + LoginTime time.Time `json:"loginTime" gorm:"type:timestamp;comment:登录时间"` + Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` + Msg string `json:"msg" gorm:"type:varchar(255);comment:信息"` + CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"` + UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"` + ControlBy +} + +func (SysLoginLog) TableName() string { + return "sys_login_log" +} diff --git a/cmd/migrate/migration/models/sys_menu.go b/cmd/migrate/migration/models/sys_menu.go new file mode 100644 index 0000000..c0f8848 --- /dev/null +++ b/cmd/migrate/migration/models/sys_menu.go @@ -0,0 +1,28 @@ +package models + +type SysMenu struct { + 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;"` + Path string `json:"path" gorm:"size:128;"` + Paths string `json:"paths" gorm:"size:128;"` + MenuType string `json:"menuType" gorm:"size:1;"` + Action string `json:"action" gorm:"size:16;"` + Permission string `json:"permission" gorm:"size:255;"` + ParentId int `json:"parentId" gorm:"size:11;"` + NoCache bool `json:"noCache" gorm:"size:8;"` + Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` + Component string `json:"component" gorm:"size:255;"` + Sort int `json:"sort" gorm:"size:4;"` + Visible string `json:"visible" gorm:"size:1;"` + IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + ControlBy + ModelTime +} + +func (SysMenu) TableName() string { + return "sys_menu" +} diff --git a/cmd/migrate/migration/models/sys_opera_log.go b/cmd/migrate/migration/models/sys_opera_log.go new file mode 100644 index 0000000..a8233ab --- /dev/null +++ b/cmd/migrate/migration/models/sys_opera_log.go @@ -0,0 +1,36 @@ +package models + +import ( + "time" + + "go-admin/common/models" +) + +type SysOperaLog struct { + Model + Title string `json:"title" gorm:"type:varchar(255);comment:操作模块"` + BusinessType string `json:"businessType" gorm:"type:varchar(128);comment:操作类型"` + BusinessTypes string `json:"businessTypes" gorm:"type:varchar(128);comment:BusinessTypes"` + Method string `json:"method" gorm:"type:varchar(128);comment:函数"` + RequestMethod string `json:"requestMethod" gorm:"type:varchar(128);comment:请求方式"` + OperatorType string `json:"operatorType" gorm:"type:varchar(128);comment:操作类型"` + OperName string `json:"operName" gorm:"type:varchar(128);comment:操作者"` + DeptName string `json:"deptName" gorm:"type:varchar(128);comment:部门名称"` + OperUrl string `json:"operUrl" gorm:"type:varchar(255);comment:访问地址"` + OperIp string `json:"operIp" gorm:"type:varchar(128);comment:客户端ip"` + OperLocation string `json:"operLocation" gorm:"type:varchar(128);comment:访问位置"` + OperParam string `json:"operParam" gorm:"type:varchar(255);comment:请求参数"` + Status string `json:"status" gorm:"type:varchar(4);comment:操作状态"` + OperTime time.Time `json:"operTime" gorm:"type:timestamp;comment:操作时间"` + JsonResult string `json:"jsonResult" gorm:"type:varchar(255);comment:返回数据"` + Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` + LatencyTime string `json:"latencyTime" gorm:"type:varchar(128);comment:耗时"` + UserAgent string `json:"userAgent" gorm:"type:varchar(255);comment:ua"` + CreatedAt time.Time `json:"createdAt" gorm:"comment:创建时间"` + UpdatedAt time.Time `json:"updatedAt" gorm:"comment:最后更新时间"` + models.ControlBy +} + +func (SysOperaLog) TableName() string { + return "sys_opera_log" +} diff --git a/cmd/migrate/migration/models/sys_user.go b/cmd/migrate/migration/models/sys_user.go new file mode 100644 index 0000000..23535d6 --- /dev/null +++ b/cmd/migrate/migration/models/sys_user.go @@ -0,0 +1,28 @@ +package models + +type SysUser struct { + ControlBy + ModelTime + UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"` + Username string `json:"username" gorm:"type:varchar(64);comment:用户名"` + Password string `json:"-" gorm:"type:varchar(128);comment:密码"` + NickName string `json:"nickName" gorm:"type:varchar(128);comment:昵称"` + Phone string `json:"phone" gorm:"type:varchar(11);comment:手机号"` + RoleId int `json:"roleId" gorm:"type:bigint(20);comment:角色ID"` + Salt string `json:"-" gorm:"type:varchar(255);comment:加盐"` + Avatar string `json:"avatar" gorm:"type:varchar(255);comment:头像"` + Sex string `json:"sex" gorm:"type:varchar(255);comment:性别"` + Email string `json:"email" gorm:"type:varchar(128);comment:邮箱"` + DeptId int `json:"deptId" gorm:"type:bigint(20);comment:部门"` + PostId int `json:"postId" gorm:"type:bigint(20);comment:岗位"` + Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` + Status string `json:"status" gorm:"type:varchar(4);comment:状态"` + DeptIds []int `json:"deptIds" gorm:"-"` + PostIds []int `json:"postIds" gorm:"-"` + RoleIds []int `json:"roleIds" gorm:"-"` + Dept *SysDept `json:"dept"` +} + +func (SysUser) TableName() string { + return "sys_user" +} diff --git a/cmd/migrate/migration/models/syscategory.go b/cmd/migrate/migration/models/syscategory.go new file mode 100644 index 0000000..f2edac3 --- /dev/null +++ b/cmd/migrate/migration/models/syscategory.go @@ -0,0 +1,16 @@ +package models + +type SysCategory struct { + Model + Name string `json:"name" gorm:"type:varchar(255);comment:名称"` // + Img string `json:"img" gorm:"type:varchar(255);comment:图标"` // + Sort int `json:"sort" gorm:"type:int(4);comment:排序"` // + Status int `json:"status" gorm:"type:int(1);comment:状态"` // + Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` // + ControlBy + ModelTime +} + +func (SysCategory) TableName() string { + return "sys_category" +} diff --git a/cmd/migrate/migration/models/syscolumns.go b/cmd/migrate/migration/models/syscolumns.go new file mode 100644 index 0000000..14f7525 --- /dev/null +++ b/cmd/migrate/migration/models/syscolumns.go @@ -0,0 +1,46 @@ +package models + +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 string `gorm:"column:create_by;size:128;" json:"createBy"` + UpdateBy string `gorm:"column:update_By;size:128;" json:"updateBy"` + BaseModel +} + +func (SysColumns) TableName() string { + return "sys_columns" +} diff --git a/cmd/migrate/migration/models/syscontent.go b/cmd/migrate/migration/models/syscontent.go new file mode 100644 index 0000000..04c9ef1 --- /dev/null +++ b/cmd/migrate/migration/models/syscontent.go @@ -0,0 +1,19 @@ +package models + +type SysContent struct { + Model + CateId int `json:"cateId" gorm:"type:int(11);comment:分类id"` + Name string `json:"name" gorm:"type:varchar(255);comment:名称"` + Status int `json:"status" gorm:"type:int(1);comment:状态"` + Img string `json:"img" gorm:"type:varchar(255);comment:图片"` + Content string `json:"content" gorm:"type:text;comment:内容"` + Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"` + Sort int `json:"sort" gorm:"type:int(4);comment:排序"` + ControlBy + ModelTime +} + +// TableName +func (SysContent) TableName() string { + return "sys_content" +} diff --git a/cmd/migrate/migration/models/sysjob.go b/cmd/migrate/migration/models/sysjob.go new file mode 100644 index 0000000..64d62c4 --- /dev/null +++ b/cmd/migrate/migration/models/sysjob.go @@ -0,0 +1,24 @@ +package models + +type SysJob struct { + 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;"` // 任务类型 + CronExpression string `json:"cronExpression" gorm:"size:255;"` // cron表达式 + InvokeTarget string `json:"invokeTarget" gorm:"size:255;"` // 调用目标 + Args string `json:"args" gorm:"size:255;"` // 目标参数 + MisfirePolicy int `json:"misfirePolicy" gorm:"size:255;"` // 执行策略 + Concurrent int `json:"concurrent" gorm:"size:1;"` // 是否并发 + Status int `json:"status" gorm:"size:1;"` // 状态 + EntryId int `json:"entry_id" gorm:"size:11;"` // job启动时返回的id + CreateBy string `json:"createBy" gorm:"size:128;"` // + UpdateBy string `json:"updateBy" gorm:"size:128;"` // + BaseModel + + DataScope string `json:"dataScope" gorm:"-"` +} + +func (SysJob) TableName() string { + return "sys_job" +} diff --git a/cmd/migrate/migration/models/systables.go b/cmd/migrate/migration/models/systables.go new file mode 100644 index 0000000..d973e13 --- /dev/null +++ b/cmd/migrate/migration/models/systables.go @@ -0,0 +1,38 @@ +package models + +type SysTables struct { + 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"` //类名 + TplCategory string `gorm:"size:255;" json:"tplCategory"` // + PackageName string `gorm:"size:255;" json:"packageName"` //包名 + ModuleName string `gorm:"size:255;" json:"moduleName"` //模块名 + BusinessName string `gorm:"size:255;" json:"businessName"` // + FunctionName string `gorm:"size:255;" json:"functionName"` //功能名称 + FunctionAuthor string `gorm:"size:255;" json:"functionAuthor"` //功能作者 + PkColumn string `gorm:"size:255;" json:"pkColumn"` + PkGoField string `gorm:"size:255;" json:"pkGoField"` + PkJsonField string `gorm:"size:255;" json:"pkJsonField"` + Options string `gorm:"size:255;" json:"options"` + TreeCode string `gorm:"size:255;" json:"treeCode"` + TreeParentCode string `gorm:"size:255;" json:"treeParentCode"` + TreeName string `gorm:"size:255;" json:"treeName"` + Tree bool `gorm:"size:1;" json:"tree"` + Crud bool `gorm:"size:1;" json:"crud"` + Remark string `gorm:"size:255;" json:"remark"` + IsDataScope int `gorm:"size:1;" json:"isDataScope"` + IsActions int `gorm:"size:1;" json:"isActions"` + IsAuth int `gorm:"size:1;" json:"isAuth"` + IsLogicalDelete string `gorm:"size:1;" json:"isLogicalDelete"` + LogicalDelete bool `gorm:"size:1;" json:"logicalDelete"` + LogicalDeleteColumn string `gorm:"size:128;" json:"logicalDeleteColumn"` + CreateBy string `gorm:"size:128;" json:"createBy"` + UpdateBy string `gorm:"size:128;" json:"updateBy"` + + BaseModel +} + +func (SysTables) TableName() string { + return "sys_tables" +} diff --git a/cmd/migrate/migration/models/system.go b/cmd/migrate/migration/models/system.go new file mode 100644 index 0000000..b0498c3 --- /dev/null +++ b/cmd/migrate/migration/models/system.go @@ -0,0 +1,12 @@ +package models + +type SysSetting struct { + SettingsId int `json:"settings_id" gorm:"primary_key;AUTO_INCREMENT"` + Name string `json:"name" gorm:"type:varchar(256);"` + Logo string `json:"logo" gorm:"type:varchar(256);"` + ModelTime +} + +func (SysSetting) TableName() string { + return "sys_setting" +} diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index a453d3c..ba23366 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -3,12 +3,10 @@ package version import ( "runtime" - "go-admin/app/admin/models/system" "gorm.io/gorm" - "go-admin/app/admin/models" - "go-admin/app/admin/models/tools" "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -19,23 +17,23 @@ func init() { func _1599190683659Tables(db *gorm.DB, version string) error { err := db.Debug().Migrator().AutoMigrate( - new(system.CasbinRule), - new(system.SysDept), - new(system.SysConfig), - new(tools.SysTables), - new(tools.SysColumns), - new(system.SysMenu), - new(system.SysLoginLog), - new(system.SysOperaLog), + new(models.CasbinRule), + new(models.SysDept), + new(models.SysConfig), + new(models.SysTables), + new(models.SysColumns), + new(models.SysMenu), + new(models.SysLoginLog), + new(models.SysOperaLog), new(models.RoleMenu), - new(system.SysRoleDept), - new(system.SysUser), - new(system.SysRole), - new(Post), - new(DictData), - new(DictType), + new(models.SysRoleDept), + new(models.SysUser), + new(models.SysRole), + new(models.Post), + new(models.DictData), + new(models.DictType), new(models.SysJob), - new(system.SysConfig), + new(models.SysConfig), new(models.SysSetting), new(models.SysFileDir), new(models.SysFileInfo), diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go index a4c9097..afa1b11 100644 --- a/cmd/migrate/migration/version/1599190683670_migrate.go +++ b/cmd/migrate/migration/version/1599190683670_migrate.go @@ -6,9 +6,8 @@ import ( "gorm.io/gorm" - "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -20,31 +19,31 @@ func init() { func _1599190683670Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - list3 := []system.SysDept{ - {DeptId: 1, ParentId: 0, DeptPath: "/0/1", DeptName: "爱拓科技", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 7, ParentId: 1, DeptPath: "/0/1/7", DeptName: "研发部", Sort: 1, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 8, ParentId: 1, DeptPath: "/0/1/8", DeptName: "运维部", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 9, ParentId: 1, DeptPath: "/0/1/9", DeptName: "客服部", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, - {DeptId: 10, ParentId: 1, DeptPath: "/0/1/10", DeptName: "人力资源", Sort: 3, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "1", ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, + list3 := []models.SysDept{ + {DeptId: 1, ParentId: 0, DeptPath: "/0/1", DeptName: "爱拓科技", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, + {DeptId: 7, ParentId: 1, DeptPath: "/0/1/7", DeptName: "研发部", Sort: 1, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, + {DeptId: 8, ParentId: 1, DeptPath: "/0/1/8", DeptName: "运维部", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, + {DeptId: 9, ParentId: 1, DeptPath: "/0/1/9", DeptName: "客服部", Sort: 0, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "2", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, + {DeptId: 10, ParentId: 1, DeptPath: "/0/1/10", DeptName: "人力资源", Sort: 3, Leader: "aituo", Phone: "13782218188", Email: "atuo@aituo.com", Status: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, } - list4 := []system.SysConfig{ - {Model: common.Model{Id: 1}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-默认皮肤样式名称", ConfigKey: "sys_index_skinName", ConfigValue: "skin-blue", ConfigType: "Y", Remark: "蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow"}, - {Model: common.Model{Id: 2}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "用户管理-账号初始密码", ConfigKey: "sys.user.initPassword", ConfigValue: "123456", ConfigType: "Y", Remark: "初始化密码 123456"}, - {Model: common.Model{Id: 3}, ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: common.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-侧边栏主题", ConfigKey: "sys_index_sideTheme", ConfigValue: "theme-dark", ConfigType: "Y", Remark: "深色主题theme-dark,浅色主题theme-light"}, + list4 := []models.SysConfig{ + {Model: models.Model{Id: 1}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-默认皮肤样式名称", ConfigKey: "sys_index_skinName", ConfigValue: "skin-blue", ConfigType: "Y", Remark: "蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow"}, + {Model: models.Model{Id: 2}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "用户管理-账号初始密码", ConfigKey: "sys.user.initPassword", ConfigValue: "123456", ConfigType: "Y", Remark: "初始化密码 123456"}, + {Model: models.Model{Id: 3}, ModelTime: models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}, ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, ConfigName: "主框架页-侧边栏主题", ConfigKey: "sys_index_sideTheme", ConfigValue: "theme-dark", ConfigType: "Y", Remark: "深色主题theme-dark,浅色主题theme-light"}, } - list5 := []Post{ + list5 := []models.Post{ {PostId: 1, PostName: "首席执行官", PostCode: "CEO", Sort: 0, Status: "2", Remark: "首席执行官", CreateBy: "1", UpdateBy: "1", CreatedAt: time.Now(), UpdatedAt: time.Now()}, {PostId: 2, PostName: "首席技术执行官", PostCode: "CTO", Sort: 2, Status: "2", Remark: "首席技术执行官", CreateBy: "1", UpdateBy: "1", CreatedAt: time.Now(), UpdatedAt: time.Now()}, {PostId: 3, PostName: "首席运营官", PostCode: "COO", Sort: 3, Status: "2", Remark: "测试工程师", CreateBy: "1", UpdateBy: "1", CreatedAt: time.Now(), UpdatedAt: time.Now()}, } list6 := []models.SysRole{ - {1, "系统管理员", "2", "admin", 1, "", "1", "0", "", true, "", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", []int{}, []int{}}, + {1, "系统管理员", "2", "admin", 1, "", "1", "0", "", true, "", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, } - list7 := []DictType{ + list7 := []models.DictType{ {DictId: 1, DictName: "系统开关", DictType: "sys_normal_disable", Status: "2", CreateBy: "1", UpdateBy: "1", Remark: "系统开关列表", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, {DictId: 2, DictName: "用户性别", DictType: "sys_user_sex", Status: "2", CreateBy: "1", UpdateBy: "", Remark: "用户性别列表", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, {DictId: 3, DictName: "菜单状态", DictType: "sys_show_hide", Status: "2", CreateBy: "1", UpdateBy: "", Remark: "菜单状态列表", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, @@ -57,13 +56,13 @@ func _1599190683670Test(db *gorm.DB, version string) error { {DictId: 10, DictName: "通知状态", DictType: "sys_notice_status", Status: "2", CreateBy: "1", UpdateBy: "", Remark: "通知状态列表", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, } - list8 := []system.SysUser{ + list8 := []models.SysUser{ { - ControlBy: common.ControlBy{ + ControlBy: models.ControlBy{ CreateBy: 1, UpdateBy: 1, }, - ModelTime: common.ModelTime{ + ModelTime: models.ModelTime{ CreatedAt: time.Now(), UpdatedAt: time.Now(), }, @@ -85,7 +84,7 @@ func _1599190683670Test(db *gorm.DB, version string) error { //{models.SysUserId{1}, models.LoginM{models.UserName{"admin"}, models.PassWord{"$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2"}}, models.SysUserB{"zhangwj", "13818888888", 1, "", "", "0", "1@qq.com", 1, 1, "1", "1", "", "2", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}, "", ""}}, } - list9 := []DictData{ + list9 := []models.DictData{ {DictCode: 1, DictSort: 0, DictLabel: "正常", DictValue: "2", DictType: "sys_normal_disable", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", CreateBy: "1", UpdateBy: "", Remark: "系统正常", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, {DictCode: 2, DictSort: 0, DictLabel: "停用", DictValue: "1", DictType: "sys_normal_disable", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", CreateBy: "1", UpdateBy: "", Remark: "系统停用", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, {DictCode: 3, DictSort: 0, DictLabel: "男", DictValue: "0", DictType: "sys_user_sex", CssClass: "", ListClass: "", IsDefault: "", Status: "2", Default: "", CreateBy: "1", UpdateBy: "", Remark: "性别男", BaseModel: models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, @@ -120,7 +119,7 @@ func _1599190683670Test(db *gorm.DB, version string) error { } list10 := []models.SysSetting{ - {1, "go-admin管理系统", "https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png", common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, + {1, "go-admin管理系统", "https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png", models.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}, } list11 := []models.SysJob{ diff --git a/cmd/migrate/migration/version/1599190683680_migrate.go b/cmd/migrate/migration/version/1599190683680_migrate.go index 8a5c5a3..d603244 100644 --- a/cmd/migrate/migration/version/1599190683680_migrate.go +++ b/cmd/migrate/migration/version/1599190683680_migrate.go @@ -5,8 +5,8 @@ import ( "gorm.io/gorm" - "go-admin/app/admin/models" "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -19,32 +19,32 @@ func _1599190683680Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { var err error - list := []models.Menu{ - {MenuId: 496, MenuName: "Sources", Title: "资源管理", Icon: "network", Path: "/sources", Paths: "/0/496", MenuType: "M", Action: "无", Permission: "", ParentId: 0, NoCache: true, Breadcrumb: "", Component: "Layout", Sort: 3, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "1"}, - {MenuId: 497, MenuName: "File", Title: "文件管理", Icon: "documentation", Path: "file-manage", Paths: "/0/496/497", MenuType: "C", Action: "", Permission: "", ParentId: 496, NoCache: true, Breadcrumb: "", Component: "/fileManage/index", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "1"}, - {MenuId: 498, MenuName: "", Title: "内容管理", Icon: "pass", Path: "/content", Paths: "/0/498", MenuType: "M", Action: "无", Permission: "", ParentId: 0, NoCache: true, Breadcrumb: "", Component: "Layout", Sort: 4, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "1"}, - {MenuId: 499, MenuName: "SysCategory", Title: "分类", Icon: "pass", Path: "syscategory", Paths: "/0/498/499", MenuType: "C", Action: "无", Permission: "syscategory:syscategory:list", ParentId: 498, NoCache: true, Breadcrumb: "", Component: "/syscategory/index", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 500, MenuName: "", Title: "分页获取分类", Icon: "pass", Path: "", Paths: "/0/498/499/500", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:query", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 501, MenuName: "", Title: "创建分类", Icon: "pass", Path: "", Paths: "/0/498/499/501", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:add", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 502, MenuName: "", Title: "修改分类", Icon: "pass", Path: "", Paths: "/0/498/499/502", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:edit", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 503, MenuName: "", Title: "删除分类", Icon: "pass", Path: "", Paths: "/0/498/499/503", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:remove", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 504, MenuName: "Category", Title: "分类", Icon: "bug", Path: "category", Paths: "/0/63/504", MenuType: "M", Action: "无", Permission: "", ParentId: 63, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 505, MenuName: "", Title: "分页获取分类", Icon: "bug", Path: "/api/v1/syscategoryList", Paths: "/0/63/504/505", MenuType: "A", Action: "GET", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 506, MenuName: "", Title: "根据id获取分类", Icon: "bug", Path: "/api/v1/syscategory/:id", Paths: "/0/63/504/506", MenuType: "A", Action: "GET", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 507, MenuName: "", Title: "创建分类", Icon: "bug", Path: "/api/v1/syscategory", Paths: "/0/63/504/507", MenuType: "A", Action: "POST", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 508, MenuName: "", Title: "修改分类", Icon: "bug", Path: "/api/v1/syscategory", Paths: "/0/63/504/508", MenuType: "A", Action: "PUT", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 509, MenuName: "", Title: "删除分类", Icon: "bug", Path: "/api/v1/syscategory/:id", Paths: "/0/63/504/509", MenuType: "A", Action: "DELETE", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 511, MenuName: "SysContent", Title: "内容管理", Icon: "pass", Path: "syscontent", Paths: "/0/498/511", MenuType: "C", Action: "无", Permission: "syscontent:syscontent:list", ParentId: 498, NoCache: true, Breadcrumb: "", Component: "/syscontent/index", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 512, MenuName: "", Title: "分页获取内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/512", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:query", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 513, MenuName: "", Title: "创建内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/513", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:add", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 514, MenuName: "", Title: "修改内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/514", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:edit", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 515, MenuName: "", Title: "删除内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/515", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:remove", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 516, MenuName: "Content", Title: "内容管理", Icon: "bug", Path: "content", Paths: "/0/63/516", MenuType: "M", Action: "无", Permission: "", ParentId: 63, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 517, MenuName: "", Title: "分页获取内容管理", Icon: "bug", Path: "/api/v1/syscontentList", Paths: "/0/63/516/517", MenuType: "A", Action: "GET", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 518, MenuName: "", Title: "根据id获取内容管理", Icon: "bug", Path: "/api/v1/syscontent/:id", Paths: "/0/63/516/518", MenuType: "A", Action: "GET", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 519, MenuName: "", Title: "创建内容管理", Icon: "bug", Path: "/api/v1/syscontent", Paths: "/0/63/516/519", MenuType: "A", Action: "POST", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 520, MenuName: "", Title: "修改内容管理", Icon: "bug", Path: "/api/v1/syscontent", Paths: "/0/63/516/520", MenuType: "A", Action: "PUT", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, - {MenuId: 521, MenuName: "", Title: "删除内容管理", Icon: "bug", Path: "/api/v1/syscontent/:id", Paths: "/0/63/516/521", MenuType: "A", Action: "DELETE", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", CreateBy: "1", UpdateBy: "1", IsFrame: "0"}, + list := []models.SysMenu{ + {MenuId: 496, MenuName: "Sources", Title: "资源管理", Icon: "network", Path: "/sources", Paths: "/0/496", MenuType: "M", Action: "无", Permission: "", ParentId: 0, NoCache: true, Breadcrumb: "", Component: "Layout", Sort: 3, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "1"}, + {MenuId: 497, MenuName: "File", Title: "文件管理", Icon: "documentation", Path: "file-manage", Paths: "/0/496/497", MenuType: "C", Action: "", Permission: "", ParentId: 496, NoCache: true, Breadcrumb: "", Component: "/fileManage/index", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "1"}, + {MenuId: 498, MenuName: "", Title: "内容管理", Icon: "pass", Path: "/content", Paths: "/0/498", MenuType: "M", Action: "无", Permission: "", ParentId: 0, NoCache: true, Breadcrumb: "", Component: "Layout", Sort: 4, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "1"}, + {MenuId: 499, MenuName: "SysCategory", Title: "分类", Icon: "pass", Path: "syscategory", Paths: "/0/498/499", MenuType: "C", Action: "无", Permission: "syscategory:syscategory:list", ParentId: 498, NoCache: true, Breadcrumb: "", Component: "/syscategory/index", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 500, MenuName: "", Title: "分页获取分类", Icon: "pass", Path: "", Paths: "/0/498/499/500", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:query", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 501, MenuName: "", Title: "创建分类", Icon: "pass", Path: "", Paths: "/0/498/499/501", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:add", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 502, MenuName: "", Title: "修改分类", Icon: "pass", Path: "", Paths: "/0/498/499/502", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:edit", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 503, MenuName: "", Title: "删除分类", Icon: "pass", Path: "", Paths: "/0/498/499/503", MenuType: "F", Action: "无", Permission: "syscategory:syscategory:remove", ParentId: 499, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 504, MenuName: "Category", Title: "分类", Icon: "bug", Path: "category", Paths: "/0/63/504", MenuType: "M", Action: "无", Permission: "", ParentId: 63, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 505, MenuName: "", Title: "分页获取分类", Icon: "bug", Path: "/api/v1/syscategoryList", Paths: "/0/63/504/505", MenuType: "A", Action: "GET", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 506, MenuName: "", Title: "根据id获取分类", Icon: "bug", Path: "/api/v1/syscategory/:id", Paths: "/0/63/504/506", MenuType: "A", Action: "GET", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 507, MenuName: "", Title: "创建分类", Icon: "bug", Path: "/api/v1/syscategory", Paths: "/0/63/504/507", MenuType: "A", Action: "POST", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 508, MenuName: "", Title: "修改分类", Icon: "bug", Path: "/api/v1/syscategory", Paths: "/0/63/504/508", MenuType: "A", Action: "PUT", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 509, MenuName: "", Title: "删除分类", Icon: "bug", Path: "/api/v1/syscategory/:id", Paths: "/0/63/504/509", MenuType: "A", Action: "DELETE", Permission: "", ParentId: 504, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 511, MenuName: "SysContent", Title: "内容管理", Icon: "pass", Path: "syscontent", Paths: "/0/498/511", MenuType: "C", Action: "无", Permission: "syscontent:syscontent:list", ParentId: 498, NoCache: true, Breadcrumb: "", Component: "/syscontent/index", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 512, MenuName: "", Title: "分页获取内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/512", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:query", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 513, MenuName: "", Title: "创建内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/513", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:add", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 514, MenuName: "", Title: "修改内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/514", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:edit", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 515, MenuName: "", Title: "删除内容管理", Icon: "pass", Path: "", Paths: "/0/510/511/515", MenuType: "F", Action: "无", Permission: "syscontent:syscontent:remove", ParentId: 511, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "0", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 516, MenuName: "Content", Title: "内容管理", Icon: "bug", Path: "content", Paths: "/0/63/516", MenuType: "M", Action: "无", Permission: "", ParentId: 63, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 517, MenuName: "", Title: "分页获取内容管理", Icon: "bug", Path: "/api/v1/syscontentList", Paths: "/0/63/516/517", MenuType: "A", Action: "GET", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 518, MenuName: "", Title: "根据id获取内容管理", Icon: "bug", Path: "/api/v1/syscontent/:id", Paths: "/0/63/516/518", MenuType: "A", Action: "GET", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 519, MenuName: "", Title: "创建内容管理", Icon: "bug", Path: "/api/v1/syscontent", Paths: "/0/63/516/519", MenuType: "A", Action: "POST", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 520, MenuName: "", Title: "修改内容管理", Icon: "bug", Path: "/api/v1/syscontent", Paths: "/0/63/516/520", MenuType: "A", Action: "PUT", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, + {MenuId: 521, MenuName: "", Title: "删除内容管理", Icon: "bug", Path: "/api/v1/syscontent/:id", Paths: "/0/63/516/521", MenuType: "A", Action: "DELETE", Permission: "", ParentId: 516, NoCache: true, Breadcrumb: "", Component: "", Sort: 0, Visible: "1", ControlBy: models.ControlBy{CreateBy: 1, UpdateBy: 1}, IsFrame: "0"}, } err = tx.Create(list).Error diff --git a/cmd/migrate/migration/version/1600089797118_migrate.go b/cmd/migrate/migration/version/1600089797118_migrate.go index 12b603b..af9e8a4 100644 --- a/cmd/migrate/migration/version/1600089797118_migrate.go +++ b/cmd/migrate/migration/version/1600089797118_migrate.go @@ -5,8 +5,8 @@ import ( "gorm.io/gorm" - "go-admin/app/admin/models" "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -22,7 +22,7 @@ func _1600089797118Migrate(db *gorm.DB, version string) error { PId: 0, Sort: "0", Path: "", - ControlBy: common.ControlBy{ + ControlBy: models.ControlBy{ CreateBy: 1, UpdateBy: 1, }, diff --git a/cmd/migrate/migration/version/1602644950000_migrate.go b/cmd/migrate/migration/version/1602644950000_migrate.go index 8a7ca0b..b398467 100644 --- a/cmd/migrate/migration/version/1602644950000_migrate.go +++ b/cmd/migrate/migration/version/1602644950000_migrate.go @@ -5,9 +5,8 @@ import ( "gorm.io/gorm" - "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -18,13 +17,13 @@ func init() { func _1602644950000Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - if tx.Migrator().HasColumn(&system.SysConfig{}, "config_id") { - err := tx.Migrator().RenameColumn(&system.SysConfig{}, "config_id", "id") + if tx.Migrator().HasColumn(&models.SysConfig{}, "config_id") { + err := tx.Migrator().RenameColumn(&models.SysConfig{}, "config_id", "id") if err != nil { return err } } - list2 := []system.CasbinRule{ + list2 := []models.CasbinRule{ {PType: "p", V0: "admin", V1: "/api/v1/config", V2: "GET"}, } err := tx.Create(list2).Error @@ -32,7 +31,7 @@ func _1602644950000Test(db *gorm.DB, version string) error { return err } - menu := models.Menu{MenuId: 86, Path: "/api/v1/config"} + menu := models.SysMenu{MenuId: 86, Path: "/api/v1/config"} err = tx.Model(&menu).Where("menu_id = ?", 86).Update("Path", "/api/v1/config").Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1603465014697_migrate.go b/cmd/migrate/migration/version/1603465014697_migrate.go index 63aed14..e10311a 100644 --- a/cmd/migrate/migration/version/1603465014697_migrate.go +++ b/cmd/migrate/migration/version/1603465014697_migrate.go @@ -1,12 +1,12 @@ package version import ( - "go-admin/app/admin/models" - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -17,7 +17,7 @@ func init() { func _1603465014697Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - err := tx.Debug().Model(&models.Menu{}).Where("path = ?", "/api/v1/syscategoryList").Update("path", "/api/v1/syscategory").Error + err := tx.Debug().Model(&models.SysMenu{}).Where("path = ?", "/api/v1/syscategoryList").Update("path", "/api/v1/syscategory").Error if err != nil { return err } diff --git a/cmd/migrate/migration/version/1603516925109_migrate.go b/cmd/migrate/migration/version/1603516925109_migrate.go index f2539cf..d41e24b 100644 --- a/cmd/migrate/migration/version/1603516925109_migrate.go +++ b/cmd/migrate/migration/version/1603516925109_migrate.go @@ -1,13 +1,13 @@ package version import ( + "runtime" + "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" - - "runtime" ) func init() { @@ -20,15 +20,15 @@ func _1603516925109Test(db *gorm.DB, version string) error { _ = tx.Migrator().RenameTable("sys_operlog", "sys_opera_log") _ = tx.Migrator().RenameTable("sys_loginlog", "sys_login_log") - if tx.Migrator().HasColumn(&system.SysLoginLog{}, "info_id") { - err := tx.Migrator().RenameColumn(&system.SysLoginLog{}, "info_id", "id") + if tx.Migrator().HasColumn(&models.SysLoginLog{}, "info_id") { + err := tx.Migrator().RenameColumn(&models.SysLoginLog{}, "info_id", "id") if err != nil { return err } } - if tx.Migrator().HasColumn(&system.SysOperaLog{}, "oper_id") { - err := tx.Migrator().RenameColumn(&system.SysOperaLog{}, "oper_id", "id") + if tx.Migrator().HasColumn(&models.SysOperaLog{}, "oper_id") { + err := tx.Migrator().RenameColumn(&models.SysOperaLog{}, "oper_id", "id") if err != nil { return err } diff --git a/cmd/migrate/migration/version/1606579402398_migrate.go b/cmd/migrate/migration/version/1606579402398_migrate.go index 0e5c522..e0b725e 100644 --- a/cmd/migrate/migration/version/1606579402398_migrate.go +++ b/cmd/migrate/migration/version/1606579402398_migrate.go @@ -1,13 +1,12 @@ package version import ( - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -19,19 +18,19 @@ func init() { func _1606579402398Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - dicData := DictData{} + dicData := models.DictData{} err := tx.Model(&dicData).Where("dict_code = ?", 1).Update("dict_value", 2).Error if err != nil { return err } - dicType := DictType{} + dicType := models.DictType{} err = tx.Model(&dicType).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err } - user := system.SysUser{} + user := models.SysUser{} err = tx.Model(&user).Where("user_id = ?", 1).Update("status", 2).Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1606582844753_migrate.go b/cmd/migrate/migration/version/1606582844753_migrate.go index 9245a9d..5864b0e 100644 --- a/cmd/migrate/migration/version/1606582844753_migrate.go +++ b/cmd/migrate/migration/version/1606582844753_migrate.go @@ -1,13 +1,12 @@ package version import ( - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -19,13 +18,13 @@ func init() { func _1606582844753Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - dept := system.SysDept{} + dept := models.SysDept{} err := tx.Model(&dept).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err } - dictData := DictData{} + dictData := models.DictData{} err = tx.Model(&dictData).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1610427732413_migrate.go b/cmd/migrate/migration/version/1610427732413_migrate.go index 83fc1c6..eb89844 100644 --- a/cmd/migrate/migration/version/1610427732413_migrate.go +++ b/cmd/migrate/migration/version/1610427732413_migrate.go @@ -1,13 +1,12 @@ package version import ( - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -20,7 +19,7 @@ func _1610427732413Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { // TODO: 这里开始写入要变更的内容 - user := system.SysUser{} + user := models.SysUser{} err := tx.Model(&user).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1610804233204_migrate.go b/cmd/migrate/migration/version/1610804233204_migrate.go index 390515b..52d82ac 100644 --- a/cmd/migrate/migration/version/1610804233204_migrate.go +++ b/cmd/migrate/migration/version/1610804233204_migrate.go @@ -1,13 +1,12 @@ package version import ( - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -20,13 +19,13 @@ func _1610804233204Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { // TODO: 这里开始写入要变更的内容 - post := system.SysPost{} + post := models.Post{} err := tx.Model(&post).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err } - role := system.SysRole{} + role := models.SysRole{} err = tx.Model(&role).Where("status = ?", 0).Update("status", 2).Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1613638159444_migrate.go b/cmd/migrate/migration/version/1613638159444_migrate.go index 9a0c4fa..dcb5580 100644 --- a/cmd/migrate/migration/version/1613638159444_migrate.go +++ b/cmd/migrate/migration/version/1613638159444_migrate.go @@ -1,13 +1,12 @@ package version import ( - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -22,20 +21,20 @@ func _1613638159444Test(db *gorm.DB, version string) error { // TODO: 这里开始写入要变更的内容 // TODO: 例如 修改表字段 使用过程中请删除此段代码 - err := tx.Migrator().AlterColumn(&system.SysRole{}, "create_by") + err := tx.Migrator().AlterColumn(&models.SysRole{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysRole{}, "update_by") + err = tx.Migrator().AlterColumn(&models.SysRole{}, "update_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysMenu{}, "update_by") + err = tx.Migrator().AlterColumn(&models.SysMenu{}, "update_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysMenu{}, "create_by") + err = tx.Migrator().AlterColumn(&models.SysMenu{}, "create_by") if err != nil { return err } diff --git a/cmd/migrate/migration/version/1613697961697_migrate.go b/cmd/migrate/migration/version/1613697961697_migrate.go index 9e52af8..12da56d 100644 --- a/cmd/migrate/migration/version/1613697961697_migrate.go +++ b/cmd/migrate/migration/version/1613697961697_migrate.go @@ -1,13 +1,12 @@ package version import ( - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -20,20 +19,20 @@ func _1613697961697Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { //修改字段类型 - err := tx.Migrator().AlterColumn(&system.SysMenu{}, "create_by") + err := tx.Migrator().AlterColumn(&models.SysMenu{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysMenu{}, "update_by") + err = tx.Migrator().AlterColumn(&models.SysMenu{}, "update_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysRole{}, "create_by") + err = tx.Migrator().AlterColumn(&models.SysRole{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysRole{}, "update_by") + err = tx.Migrator().AlterColumn(&models.SysRole{}, "update_by") if err != nil { return err } diff --git a/cmd/migrate/migration/version/1613720892819_migrate.go b/cmd/migrate/migration/version/1613720892819_migrate.go index dc7ef43..088dd91 100644 --- a/cmd/migrate/migration/version/1613720892819_migrate.go +++ b/cmd/migrate/migration/version/1613720892819_migrate.go @@ -1,11 +1,12 @@ package version import ( - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -18,7 +19,7 @@ func _1613720892819Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { // TODO: 这里开始写入要变更的内容 - t := &DictType{ + t := &models.DictType{ DictName: "内容状态", DictType: "sys_content_status", Status: "2", @@ -30,8 +31,8 @@ func _1613720892819Test(db *gorm.DB, version string) error { return err } - data := make([]DictData, 2) - data[0] = DictData{ + data := make([]models.DictData, 2) + data[0] = models.DictData{ DictSort: 0, DictLabel: "正常", DictValue: "1", @@ -40,7 +41,7 @@ func _1613720892819Test(db *gorm.DB, version string) error { CreateBy: "1", UpdateBy: "1", } - data[1] = DictData{ + data[1] = models.DictData{ DictSort: 1, DictLabel: "禁用", DictValue: "2", diff --git a/cmd/migrate/migration/version/1613783303115_migrate.go b/cmd/migrate/migration/version/1613783303115_migrate.go index a49b635..af6bd33 100644 --- a/cmd/migrate/migration/version/1613783303115_migrate.go +++ b/cmd/migrate/migration/version/1613783303115_migrate.go @@ -1,13 +1,12 @@ package version import ( - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -20,36 +19,36 @@ func _1613783303115Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { //修改字段类型 - err := tx.Model(&system.SysDictType{}).Select("create_by").Not("create_by > 0").Update("create_by", "0").Error + err := tx.Model(&models.DictType{}).Select("create_by").Not("create_by > 0").Update("create_by", "0").Error if err != nil { return err } - err = tx.Model(&system.SysDictType{}).Select("update_by").Not("update_by > 0").Update("update_by", "0").Error + err = tx.Model(&models.DictType{}).Select("update_by").Not("update_by > 0").Update("update_by", "0").Error if err != nil { return err } - err = tx.Model(&system.SysDictData{}).Select("create_by").Not("create_by > 0").Update("create_by", "0").Error + err = tx.Model(&models.DictType{}).Select("create_by").Not("create_by > 0").Update("create_by", "0").Error if err != nil { return err } - err = tx.Model(&system.SysDictData{}).Select("update_by").Not("update_by > 0").Update("update_by", "0").Error + err = tx.Model(&models.DictType{}).Select("update_by").Not("update_by > 0").Update("update_by", "0").Error if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysDictType{}, "create_by") + err = tx.Migrator().AlterColumn(&models.DictType{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysDictType{}, "update_by") + err = tx.Migrator().AlterColumn(&models.DictType{}, "update_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysDictData{}, "create_by") + err = tx.Migrator().AlterColumn(&models.DictType{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysDictData{}, "update_by") + err = tx.Migrator().AlterColumn(&models.DictType{}, "update_by") if err != nil { return err } diff --git a/cmd/migrate/migration/version/1613978564961_migrate.go b/cmd/migrate/migration/version/1613978564961_migrate.go index 39d231c..9a02e4c 100644 --- a/cmd/migrate/migration/version/1613978564961_migrate.go +++ b/cmd/migrate/migration/version/1613978564961_migrate.go @@ -1,12 +1,12 @@ package version import ( - "go-admin/app/admin/models" - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -19,7 +19,7 @@ func _1613978564961Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { // TODO: 这里开始写入要变更的内容 - menu := models.Menu{MenuId: 110, Path: "/api/v1/config"} + menu := models.SysMenu{MenuId: 110, Path: "/api/v1/config"} err := tx.Model(&menu).Where("menu_id = ?", 110).Update("Path", "/api/v1/dict/data-all").Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1613998164781_migrate.go b/cmd/migrate/migration/version/1613998164781_migrate.go index 4e201cd..880a082 100644 --- a/cmd/migrate/migration/version/1613998164781_migrate.go +++ b/cmd/migrate/migration/version/1613998164781_migrate.go @@ -1,12 +1,12 @@ package version import ( - "go-admin/app/admin/models" - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -18,81 +18,81 @@ func init() { func _1613998164781Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - err := tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/deptList").Update("path", "/api/v1/dept").Error + err := tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/deptList").Update("path", "/api/v1/dept").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/roleList").Update("path", "/api/v1/role").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/roleList").Update("path", "/api/v1/role").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/menuList").Update("path", "/api/v1/menu").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/menuList").Update("path", "/api/v1/menu").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/postList").Update("path", "/api/v1/post").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/postList").Update("path", "/api/v1/post").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/dict/typelist").Update("path", "/api/v1/dict/type").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/dict/typelist").Update("path", "/api/v1/dict/type").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/dict/datalist").Update("path", "/api/v1/dict/data").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/dict/datalist").Update("path", "/api/v1/dict/data").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/data"). + err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/data"). Where("action = ?", "PUT").Update("path", "/api/v1/dict/data/:id").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/data/:id"). + err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/data/:id"). Where("action = ?", "DELETE").Update("path", "/api/v1/dict/data").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/type"). + err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/type"). Where("action = ?", "PUT").Update("path", "/api/v1/dict/type/:id").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/dict/type/:id"). + err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/dict/type/:id"). Where("action = ?", "DELETE").Update("path", "/api/v1/dict/type").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/operloglist").Update("path", "/api/v1/sys-opera-log").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/operloglist").Update("path", "/api/v1/sys-opera-log").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/loginloglist").Update("path", "/api/v1/sys-login-log").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/loginloglist").Update("path", "/api/v1/sys-login-log").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/loginlog/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error + err = tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/loginlog/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/operloglist%").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error + err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/operloglist%").Where("action = ?", "DELETE").Update("path", "/api/v1/sys-opera-log").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("path like ?", "/api/v1/role/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/role").Error + err = tx.Model(&models.SysMenu{}).Where("path like ?", "/api/v1/role/:id").Where("action = ?", "DELETE").Update("path", "/api/v1/role").Error if err != nil { return err } diff --git a/cmd/migrate/migration/version/1614073723691_migrate.go b/cmd/migrate/migration/version/1614073723691_migrate.go index 1601432..04a151e 100644 --- a/cmd/migrate/migration/version/1614073723691_migrate.go +++ b/cmd/migrate/migration/version/1614073723691_migrate.go @@ -1,12 +1,12 @@ package version import ( - "go-admin/app/admin/models" - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -20,7 +20,7 @@ func _1614073723691Test(db *gorm.DB, version string) error { // TODO: 这里开始写入要变更的内容 - err := tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/syscontentList").Update("path", "/api/v1/syscontent").Error + err := tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/syscontentList").Update("path", "/api/v1/syscontent").Error if err != nil { return err } diff --git a/cmd/migrate/migration/version/1614159531111_migrate.go b/cmd/migrate/migration/version/1614159531111_migrate.go index e9e191d..ad44723 100644 --- a/cmd/migrate/migration/version/1614159531111_migrate.go +++ b/cmd/migrate/migration/version/1614159531111_migrate.go @@ -1,10 +1,10 @@ package version import ( - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" common "go-admin/common/models" ) diff --git a/cmd/migrate/migration/version/1614604763713_migrate.go b/cmd/migrate/migration/version/1614604763713_migrate.go index 631851c..6123b67 100644 --- a/cmd/migrate/migration/version/1614604763713_migrate.go +++ b/cmd/migrate/migration/version/1614604763713_migrate.go @@ -1,14 +1,12 @@ package version import ( - "go-admin/app/admin/models" - "go-admin/app/admin/models/system" - - //"go-admin/app/admin/models" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" + "go-admin/cmd/migrate/migration/models" common "go-admin/common/models" ) @@ -20,28 +18,28 @@ func init() { func _1614604763713Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { - err := tx.Model(&models.Menu{}).Where("path = ?", "/api/v1/dict/typeoptionselect").Update("path", "/api/v1/dict/type-option-select").Error + err := tx.Model(&models.SysMenu{}).Where("path = ?", "/api/v1/dict/typeoptionselect").Update("path", "/api/v1/dict/type-option-select").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("action = ?", "GET"). + err = tx.Model(&models.SysMenu{}).Where("action = ?", "GET"). Where("path = ?", "/api/v1/sysUserList").Update("path", "/api/v1/sysUser").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("action = ?", "DELETE"). + err = tx.Model(&models.SysMenu{}).Where("action = ?", "DELETE"). Where("path = ?", "/api/v1/sysUser/:id").Update("path", "/api/v1/sysUser").Error if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysUser{}, "create_by") + err = tx.Migrator().AlterColumn(&models.SysUser{}, "create_by") if err != nil { return err } - err = tx.Migrator().AlterColumn(&system.SysUser{}, "update_by") + err = tx.Migrator().AlterColumn(&models.SysUser{}, "update_by") if err != nil { return err } @@ -54,13 +52,13 @@ func _1614604763713Test(db *gorm.DB, version string) error { if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("action = ?", "PUT"). + err = tx.Model(&models.SysMenu{}).Where("action = ?", "PUT"). Where("path = ?", "/api/v1/syscontent").Update("path", "/api/v1/syscontent/:id").Error if err != nil { return err } - err = tx.Model(&models.Menu{}).Where("action = ?", "DELETE"). + err = tx.Model(&models.SysMenu{}).Where("action = ?", "DELETE"). Where("path = ?", "/api/v1/syscontent/:id").Update("path", "/api/v1/syscontent").Error if err != nil { return err diff --git a/cmd/migrate/migration/version/1615447091566_migrate.go b/cmd/migrate/migration/version/1615447091566_migrate.go index a2cc5f7..b80b3f4 100644 --- a/cmd/migrate/migration/version/1615447091566_migrate.go +++ b/cmd/migrate/migration/version/1615447091566_migrate.go @@ -2,9 +2,10 @@ package version import ( "fmt" - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" common "go-admin/common/models" ) diff --git a/cmd/migrate/migration/version/1615948084336_migrate.go b/cmd/migrate/migration/version/1615948084336_migrate.go index 72741cc..f8544aa 100644 --- a/cmd/migrate/migration/version/1615948084336_migrate.go +++ b/cmd/migrate/migration/version/1615948084336_migrate.go @@ -1,10 +1,11 @@ package version import ( - "gorm.io/gorm" "runtime" "strings" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" common "go-admin/common/models" ) @@ -18,7 +19,7 @@ func _1615948084336Test(db *gorm.DB, version string) error { return db.Transaction(func(tx *gorm.DB) error { err := tx.Exec("alter table sys_config add is_frontend int default 1 null comment '是否前台参数' after config_type").Error - if err != nil && !strings.Contains(err.Error(),"Duplicate column name 'is_frontend'") { + if err != nil && !strings.Contains(err.Error(), "Duplicate column name 'is_frontend'") { return err } @@ -26,4 +27,4 @@ func _1615948084336Test(db *gorm.DB, version string) error { Version: version, }).Error }) -} \ No newline at end of file +} diff --git a/cmd/migrate/migration/version/1615950701614_migrate.go b/cmd/migrate/migration/version/1615950701614_migrate.go index 856fa2f..ebeab9c 100644 --- a/cmd/migrate/migration/version/1615950701614_migrate.go +++ b/cmd/migrate/migration/version/1615950701614_migrate.go @@ -1,9 +1,10 @@ package version import ( - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" common "go-admin/common/models" ) diff --git a/cmd/migrate/migration/version/1615961953379_migrate.go b/cmd/migrate/migration/version/1615961953379_migrate.go index 66a3750..c290a0b 100644 --- a/cmd/migrate/migration/version/1615961953379_migrate.go +++ b/cmd/migrate/migration/version/1615961953379_migrate.go @@ -1,9 +1,10 @@ package version import ( - "gorm.io/gorm" "runtime" + "gorm.io/gorm" + "go-admin/cmd/migrate/migration" common "go-admin/common/models" )