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

16
module/base/mgt/internal/logic/user/create.go
View File

@@ -3,9 +3,11 @@ package user
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/middleware"
@@ -46,23 +48,23 @@ func Create(c *gin.Context) {
return
}
db := models.DBService.Model(&models.MgtUser{})
db := impl.DBService.Model(&models.MgtUser{})
if err = db.Where("phone = ? or account = ?", request.Phone, request.Account).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
return
}
var deletedData models.MgtUser
if err = models.DBService.Unscoped().Where("phone = ?", request.Phone).First(&deletedData).Error; err == nil {
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
if err = impl.DBService.Unscoped().Where("phone = ?", request.Phone).First(&deletedData).Error; err == nil {
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
printer.Info("user deleted: id=%d, phone=%s", deletedData.ID, deletedData.Phone)
}
if request.Phone != request.Account {
if err = models.DBService.Unscoped().Where("account = ?", request.Account).First(&deletedData).Error; err == nil {
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
if err = impl.DBService.Unscoped().Where("account = ?", request.Account).First(&deletedData).Error; err == nil {
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -76,7 +78,7 @@ func Create(c *gin.Context) {
if request.Workspace == "" {
request.Workspace = "def"
}
if err = models.DBService.Model(&models.MgtApplication{}).Where("workspace = ?", request.Workspace).First(&linkData).Error; err != nil {
if err = impl.DBService.Model(&models.MgtApplication{}).Where("workspace = ?", request.Workspace).First(&linkData).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -103,7 +105,7 @@ func Create(c *gin.Context) {
Std_IICUDS: coreTypes.Std_IICUDS{Identity: coreutils.UUID(), Status: 1},
}
if err = models.DBService.Transaction(func(tx *gorm.DB) error {
if err = impl.DBService.Transaction(func(tx *gorm.DB) error {
if err = tx.Model(&models.MgtUser{}).Create(&userModel).Error; err != nil {
return err
}

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

@@ -1,9 +1,11 @@
package user
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.MgtUser{}, request.ID).Error; err != nil {
printer.Error("删除用户异常: %v", err)

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

@@ -3,9 +3,11 @@ package user
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.MgtUser{}).Where("id = ?", request.ID).First(&userData).Error; err != nil {
if err = impl.DBService.Model(&models.MgtUser{}).Where("id = ?", request.ID).First(&userData).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return

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

@@ -1,10 +1,12 @@
package user
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"
"github.com/gin-gonic/gin"
@@ -15,7 +17,7 @@ func Fetch(c *gin.Context) {
request = types.UserRequest{}
count int64 = 0
data = make([]types.UserResp, 0)
db = models.DBService.Model(&models.MgtUser{})
db = impl.DBService.Model(&models.MgtUser{})
)
// 解析JSON请求

4
module/base/mgt/internal/logic/user/fetch_app.go
View File

@@ -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"
@@ -15,7 +17,7 @@ func ApplicationsFetch(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)

10
module/base/mgt/internal/logic/user/fetch_pmn.go
View File

@@ -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").

4
module/base/mgt/internal/logic/user/fetch_role.go
View File

@@ -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"
@@ -16,7 +18,7 @@ func RoleFetch(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)

4
module/base/mgt/internal/logic/user/list.go
View File

@@ -1,8 +1,10 @@
package user
import (
"bsm/full/module/base/mgt/internal/impl"
"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"
"github.com/gin-gonic/gin"
@@ -23,7 +25,7 @@ func UserList(c *gin.Context) {
return
}
db := models.DBService.Model(&models.MgtUser{}).
db := impl.DBService.Model(&models.MgtUser{}).
Where("id IN (SELECT user_id FROM mgt_link_user_app WHERE app_id = (SELECT id FROM mgt_application WHERE workspace = ? LIMIT 1))", request.Workspace)
if request.Keyword != "" {
likeStr := "%" + request.Keyword + "%"

6
module/base/mgt/internal/logic/user/modify.go
View File

@@ -3,9 +3,11 @@ package user
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"
@@ -39,7 +41,7 @@ func Midify(c *gin.Context) {
}
if request.Account != "" {
if err := models.DBService.Model(&models.MgtUser{}).Where("account = ? and id <>?", request.Account, request.ID).First(&user).Error; err != nil {
if err := impl.DBService.Model(&models.MgtUser{}).Where("account = ? and id <>?", request.Account, request.ID).First(&user).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
return
@@ -64,7 +66,7 @@ func Midify(c *gin.Context) {
userModel.Account = request.Account
updateFields = append(updateFields, "account")
}
if err := models.DBService.Model(&models.MgtUser{}).Where("id = ?", request.ID).Select(updateFields).Updates(&userModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtUser{}).Where("id = ?", request.ID).Select(updateFields).Updates(&userModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

8
module/base/mgt/internal/logic/user/set_pmn.go
View File

@@ -1,9 +1,11 @@
package user
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"
@@ -45,7 +47,7 @@ func SetPmn(c *gin.Context) {
Appdta = models.MgtLinkUserApp{AppId: appId, UserId: request.Id}
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
if err := tx.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "app_id"}, {Name: "pmn_id"}, {Name: "user_id"}},
DoUpdates: clause.AssignmentColumns([]string{"app_id", "pmn_id", "user_id"}),
@@ -102,7 +104,7 @@ func ModifyPmn(c *gin.Context) {
Appdta = models.MgtLinkUserApp{AppId: appId, UserId: request.Id}
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("app_id = ? and user_id = ?", appId, request.Id).Delete(&models.MgtLinkUserPmn{}).Error; err != nil {
printer.Error("删除用户权限关联失败: %v", err)
return err
@@ -160,7 +162,7 @@ func DelPmn(c *gin.Context) {
}
pmnIds = append(pmnIds, v)
}
if err := models.DBService.Where("app_id = ? AND user_id = ? AND pmn_id in ?", appId, request.Id, pmnIds).
if err := impl.DBService.Where("app_id = ? AND user_id = ? AND pmn_id in ?", appId, request.Id, pmnIds).
Delete(&models.MgtLinkUserPmn{}).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

10
module/base/mgt/internal/logic/user/set_role.go
View File

@@ -1,9 +1,11 @@
package user
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"
@@ -32,7 +34,7 @@ func SetRole(c *gin.Context) {
return
}
if err := models.DBService.Model(&models.MgtRole{}).Where("id in ?", request.RoleId).Preload("Permissions").Find(&role).Error; err != nil {
if err := impl.DBService.Model(&models.MgtRole{}).Where("id in ?", request.RoleId).Preload("Permissions").Find(&role).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -48,7 +50,7 @@ func SetRole(c *gin.Context) {
roleData = append(roleData, models.MgtLinkUserRole{UserId: request.UserId, RoleId: v.ID})
}
if err := models.DBService.Model(&models.MgtLinkRoleApp{}).Select("app_id").Where("role_id in ?", request.RoleId).Find(&appId).Error; err != nil {
if err := impl.DBService.Model(&models.MgtLinkRoleApp{}).Select("app_id").Where("role_id in ?", request.RoleId).Find(&appId).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -61,7 +63,7 @@ func SetRole(c *gin.Context) {
userApp = append(userApp, models.MgtLinkUserApp{UserId: request.UserId, AppId: v})
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
if err := tx.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "app_id"}, {Name: "pmn_id"}, {Name: "user_id"}},
DoUpdates: clause.AssignmentColumns([]string{"app_id", "pmn_id", "user_id"}),
@@ -107,7 +109,7 @@ func DelRole(c *gin.Context) {
return
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
var (
removedRolePmns []uint
userOtherRoles []uint