bsm-infra/full
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor all service dependency injection

Browse Source
This commit is contained in:
yanweidong
2026-08-10 11:35:48 +08:00
parent 007a7ba38a
commit c883cc52a2
152 changed files with 1030 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/base/mgt/internal/logic/permission/create.go
View File

@@ -3,9 +3,11 @@ package permission
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -41,15 +43,15 @@ func Create(c *gin.Context) {
return
}
db := models.DBService.Model(&models.MgtPermission{})
db := impl.DBService.Model(&models.MgtPermission{})
if err = db.Where("code = ? AND app_id = ?", request.Code, appId).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
return
}
var deletedData models.MgtPermission
if err = models.DBService.Unscoped().Where("code = ? AND app_id = ?", request.Code, appId).First(&deletedData).Error; err == nil {
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
if err = impl.DBService.Unscoped().Where("code = ? AND app_id = ?", request.Code, appId).First(&deletedData).Error; err == nil {
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -77,7 +79,7 @@ func Create(c *gin.Context) {
HideMenu: request.HideMenu,
WebUrl: request.WebUrl,
}
if err = models.DBService.Model(&models.MgtPermission{}).Create(&dataModel).Error; err != nil {
if err = impl.DBService.Model(&models.MgtPermission{}).Create(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

4
module/base/mgt/internal/logic/permission/del.go
View File

@@ -1,9 +1,11 @@
package permission
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -34,7 +36,7 @@ func Del(c *gin.Context) {
}
// 删除权限时，同时删除关联数据
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
// 删除权限
if err = tx.Delete(&models.MgtPermission{}, request.ID).Error; err != nil {
printer.Error("删除权限异常: %v", err)

4
module/base/mgt/internal/logic/permission/detail.go
View File

@@ -3,9 +3,11 @@ package permission
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -38,7 +40,7 @@ func Detail(c *gin.Context) {
return
}
if err = models.DBService.Model(&models.MgtPermission{}).Where("id = ?", request.ID).First(&data).Error; err != nil {
if err = impl.DBService.Model(&models.MgtPermission{}).Where("id = ?", request.ID).First(&data).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return

4
module/base/mgt/internal/logic/permission/fetch.go
View File

@@ -1,10 +1,12 @@
package permission
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/logic/tool"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -16,7 +18,7 @@ func Fetch(c *gin.Context) {
request = types.PermissionRequest{}
count int64 = 0
data = make([]types.PermissionRsp, 0)
db = models.DBService.Model(&models.MgtPermission{})
db = impl.DBService.Model(&models.MgtPermission{})
)
// 解析JSON请求

6
module/base/mgt/internal/logic/permission/fetch_other.go
View File

@@ -1,10 +1,12 @@
package permission
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/logic/tool"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -17,7 +19,7 @@ func UserFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtPermission, 0)
db = models.DBService.Model(&models.MgtPermission{}).Select("id", "identity", "title")
db = impl.DBService.Model(&models.MgtPermission{}).Select("id", "identity", "title")
count int64 = 0
)
err := c.ShouldBindJSON(&request)
@@ -58,7 +60,7 @@ func RoleFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtPermission, 0)
db = models.DBService.Model(&models.MgtPermission{}).Select("id", "identity", "title")
db = impl.DBService.Model(&models.MgtPermission{}).Select("id", "identity", "title")
count int64 = 0
)
err := c.ShouldBindJSON(&request)

12
module/base/mgt/internal/logic/permission/modify.go
View File

@@ -3,9 +3,11 @@ package permission
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -49,7 +51,7 @@ func Midify(c *gin.Context) {
if request.Code != "" {
data = models.MgtPermission{}
if err := models.DBService.Model(&models.MgtPermission{}).Where("code = ? AND app_id = ? AND id <> ?", request.Code, appId, request.ID).First(&data).Error; err != nil {
if err := impl.DBService.Model(&models.MgtPermission{}).Where("code = ? AND app_id = ? AND id <> ?", request.Code, appId, request.ID).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
return
@@ -81,7 +83,7 @@ func Midify(c *gin.Context) {
}
updateFields := []string{"status", "code", "title", "app_id", "parent_id", "menu_path", "menu_icon", "type", "component", "description", "is_web_page", "is_new_tab", "is_full", "hide_menu", "web_url"}
if err := models.DBService.Model(&models.MgtPermission{}).Where("id = ?", request.ID).Select(updateFields).Updates(&dataModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtPermission{}).Where("id = ?", request.ID).Select(updateFields).Updates(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -92,7 +94,7 @@ func Midify(c *gin.Context) {
}
var existing models.MgtPermission
if err := models.DBService.Select("app_id").Where("id = ?", request.ID).First(&existing).Error; err != nil {
if err := impl.DBService.Select("app_id").Where("id = ?", request.ID).First(&existing).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -103,7 +105,7 @@ func Midify(c *gin.Context) {
if request.Code != "" {
data = models.MgtPermission{}
if err := models.DBService.Model(&models.MgtPermission{}).
if err := impl.DBService.Model(&models.MgtPermission{}).
Where("code = ? AND app_id = ? AND id <> ?", request.Code, existing.Appid, request.ID).
First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -136,7 +138,7 @@ func Midify(c *gin.Context) {
}
updateFields := []string{"status", "code", "title", "parent_id", "menu_path", "menu_icon", "type", "component", "description", "is_web_page", "is_new_tab", "is_full", "hide_menu", "web_url"}
if err := models.DBService.Model(&models.MgtPermission{}).Where("id = ?", request.ID).Select(updateFields).Updates(&dataModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtPermission{}).Where("id = ?", request.ID).Select(updateFields).Updates(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

4
module/base/mgt/internal/logic/permission/sort.go
View File

@@ -1,9 +1,11 @@
package permission
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -42,7 +44,7 @@ func Sort(c *gin.Context) {
SortKey: int8(v.SortKey),
})
}
if err := models.DBService.Clauses(clause.OnConflict{
if err := impl.DBService.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "id"}},
DoUpdates: clause.AssignmentColumns([]string{"sort_key"}),
}).Create(&data).Error; err != nil {