estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gormv2升级 第一阶段

Browse Source
This commit is contained in:
QM303176530
2020-08-23 15:13:23 +08:00
parent f130aec168
commit 363ff3ba70
40 changed files with 133 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/model/exa_breakpoint_continue.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
// file struct, 文件结构体

2
server/model/exa_customer.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
type ExaCustomer struct {

2
server/model/exa_file_upload_download.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
type ExaFileUploadAndDownload struct {

2
server/model/response/common.go
View File

@@ -2,7 +2,7 @@ package response
type PageResult struct {
List interface{} `json:"list"`
Total int `json:"total"`
Total int64 `json:"total"`
Page int `json:"page"`
PageSize int `json:"pageSize"`
}

2
server/model/sys_api.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
type SysApi struct {

4
server/model/sys_authority.go
View File

@@ -11,7 +11,7 @@ type SysAuthority struct {
AuthorityId string `json:"authorityId" gorm:"not null;unique;primary_key" gorm:"comment:'角色ID'"`
AuthorityName string `json:"authorityName" gorm:"comment:'角色名'"`
ParentId string `json:"parentId" gorm:"comment:'父角色ID'"`
DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id;association_jointable_foreignkey:data_authority_id"`
Children []SysAuthority `json:"children"`
DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id"`
Children []SysAuthority `json:"children" gorm:"-"`
SysBaseMenus []SysBaseMenu `json:"menus" gorm:"many2many:sys_authority_menus;"`
}

4
server/model/sys_authority_menu.go
View File

@@ -4,8 +4,8 @@ type SysMenu struct {
SysBaseMenu
MenuId string `json:"menuId" gorm:"comment:'菜单ID'"`
AuthorityId string `json:"-" gorm:"comment:'角色ID'"`
Children []SysMenu `json:"children"`
Parameters []SysBaseMenuParameter `json:"parameters" gorm:"ForeignKey:MenuId"`
Children []SysMenu `json:"children" gorm:"-"`
Parameters []SysBaseMenuParameter `json:"parameters" gorm:"foreignKey:SysBaseMenuID;references:MenuId"`
}
func (s SysMenu) TableName() string {

6
server/model/sys_base_menu.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
type SysBaseMenu struct {
@@ -15,7 +15,7 @@ type SysBaseMenu struct {
Sort int `json:"sort" gorm:"comment:'排序标记'"`
Meta `json:"meta" gorm:"comment:'附加属性'"`
SysAuthoritys []SysAuthority `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
Children []SysBaseMenu `json:"children"`
Children []SysBaseMenu `json:"children" gorm:"-"`
Parameters []SysBaseMenuParameter `json:"parameters"`
}
@@ -28,7 +28,7 @@ type Meta struct {
type SysBaseMenuParameter struct {
gorm.Model
SysBaseMenuId uint
SysBaseMenuID uint
Type string `json:"type" gorm:"commit:'地址栏携带参数为params还是query'"`
Key string `json:"key" gorm:"commit:'地址栏携带参数的key'"`
Value string `json:"value" gorm:"commit:'地址栏携带参数的值'"`

2
server/model/sys_dictionary.go
View File

@@ -2,7 +2,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
// 如果含有time.Time 请自行import time包

16
server/model/sys_dictionary_detail.go
View File

@@ -2,15 +2,15 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
// 如果含有time.Time 请自行import time包
type SysDictionaryDetail struct {
gorm.Model
Label string `json:"label" form:"label" gorm:"column:label;comment:'展示值'"`
Value int `json:"value" form:"value" gorm:"column:value;comment:'字典值'"`
Status *bool `json:"status" form:"status" gorm:"column:status;comment:'启用状态'"`
Sort int `json:"sort" form:"sort" gorm:"column:sort;comment:'排序标记'"`
SysDictionaryID int `json:"sysDictionaryID" form:"sysDictionaryID" gorm:"column:sys_dictionary_id;comment:'关联标记'"`
}
gorm.Model
Label string `json:"label" form:"label" gorm:"column:label;comment:'展示值'"`
Value int `json:"value" form:"value" gorm:"column:value;comment:'字典值'"`
Status *bool `json:"status" form:"status" gorm:"column:status;comment:'启用状态'"`
Sort int `json:"sort" form:"sort" gorm:"column:sort;comment:'排序标记'"`
SysDictionaryID int `json:"sysDictionaryID" form:"sysDictionaryID" gorm:"column:sys_dictionary_id;comment:'关联标记'"`
}

2
server/model/sys_jwt_blacklist.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
type JwtBlacklist struct {

2
server/model/sys_operation_record.go
View File

@@ -2,7 +2,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
"time"
)

4
server/model/sys_user.go
View File

@@ -1,8 +1,8 @@
package model
import (
"github.com/jinzhu/gorm"
"github.com/satori/go.uuid"
"gorm.io/gorm"
)
type SysUser struct {
@@ -12,6 +12,6 @@ type SysUser struct {
Password string `json:"-" gorm:"comment:'用户登录密码'"`
NickName string `json:"nickName" gorm:"default:'系统用户';comment:'用户昵称'" `
HeaderImg string `json:"headerImg" gorm:"default:'http://qmplusimg.henrongyi.top/head.png';comment:'用户头像'"`
Authority SysAuthority `json:"authority" gorm:"ForeignKey:AuthorityId;AssociationForeignKey:AuthorityId;comment:'用户角色'"`
Authority SysAuthority `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:'用户角色'"`
AuthorityId string `json:"authorityId" gorm:"default:888;comment:'用户角色ID'"`
}

2
server/model/sys_workflow.go
View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/jinzhu/gorm"
"gorm.io/gorm"
)
// 工作流属性表

2
server/model/sys_workflow_process.go
View File

@@ -1,6 +1,6 @@
package model
import "github.com/jinzhu/gorm"
import "gorm.io/gorm"
// 工作流流转表
type SysWorkFlowProcess struct {