From c7f5ea3a8e560f6ddc268a8441a6f835ba976291 Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Sat, 29 Aug 2020 15:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0mysql=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2id=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/initialize/mysql.go    | 5 +++--
 server/model/sys_authority.go | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/initialize/mysql.go b/server/initialize/mysql.go
index 7f5450c3..517904b1 100644
--- a/server/initialize/mysql.go
+++ b/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,
 		}
 	}
 
diff --git a/server/model/sys_authority.go b/server/model/sys_authority.go
index db351d48..0cb58024 100644
--- a/server/model/sys_authority.go
+++ b/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"},
 	}
-}
\ No newline at end of file
+}
-- 
GitLab