Browse Source

增加mysql过滤,修改角色id长度

QM303176530 4 years ago
parent
commit
c7f5ea3a8e
2 changed files with 5 additions and 4 deletions
  1. 3 2
      server/initialize/mysql.go
  2. 2 2
      server/model/sys_authority.go

+ 3 - 2
server/initialize/mysql.go

@@ -22,12 +22,13 @@ func Mysql() {
 	var gormConfig *gorm.Config
 	if admin.LogMode { //根据配置决定是否开启日志
 		gormConfig = &gorm.Config{
-			Logger: logger.Default.LogMode(logger.Info),
+			Logger:                                   logger.Default.LogMode(logger.Info),
 			DisableForeignKeyConstraintWhenMigrating: true,
 		}
 	} else {
 		gormConfig = &gorm.Config{
-			Logger: logger.Default.LogMode(logger.Silent),
+			Logger:                                   logger.Default.LogMode(logger.Silent),
+			DisableForeignKeyConstraintWhenMigrating: true,
 		}
 	}
 

+ 2 - 2
server/model/sys_authority.go

@@ -8,7 +8,7 @@ type SysAuthority struct {
 	CreatedAt       time.Time
 	UpdatedAt       time.Time
 	DeletedAt       *time.Time     `sql:"index"`
-	AuthorityId     string         `json:"authorityId" gorm:"not null;unique;primary_key" gorm:"comment:'角色ID'"`
+	AuthorityId     string         `json:"authorityId" gorm:"not null;unique;primary_key;comment:角色ID;type:varchar(100)"`
 	AuthorityName   string         `json:"authorityName" gorm:"comment:'角色名'"`
 	ParentId        string         `json:"parentId" gorm:"comment:'父角色ID'"`
 	DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id"`
@@ -22,4 +22,4 @@ func SysAuthorityData() []SysAuthority {
 		{CreatedAt: time.Now(), UpdatedAt: time.Now(), AuthorityId: "8881", AuthorityName: "普通用户子角色", ParentId: "888"},
 		{CreatedAt: time.Now(), UpdatedAt: time.Now(), AuthorityId: "9528", AuthorityName: "测试角色", ParentId: "0"},
 	}
-}
+}