Skip to content

Commit 3d2e9ef

Browse files
author
QM303176530
committed
Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into develop
2 parents 986406a + 28c7d17 commit 3d2e9ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+377
-297
lines changed

‎server/api/v1/exa_breakpoint_continue.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func BreakpointContinue(c *gin.Context) {
3838
defer f.Close()
3939
cen, _ := ioutil.ReadAll(f)
4040
if flag := utils.CheckMd5(cen, chunkMd5); !flag {
41+
response.FailWithMessage(err.Error(), c)
4142
return
4243
}
4344
err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)

‎server/api/v1/exa_customer.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func DeleteExaCustomer(c *gin.Context) {
5757
CustomerVerify := utils.Rules{
5858
"ID": {utils.NotEmpty()},
5959
}
60-
CustomerVerifyErr := utils.Verify(cu.Model, CustomerVerify)
60+
CustomerVerifyErr := utils.Verify(cu.GVA_MODEL, CustomerVerify)
6161
if CustomerVerifyErr != nil {
6262
response.FailWithMessage(CustomerVerifyErr.Error(), c)
6363
return
@@ -84,7 +84,7 @@ func UpdateExaCustomer(c *gin.Context) {
8484
IdCustomerVerify := utils.Rules{
8585
"ID": {utils.NotEmpty()},
8686
}
87-
IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
87+
IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify)
8888
if IdCustomerVerifyErr != nil {
8989
response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
9090
return
@@ -120,7 +120,7 @@ func GetExaCustomer(c *gin.Context) {
120120
IdCustomerVerify := utils.Rules{
121121
"ID": {utils.NotEmpty()},
122122
}
123-
IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
123+
IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify)
124124
if IdCustomerVerifyErr != nil {
125125
response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
126126
return

‎server/api/v1/sys_api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func DeleteApi(c *gin.Context) {
5555
ApiVerify := utils.Rules{
5656
"ID": {utils.NotEmpty()},
5757
}
58-
ApiVerifyErr := utils.Verify(a.Model, ApiVerify)
58+
ApiVerifyErr := utils.Verify(a.GVA_MODEL, ApiVerify)
5959
if ApiVerifyErr != nil {
6060
response.FailWithMessage(ApiVerifyErr.Error(), c)
6161
return

‎server/cmd/datas/AuthorityMenu.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
package datas
22

3-
import "gorm.io/gorm"
3+
import (
4+
"github.com/gookit/color"
5+
"gorm.io/gorm"
6+
)
47

58
func InitAuthorityMenu(db *gorm.DB) (err error) {
6-
return db.Exec("CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `authority_menu` AS select `sys_base_menus`.`id` AS `id`,`sys_base_menus`.`created_at` AS `created_at`, `sys_base_menus`.`updated_at` AS `updated_at`, `sys_base_menus`.`deleted_at` AS `deleted_at`, `sys_base_menus`.`menu_level` AS `menu_level`,`sys_base_menus`.`parent_id` AS `parent_id`,`sys_base_menus`.`path` AS `path`,`sys_base_menus`.`name` AS `name`,`sys_base_menus`.`hidden` AS `hidden`,`sys_base_menus`.`component` AS `component`, `sys_base_menus`.`title` AS `title`,`sys_base_menus`.`icon` AS `icon`,`sys_base_menus`.`sort` AS `sort`,`sys_authority_menus`.`sys_authority_authority_id` AS `authority_id`,`sys_authority_menus`.`sys_base_menu_id` AS `menu_id`,`sys_base_menus`.`keep_alive` AS `keep_alive`,`sys_base_menus`.`default_menu` AS `default_menu` from (`sys_authority_menus` join `sys_base_menus` on ((`sys_authority_menus`.`sys_base_menu_id` = `sys_base_menus`.`id`)))").Error
9+
if err := db.Exec("CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `authority_menu` AS select `sys_base_menus`.`id` AS `id`,`sys_base_menus`.`created_at` AS `created_at`, `sys_base_menus`.`updated_at` AS `updated_at`, `sys_base_menus`.`deleted_at` AS `deleted_at`, `sys_base_menus`.`menu_level` AS `menu_level`,`sys_base_menus`.`parent_id` AS `parent_id`,`sys_base_menus`.`path` AS `path`,`sys_base_menus`.`name` AS `name`,`sys_base_menus`.`hidden` AS `hidden`,`sys_base_menus`.`component` AS `component`, `sys_base_menus`.`title` AS `title`,`sys_base_menus`.`icon` AS `icon`,`sys_base_menus`.`sort` AS `sort`,`sys_authority_menus`.`sys_authority_authority_id` AS `authority_id`,`sys_authority_menus`.`sys_base_menu_id` AS `menu_id`,`sys_base_menus`.`keep_alive` AS `keep_alive`,`sys_base_menus`.`default_menu` AS `default_menu` from (`sys_authority_menus` join `sys_base_menus` on ((`sys_authority_menus`.`sys_base_menu_id` = `sys_base_menus`.`id`)))").Error; err != nil {
10+
color.Danger.Println("authority_menu视图已存在!")
11+
}
12+
return nil
713
}

‎server/cmd/datas/apis.go‎

Lines changed: 73 additions & 67 deletions
Large diffs are not rendered by default.

‎server/cmd/datas/authorities.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package datas
22

33
import (
4+
"github.com/gookit/color"
45
"time"
56

67
"gin-vue-admin/model"
@@ -15,7 +16,11 @@ var Authorities = []model.SysAuthority{
1516

1617
func InitSysAuthority(db *gorm.DB) (err error) {
1718
return db.Transaction(func(tx *gorm.DB) error {
18-
if tx.Create(&Authorities).Error != nil { // 遇到错误时回滚事务
19+
if tx.Where("authority_id IN ? ", []string{"888", "9528"}).Find(&[]model.SysAuthority{}).RowsAffected == 2 {
20+
color.Danger.Println("sys_authorities表的初始数据已存在!")
21+
return nil
22+
}
23+
if err := tx.Create(&Authorities).Error; err != nil { // 遇到错误时回滚事务
1924
return err
2025
}
2126
return nil

‎server/cmd/datas/authority_Ids.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package datas
22

33
import (
4+
"github.com/gookit/color"
45
"gorm.io/gorm"
56
)
67

@@ -19,7 +20,11 @@ var DataAuthorityId = []SysDataAuthorityId{
1920

2021
func InitSysDataAuthorityId(db *gorm.DB) (err error) {
2122
return db.Table("sys_data_authority_id").Transaction(func(tx *gorm.DB) error {
22-
if tx.Create(&DataAuthorityId).Error != nil { // 遇到错误时回滚事务
23+
if tx.Where("sys_authority_authority_id IN ?", []string{"888", "9528"}).Find(&[]SysDataAuthorityId{}).RowsAffected == 5 {
24+
color.Danger.Println("sys_data_authority_id表的初始数据已存在!")
25+
return nil
26+
}
27+
if err := tx.Create(&DataAuthorityId).Error; err != nil { // 遇到错误时回滚事务
2328
return err
2429
}
2530
return nil

‎server/cmd/datas/authority_menus.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package datas
22

33
import (
4+
"github.com/gookit/color"
45
"gorm.io/gorm"
56
)
67

@@ -67,7 +68,11 @@ var AuthorityMenus = []SysAuthorityMenus{
6768

6869
func InitSysAuthorityMenus(db *gorm.DB) (err error) {
6970
return db.Table("sys_authority_menus").Transaction(func(tx *gorm.DB) error {
70-
if tx.Create(&AuthorityMenus).Error != nil { // 遇到错误时回滚事务
71+
if tx.Where("sys_authority_authority_id IN ?", []string{"888", "8881", "9528"}).Find(&[]SysAuthorityMenus{}).RowsAffected == 53 {
72+
color.Danger.Println("sys_authority_menus表的初始数据已存在!")
73+
return nil
74+
}
75+
if err := tx.Create(&AuthorityMenus).Error; err != nil { // 遇到错误时回滚事务
7176
return err
7277
}
7378
return nil

‎server/cmd/datas/casbins.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package datas
22

33
import (
44
gormadapter "github.com/casbin/gorm-adapter/v3"
5+
"github.com/gookit/color"
56
"gorm.io/gorm"
67
)
78

@@ -152,12 +153,11 @@ var Carbines = []gormadapter.CasbinRule{
152153

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

‎server/cmd/datas/customers.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
package datas
22

33
import (
4+
"gin-vue-admin/global"
5+
"github.com/gookit/color"
46
"time"
57

68
"gin-vue-admin/model"
79
"gorm.io/gorm"
810
)
911

1012
var Customers = []model.ExaCustomer{
11-
{Model: gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, CustomerName: "测试客户", CustomerPhoneData: "1761111111", SysUserID: 1, SysUserAuthorityID: "888"},
13+
{GVA_MODEL: global.GVA_MODEL{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, CustomerName: "测试客户", CustomerPhoneData: "1761111111", SysUserID: 1, SysUserAuthorityID: "888"},
1214
}
1315

1416
func InitExaCustomer(db *gorm.DB) (err error) {
1517
return db.Transaction(func(tx *gorm.DB) error {
16-
if tx.Create(&Customers).Error != nil { // 遇到错误时回滚事务
18+
if tx.Where("id IN ? ", []int{1}).Find(&[]model.ExaCustomer{}).RowsAffected == 1 {
19+
color.Danger.Println("exa_customers表的初始数据已存在!")
20+
return nil
21+
}
22+
if err := tx.Create(&Customers).Error; err != nil { // 遇到错误时回滚事务
1723
return err
1824
}
1925
return nil

0 commit comments

Comments
 (0)