refactor all service dependency injection
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"bsm/full/module/base/mgt/internal/impl"
|
||||
"bsm/full/module/base/mgt/internal/libs"
|
||||
mgtmw "bsm/full/module/base/mgt/internal/middleware"
|
||||
"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/middleware"
|
||||
@@ -60,7 +62,7 @@ func PermissionsFetch(c *gin.Context) {
|
||||
var (
|
||||
request = types.FetchBase{}
|
||||
data = make([]models.MgtUser, 0)
|
||||
db = models.DBService.Model(&models.MgtUser{})
|
||||
db = impl.DBService.Model(&models.MgtUser{})
|
||||
)
|
||||
if err := c.ShouldBindJSON(&request); err != nil {
|
||||
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
|
||||
@@ -135,7 +137,7 @@ func PermissionsFetchTree(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
db := models.DBService.Model(&models.MgtUser{}).Where("id = ?", request.ID).
|
||||
db := impl.DBService.Model(&models.MgtUser{}).Where("id = ?", request.ID).
|
||||
Select("id", "identity", "name").
|
||||
Preload("Permissions", func(db *gorm.DB) *gorm.DB {
|
||||
return db.Select(permissionPreloadSelect).Order("sort_key asc")
|
||||
@@ -174,7 +176,7 @@ func PermissionsFetchTree(c *gin.Context) {
|
||||
pmnIdsByApp[p.Appid] = append(pmnIdsByApp[p.Appid], p.ID)
|
||||
}
|
||||
|
||||
appDb := models.DBService.Model(&models.MgtUser{}).Where("id = ?", request.ID).
|
||||
appDb := impl.DBService.Model(&models.MgtUser{}).Where("id = ?", request.ID).
|
||||
Select("id", "identity", "name")
|
||||
appDb = appDb.Preload("Application", func(db *gorm.DB) *gorm.DB {
|
||||
db = db.Select("id", "identity", "title", "workspace")
|
||||
@@ -205,7 +207,7 @@ func PermissionsFetchTree(c *gin.Context) {
|
||||
continue
|
||||
}
|
||||
var tree []models.MgtPermission
|
||||
err := models.DBService.Model(&models.MgtPermission{}).
|
||||
err := impl.DBService.Model(&models.MgtPermission{}).
|
||||
Select(treeSelect).
|
||||
Where("app_id = ? AND parent_id = 0 AND id IN ?", apps[i].ID, ids).
|
||||
Order("sort_key asc").
|
||||
|
||||
Reference in New Issue
Block a user