add db invalid check

snowlyg · Mar 30, 2023 · b222b60 · b222b60
1 parent 38bd0c8
commit b222b60
Show file tree

Hide file tree

Showing 19 changed files with 233 additions and 16 deletions.
diff --git a/gin/admin/logic.go b/gin/admin/logic.go
@@ -67,6 +67,9 @@ func FindByUserName(scopes ...func(db *gorm.DB) *gorm.DB) (*Response, error) {
 }
 
 func FindPasswordByUserName(db *gorm.DB, username string, scopes ...func(db *gorm.DB) *gorm.DB) (*LoginResponse, error) {
+	if db == nil {
+		return nil, gorm.ErrInvalidDB
+	}
 	admin := &LoginResponse{}
 	db = db.Model(&Admin{}).Select("id,password").Where("username = ?", username)
 
@@ -169,6 +172,9 @@ func AddRoleForUser(admin *Admin) error {
 }
 
 func UpdateAvatar(db *gorm.DB, id uint, avatar string) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(&Admin{}).Where("id = ?", id).Update("header_img", avatar).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())

diff --git a/gin/admin/model.go b/gin/admin/model.go
@@ -28,6 +28,9 @@ type Avatar struct {
 
 // Create 添加
 func (item *Admin) Create(db *gorm.DB) (uint, error) {
+	if db == nil {
+		return 0, gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Create(item).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -53,6 +56,9 @@ func (item *Admin) mc() map[string]interface{} {
 
 // Update 更新
 func (item *Admin) Update(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Scopes(scopes...).Updates(item.mc()).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -63,6 +69,9 @@ func (item *Admin) Update(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) err
 
 // Delete 删除
 func (item *Admin) Delete(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Unscoped().Scopes(scopes...).Delete(item).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())

diff --git a/gin/admin/response.go b/gin/admin/response.go
@@ -38,6 +38,9 @@ type LoginResponse struct {
 }
 
 func (res *Response) First(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(&Admin{}).Scopes(scopes...).First(res).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -54,6 +57,9 @@ type PageResponse struct {
 }
 
 func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) (int64, error) {
+	if db == nil {
+		return 0, gorm.ErrInvalidDB
+	}
 	db = db.Model(&Admin{})
 	var count int64
 	if len(scopes) > 0 {
@@ -76,6 +82,9 @@ func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm
 }
 
 func (res *PageResponse) Find(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	db = db.Model(&Admin{})
 	err := db.Scopes(scopes...).Find(&res.Item).Error
 	if err != nil {

diff --git a/gin/api/logic.go b/gin/api/logic.go
@@ -11,6 +11,9 @@ import (
 
 // CreatenInBatches 批量加入
 func CreatenInBatches(db *gorm.DB, apis ApiCollection) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(&Api{}).CreateInBatches(&apis, 500).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())

diff --git a/gin/api/model.go b/gin/api/model.go
@@ -38,6 +38,9 @@ func (item *Api) mc() map[string]interface{} {
 
 // Create 添加
 func (item *Api) Create(db *gorm.DB) (uint, error) {
+	if db == nil {
+		return 0, gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Create(item).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -48,6 +51,9 @@ func (item *Api) Create(db *gorm.DB) (uint, error) {
 
 // Update 更新
 func (item *Api) Update(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Scopes(scopes...).Updates(item.mc()).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -58,6 +64,9 @@ func (item *Api) Update(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error
 
 // Delete 删除
 func (item *Api) Delete(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Unscoped().Scopes(scopes...).Delete(item).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())

diff --git a/gin/api/response.go b/gin/api/response.go
@@ -15,6 +15,9 @@ type Response struct {
 }
 
 func (res *Response) First(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(&Api{}).Scopes(scopes...).First(res).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -29,6 +32,9 @@ type PageResponse struct {
 }
 
 func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) (int64, error) {
+	if db == nil {
+		return 0, gorm.ErrInvalidDB
+	}
 	db = db.Model(&Api{})
 	var count int64
 	if len(scopes) > 0 {
@@ -49,6 +55,9 @@ func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm
 }
 
 func (res *PageResponse) Find(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	db = db.Model(&Api{})
 	err := db.Scopes(scopes...).Find(&res.Item).Error
 	if err != nil {

diff --git a/gin/authority/model.go b/gin/authority/model.go
@@ -34,6 +34,9 @@ func (item *Authority) mc() map[string]interface{} {
 
 // Create 添加
 func (item *Authority) Create(db *gorm.DB) (uint, error) {
+	if db == nil {
+		return 0, gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Create(item).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -44,6 +47,9 @@ func (item *Authority) Create(db *gorm.DB) (uint, error) {
 
 // Update 更新
 func (item *Authority) Update(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Scopes(scopes...).Updates(item.mc()).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -54,6 +60,9 @@ func (item *Authority) Update(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB)
 
 // Delete 删除
 func (item *Authority) Delete(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(item).Unscoped().Scopes(scopes...).Delete(item).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())

diff --git a/gin/authority/response.go b/gin/authority/response.go
@@ -17,6 +17,9 @@ type Response struct {
 }
 
 func (res *Response) First(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(&Authority{}).Scopes(scopes...).First(res).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -32,6 +35,9 @@ type PageResponse struct {
 }
 
 func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) (int64, error) {
+	if db == nil {
+		return 0, gorm.ErrInvalidDB
+	}
 	db = db.Model(&Authority{})
 	var count int64
 	if len(scopes) > 0 {
@@ -61,6 +67,9 @@ func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm
 }
 
 func (res *PageResponse) Find(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	db = db.Model(&Authority{})
 	err := db.Scopes(scopes...).Find(&res.Item).Error
 	if err != nil {
@@ -83,7 +92,11 @@ func (res *PageResponse) Find(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB)
 
 // findChildrenAuthority
 func findChildrenAuthority(item *Response) error {
-	err := database.Instance().Where("parent_id = ?", item.Id).Find(&item.Children).Error
+	db := database.Instance()
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
+	err := db.Where("parent_id = ?", item.Id).Find(&item.Children).Error
 	if len(item.Children) > 0 {
 		for k := range item.Children {
 			err = findChildrenAuthority(&item.Children[k])
@@ -95,7 +108,11 @@ func findChildrenAuthority(item *Response) error {
 // getPermsForRoleMap
 func getPermsForRoleMap(uuid string) []map[string]string {
 	apisForRoles := []map[string]string{}
-	perms := casbin.Instance().GetPermissionsForUser(uuid)
+	ca := casbin.Instance()
+	if ca == nil {
+		return nil
+	}
+	perms := ca.GetPermissionsForUser(uuid)
 	for _, perm := range perms {
 		if len(perm) < 3 {
 			continue

diff --git a/gin/oplog/response.go b/gin/oplog/response.go
@@ -11,6 +11,9 @@ type Response struct {
 }
 
 func (res *Response) First(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	err := db.Model(&operation.Oplog{}).Scopes(scopes...).First(res).Error
 	if err != nil {
 		zap_server.ZAPLOG.Error(err.Error())
@@ -25,6 +28,9 @@ type PageResponse struct {
 }
 
 func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) (int64, error) {
+	if db == nil {
+		return 0, gorm.ErrInvalidDB
+	}
 	db = db.Model(&operation.Oplog{})
 	var count int64
 	err := db.Scopes(scopes...).Count(&count).Error
@@ -42,6 +48,9 @@ func (res *PageResponse) Paginate(db *gorm.DB, pageScope func(db *gorm.DB) *gorm
 }
 
 func (res *PageResponse) Find(db *gorm.DB, scopes ...func(db *gorm.DB) *gorm.DB) error {
+	if db == nil {
+		return gorm.ErrInvalidDB
+	}
 	db = db.Model(&operation.Oplog{})
 	err := db.Scopes(scopes...).Find(&res.Item).Error
 	if err != nil {