Skip to content

Commit 7488db8

Browse files
SliverHornSliverHorn
committed
add err := and delete postgresql initdb
1 parent 10d8d7f commit 7488db8

File tree

13 files changed

+17
-104
lines changed

13 files changed

+17
-104
lines changed

‎server/cmd/datas/apis.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func InitSysApi(db *gorm.DB) (err error) {
8484
color.Danger.Println("sys_apis表的初始数据已存在!")
8585
return nil
8686
}
87-
if tx.Create(&Apis).Error != nil { // 遇到错误时回滚事务
87+
if err := tx.Create(&Apis).Error; err != nil { // 遇到错误时回滚事务
8888
return err
8989
}
9090
return nil

‎server/cmd/datas/authorities.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func InitSysAuthority(db *gorm.DB) (err error) {
2020
color.Danger.Println("sys_authorities表的初始数据已存在!")
2121
return nil
2222
}
23-
if tx.Create(&Authorities).Error != nil { // 遇到错误时回滚事务
23+
if err := tx.Create(&Authorities).Error; err != nil { // 遇到错误时回滚事务
2424
return err
2525
}
2626
return nil

‎server/cmd/datas/authority_Ids.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func InitSysDataAuthorityId(db *gorm.DB) (err error) {
2424
color.Danger.Println("sys_data_authority_id表的初始数据已存在!")
2525
return nil
2626
}
27-
if tx.Create(&DataAuthorityId).Error != nil { // 遇到错误时回滚事务
27+
if err := tx.Create(&DataAuthorityId).Error; err != nil { // 遇到错误时回滚事务
2828
return err
2929
}
3030
return nil

‎server/cmd/datas/authority_menus.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func InitSysAuthorityMenus(db *gorm.DB) (err error) {
7272
color.Danger.Println("sys_authority_menus表的初始数据已存在!")
7373
return nil
7474
}
75-
if tx.Create(&AuthorityMenus).Error != nil { // 遇到错误时回滚事务
75+
if err := tx.Create(&AuthorityMenus).Error; err != nil { // 遇到错误时回滚事务
7676
return err
7777
}
7878
return nil

‎server/cmd/datas/casbins.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,11 @@ var Carbines = []gormadapter.CasbinRule{
153153

154154
func InitCasbinModel(db *gorm.DB) (err error) {
155155
return db.Transaction(func(tx *gorm.DB) error {
156-
if !tx.Migrator().HasTable("casbin_rule") {
157-
if err := tx.Migrator().CreateTable(&gormadapter.CasbinRule{}); err != nil {
158-
return err
159-
}
160-
}
161156
if tx.Where("p_type = ? AND v0 IN ?", "p", []string{"888", "8881", "9528"}).Find(&[]gormadapter.CasbinRule{}).RowsAffected == 142 {
162157
color.Danger.Println("casbin_rule表的初始数据已存在!")
163158
return nil
164159
}
165-
if tx.Create(&Carbines).Error != nil { // 遇到错误时回滚事务
160+
if err := tx.Create(&Carbines).Error; err != nil { // 遇到错误时回滚事务
166161
return err
167162
}
168163
return nil

‎server/cmd/datas/customers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func InitExaCustomer(db *gorm.DB) (err error) {
1919
color.Danger.Println("exa_customers表的初始数据已存在!")
2020
return nil
2121
}
22-
if tx.Create(&Customers).Error != nil { // 遇到错误时回滚事务
22+
if err := tx.Create(&Customers).Error; err != nil { // 遇到错误时回滚事务
2323
return err
2424
}
2525
return nil

‎server/cmd/datas/dictionaries.go‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ import (
99
"gorm.io/gorm"
1010
)
1111

12-
type SysDictionaryToPostgresql struct {
13-
global.GVA_MODEL
14-
Name string `json:"name" form:"name" gorm:"column:name;comment:字典名（中）"`
15-
Type string `json:"type" form:"type" gorm:"column:type;comment:字典名（英）"`
16-
Status *bool `json:"status" form:"status" gorm:"column:status;comment:状态"`
17-
Description string `json:"description" form:"description" gorm:"column:description;comment:'描述'"`
18-
SysDictionaryDetails []model.SysDictionaryDetail `json:"sysDictionaryDetails" form:"sysDictionaryDetails"`
19-
}
20-
2112
func InitSysDictionary(db *gorm.DB) (err error) {
2213
var status = new(bool)
2314
*status = true
@@ -34,32 +25,9 @@ func InitSysDictionary(db *gorm.DB) (err error) {
3425
color.Danger.Println("sys_dictionaries表的初始数据已存在!")
3526
return nil
3627
}
37-
if tx.Create(&Dictionaries).Error != nil { // 遇到错误时回滚事务
38-
return err
39-
}
40-
return nil
41-
})
42-
}
43-
44-
func InitSysDictionaryToPostgresql(db *gorm.DB) (err error) {
45-
status := new(bool)
46-
*status = true
47-
Dictionaries := []SysDictionaryToPostgresql{
48-
{GVA_MODEL: global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "性别", Type: "sex", Status: status, Description: "性别字典"},
49-
{GVA_MODEL: global.GVA_MODEL{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库int类型", Type: "int", Status: status, Description: "int类型对应的数据库类型"},
50-
{GVA_MODEL: global.GVA_MODEL{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库时间日期类型", Type: "time.Time", Status: status, Description: "数据库时间日期类型"},
51-
{GVA_MODEL: global.GVA_MODEL{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库浮点型", Type: "float64", Status: status, Description: "数据库浮点型"},
52-
{GVA_MODEL: global.GVA_MODEL{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库字符串", Type: "string", Status: status, Description: "数据库字符串"},
53-
{GVA_MODEL: global.GVA_MODEL{ID: 6, CreatedAt: time.Now(), UpdatedAt: time.Now()}, Name: "数据库bool类型", Type: "bool", Status: status, Description: "数据库bool类型"},
54-
}
55-
return db.Transaction(func(tx *gorm.DB) error {
56-
if tx.Where("id IN ?", []int{1, 6}).Find(&[]model.SysDictionary{}).RowsAffected == 2 {
57-
color.Danger.Println("sys_dictionaries表的初始数据已存在!")
58-
return nil
59-
}
60-
if tx.Create(&Dictionaries).Error != nil { // 遇到错误时回滚事务
28+
if err := tx.Create(&Dictionaries).Error; err != nil { // 遇到错误时回滚事务
6129
return err
6230
}
6331
return nil
6432
})
65-
}
33+
}

‎server/cmd/datas/dictionary_details.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func InitSysDictionaryDetail(db *gorm.DB) (err error) {
4242
color.Danger.Println("sys_dictionary_details表的初始数据已存在!")
4343
return nil
4444
}
45-
if tx.Create(&DictionaryDetail).Error != nil { // 遇到错误时回滚事务
45+
if err := tx.Create(&DictionaryDetail).Error; err != nil { // 遇到错误时回滚事务
4646
return err
4747
}
4848
return nil

‎server/cmd/datas/files.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func InitExaFileUploadAndDownload(db *gorm.DB) (err error) {
2020
color.Danger.Println("exa_file_upload_and_downloads表的初始数据已存在!")
2121
return nil
2222
}
23-
if tx.Create(&Files).Error != nil { // 遇到错误时回滚事务
23+
if err := tx.Create(&Files).Error; err != nil { // 遇到错误时回滚事务
2424
return err
2525
}
2626
return nil

‎server/cmd/datas/init.go‎

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -30,54 +30,6 @@ func InitMysqlData(db *gorm.DB) {
3030
}
3131

3232
func InitMysqlTables(db *gorm.DB) {
33-
var err error
34-
err = db.AutoMigrate(
35-
model.SysApi{},
36-
model.SysUser{},
37-
model.ExaFile{},
38-
model.ExaCustomer{},
39-
model.SysBaseMenu{},
40-
model.SysWorkflow{},
41-
model.SysAuthority{},
42-
model.JwtBlacklist{},
43-
model.ExaFileChunk{},
44-
model.SysDictionary{},
45-
model.ExaSimpleUploader{},
46-
model.SysOperationRecord{},
47-
model.SysWorkflowStepInfo{},
48-
model.SysDictionaryDetail{},
49-
model.SysBaseMenuParameter{},
50-
model.ExaFileUploadAndDownload{},
51-
)
52-
if err != nil {
53-
color.Warn.Printf("[Mysql]-->初始化数据表失败,err: %v\n", err)
54-
os.Exit(0)
55-
}
56-
color.Info.Println("[Mysql]-->初始化数据表成功")
57-
}
58-
59-
func InitPostgresqlData(db *gorm.DB) {
60-
var err error
61-
err = InitSysApi(db)
62-
err = InitSysUser(db)
63-
err = InitExaCustomer(db)
64-
err = InitCasbinModel(db)
65-
err = InitSysAuthority(db)
66-
err = InitSysBaseMenus(db)
67-
err = InitAuthorityMenu(db)
68-
err = InitSysAuthorityMenus(db)
69-
err = InitSysDataAuthorityId(db)
70-
err = InitSysDictionaryDetail(db)
71-
err = InitExaFileUploadAndDownload(db)
72-
err = InitSysDictionaryToPostgresql(db)
73-
if err != nil {
74-
color.Error.Printf("[Postgresql]-->初始化数据失败,err: %v\n", err)
75-
os.Exit(0)
76-
}
77-
color.Info.Println("[Postgresql]-->初始化数据成功")
78-
}
79-
80-
func InitPostgresqlTables(db *gorm.DB) {
8133
var err error
8234
if !db.Migrator().HasTable("casbin_rule") {
8335
err = db.Migrator().CreateTable(&gormadapter.CasbinRule{})
@@ -92,17 +44,17 @@ func InitPostgresqlTables(db *gorm.DB) {
9244
model.SysAuthority{},
9345
model.JwtBlacklist{},
9446
model.ExaFileChunk{},
47+
model.SysDictionary{},
9548
model.ExaSimpleUploader{},
9649
model.SysOperationRecord{},
9750
model.SysWorkflowStepInfo{},
9851
model.SysDictionaryDetail{},
9952
model.SysBaseMenuParameter{},
10053
model.ExaFileUploadAndDownload{},
101-
SysDictionaryToPostgresql{},
10254
)
10355
if err != nil {
104-
color.Error.Printf("[Postgresql]-->初始化数据表失败,err: %v\n", err)
56+
color.Warn.Printf("[Mysql]-->初始化数据表失败,err: %v\n", err)
10557
os.Exit(0)
10658
}
107-
color.Info.Println("[Postgresql]-->初始化数据表成功")
108-
}
59+
color.Info.Println("[Mysql]-->初始化数据表成功")
60+
}

0 commit comments

Comments
 (0)