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

32
module/base/ads/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/ads/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemorySerice = deps.Cache
}
}

2
module/base/ads/service/expose.go
View File

@@ -10,11 +10,13 @@ import (
)
type ExposeOptions struct {
Dependencies
GRPC *grpc.Server
Gateway *gwRuntime.ServeMux
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
server.New(options.GRPC)
ctx := context.Background()

32
module/base/cloud/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/cloud/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemorySerice = deps.Cache
}
}

2
module/base/cloud/service/expose.go
View File

@@ -10,11 +10,13 @@ import (
)
type ExposeOptions struct {
Dependencies
GRPC *grpc.Server
Gateway *gwRuntime.ServeMux
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
server.New(options.GRPC)
ctx := context.Background()

32
module/base/cms/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/cms/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemoryService = deps.Cache
}
}

2
module/base/cms/service/expose.go
View File

@@ -10,11 +10,13 @@ import (
)
type ExposeOptions struct {
Dependencies
GRPC *grpc.Server
Gateway *gwRuntime.ServeMux
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
server.New(options.GRPC)
ctx := context.Background()

32
module/base/feedback/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/feedback/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemorySerice = deps.Cache
}
}

2
module/base/feedback/service/expose.go
View File

@@ -10,11 +10,13 @@ import (
)
type ExposeOptions struct {
Dependencies
GRPC *grpc.Server
Gateway *gwRuntime.ServeMux
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
server.New(options.GRPC)
ctx := context.Background()

32
module/base/fts/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/fts/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemorySerice = deps.Cache
}
}

15
module/base/fts/service/expose.go
View File

@@ -8,10 +8,17 @@ import (
type Config = config.SrvConfig
func Expose(engine *gin.Engine, cfg *Config) error {
if cfg != nil {
config.Spec = *cfg
type ExposeOptions struct {
Dependencies
Engine *gin.Engine
Config *Config
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
if options.Config != nil {
config.Spec = *options.Config
}
routers.Register("fts", engine)
routers.Register("fts", options.Engine)
return nil
}

32
module/base/initial/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/initial/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemorySerice = deps.Cache
}
}

2
module/base/initial/service/expose.go
View File

@@ -10,11 +10,13 @@ import (
)
type ExposeOptions struct {
Dependencies
GRPC *grpc.Server
Gateway *gwRuntime.ServeMux
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
server.New(options.GRPC)
ctx := context.Background()

29
module/base/logs/service/dependencies.go Normal file
View File

@@ -0,0 +1,29 @@
package service
import (
"bsm/full/module/base/logs/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
}

10
module/base/logs/service/expose.go
View File

@@ -5,7 +5,13 @@ import (
"github.com/gin-gonic/gin"
)
func Expose(engine *gin.Engine) error {
routers.Register("logs", engine)
type ExposeOptions struct {
Dependencies
Engine *gin.Engine
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
routers.Register("logs", options.Engine)
return nil
}

15
module/base/mgt/internal/impl/impl.go
View File

@@ -2,26 +2,25 @@ package impl
import (
"bsm/full/module/base/mgt/internal/config"
"git.apinb.com/bsm-sdk/core/cache/redis"
"git.apinb.com/bsm-sdk/core/with"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
var (
RedisService *redis.RedisClient // Redis 客户端服务
EtcdService *clientv3.Client // Etcd 客户端服务
MemorySerice *cache.Cache // 内存缓存服务
RedisService *redis.RedisClient
EtcdService *clientv3.Client
MemorySerice *cache.Cache
DBService *gorm.DB
)
// NewImpl 初始化各类服务实例
// NewImpl initializes infrastructure for standalone execution.
func NewImpl() {
// 初始化内存缓存
MemorySerice = with.Memory(nil)
// 初始化 Redis 缓存
RedisService = with.RedisCache(config.Spec.Cache)
// 初始化数据库服务
WithDatabases(config.Spec.Databases, nil)
// 初始化 Etcd 服务
EtcdService = with.Etcd(config.Spec.Etcd)
}

2
module/base/mgt/internal/impl/with.go
View File

@@ -2,6 +2,7 @@ package impl
import (
"bsm/full/module/base/mgt/internal/models"
"git.apinb.com/bsm-sdk/core/conf"
"git.apinb.com/bsm-sdk/core/printer"
coreTypes "git.apinb.com/bsm-sdk/core/types"
@@ -21,5 +22,6 @@ func WithDatabases(cfg *conf.DBConf, opts *coreTypes.SqlOptions) {
printer.Error("Database Init Failed !")
panic(err)
}
DBService = models.DBService
return
}

14
module/base/mgt/internal/logic/application/create.go
View File

@@ -3,9 +3,11 @@ package application
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"
@@ -35,7 +37,7 @@ func Create(c *gin.Context) {
}
// 判断应用是否已经存在（包括软删除的记录）
db := models.DBService.Model(&models.MgtApplication{})
db := impl.DBService.Model(&models.MgtApplication{})
if err = db.Where("title = ? or workspace = ?", request.Title, request.Workspace).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
@@ -45,9 +47,9 @@ func Create(c *gin.Context) {
var deletedData models.MgtApplication
// 检查 workspace 是否被软删除（workspace 有唯一索引）
if request.Workspace != "" {
if err = models.DBService.Unscoped().Where("workspace = ?", request.Workspace).First(&deletedData).Error; err == nil {
if err = impl.DBService.Unscoped().Where("workspace = ?", request.Workspace).First(&deletedData).Error; err == nil {
// 存在软删除的记录，先物理删除它，以便可以重新创建
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -56,9 +58,9 @@ func Create(c *gin.Context) {
}
// 检查 title 是否被软删除（如果 title 和 workspace 不同）
if request.Title != "" && request.Title != request.Workspace {
if err = models.DBService.Unscoped().Where("title = ?", request.Title).First(&deletedData).Error; err == nil {
if err = impl.DBService.Unscoped().Where("title = ?", request.Title).First(&deletedData).Error; err == nil {
// 存在软删除的记录，先物理删除它
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -79,7 +81,7 @@ func Create(c *gin.Context) {
Workspace: request.Workspace,
Description: request.Description,
}
if err = models.DBService.Model(&models.MgtApplication{}).Create(&dataModel).Error; err != nil {
if err = impl.DBService.Model(&models.MgtApplication{}).Create(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

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

@@ -1,9 +1,11 @@
package application
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"
@@ -36,7 +38,7 @@ func Del(c *gin.Context) {
appId := request.ID
var dptIds []uint
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.MgtDepartment{}).Where("app_id = ?", appId).Pluck("id", &dptIds).Error; err != nil {
printer.Error("查询应用部门异常: %v", err)
return err

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

@@ -3,9 +3,11 @@ package application
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.MgtApplication{}).Where("id = ?", request.ID).First(&data).Error; err != nil {
if err = impl.DBService.Model(&models.MgtApplication{}).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/application/fetch.go
View File

@@ -1,10 +1,12 @@
package application
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.ApplicationRequest{}
count int64 = 0
data = make([]types.ApplicationRsp, 0)
db = models.DBService.Model(&models.MgtApplication{})
db = impl.DBService.Model(&models.MgtApplication{})
)
// 解析JSON请求

8
module/base/mgt/internal/logic/application/fetch_other.go
View File

@@ -1,10 +1,12 @@
package application
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 = models.MgtApplication{}
db = models.DBService.Model(&models.MgtApplication{}).Select("id", "identity", "title")
db = impl.DBService.Model(&models.MgtApplication{}).Select("id", "identity", "title")
count int64 = 0
)
err := c.ShouldBindJSON(&request)
@@ -56,7 +58,7 @@ func RoleFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtApplication, 0)
db = models.DBService.Model(&models.MgtApplication{}).Select("id", "identity", "title")
db = impl.DBService.Model(&models.MgtApplication{}).Select("id", "identity", "title")
count int64 = 0
)
err := c.ShouldBindJSON(&request)
@@ -97,7 +99,7 @@ func PermissionFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtApplication, 0)
db = models.DBService.Model(&models.MgtApplication{}).Select("id", "identity", "title")
db = impl.DBService.Model(&models.MgtApplication{}).Select("id", "identity", "title")
count int64 = 0
)
err := c.ShouldBindJSON(&request)

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

@@ -3,9 +3,11 @@ package application
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"
@@ -40,7 +42,7 @@ func Midify(c *gin.Context) {
// 检查workspace是否已被其他应用使用
if request.Workspace != "" {
if err := models.DBService.Model(&models.MgtApplication{}).Where("workspace=? and id<>?", request.Workspace, request.ID).First(&data).Error; err != nil {
if err := impl.DBService.Model(&models.MgtApplication{}).Where("workspace=? and id<>?", request.Workspace, request.ID).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
return
@@ -61,7 +63,7 @@ func Midify(c *gin.Context) {
if request.Status != 0 {
dataModel.Status = request.Status
}
if err := models.DBService.Model(&models.MgtApplication{}).Where("id = ?", request.ID).Updates(&dataModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtApplication{}).Where("id = ?", request.ID).Updates(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

8
module/base/mgt/internal/logic/department/create.go
View File

@@ -3,9 +3,11 @@ package department
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"
@@ -55,7 +57,7 @@ func Create(c *gin.Context) {
}
// 同一应用下部门名称唯一
if err = models.DBService.Model(&models.MgtDepartment{}).
if err = impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ? and name = ?", appId, request.Name).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
@@ -70,7 +72,7 @@ func Create(c *gin.Context) {
// 若有父部门，校验父部门属于同一应用
if request.ParentID > 0 {
var parent models.MgtDepartment
if err = models.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if err = impl.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -93,7 +95,7 @@ func Create(c *gin.Context) {
LeaderID: request.LeaderID,
Name: request.Name,
}
if err = models.DBService.Create(&dataModel).Error; err != nil {
if err = impl.DBService.Create(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

8
module/base/mgt/internal/logic/department/del.go
View File

@@ -3,9 +3,11 @@ package department
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"
"github.com/gin-gonic/gin"
@@ -58,7 +60,7 @@ func Del(c *gin.Context) {
}
var dept models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.ID).First(&dept).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.ID).First(&dept).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -67,13 +69,13 @@ func Del(c *gin.Context) {
return
}
allDeptIds, err := getDepartmentIdsRecursive(models.DBService, dept.AppID, request.ID)
allDeptIds, err := getDepartmentIdsRecursive(impl.DBService, dept.AppID, request.ID)
if err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("dpt_id in ?", allDeptIds).Delete(&models.MgtLinkUserDpt{}).Error; err != nil {
return err
}

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

@@ -3,9 +3,11 @@ package department
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.MgtDepartment{}).
if err = impl.DBService.Model(&models.MgtDepartment{}).
Select("id", "identity", "name", "app_id", "parent_id", "leader_id").Preload("Leader", func(db *gorm.DB) *gorm.DB {
return db.Select("id", "identity", "name")
}).Where("id = ?", request.ID).First(&data).Error; err != nil {

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

@@ -1,10 +1,12 @@
package department
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.DptReq{}
count int64 = 0
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{}).Select("id", "identity", "name", "app_id", "parent_id")
db = impl.DBService.Model(&models.MgtDepartment{}).Select("id", "identity", "name", "app_id", "parent_id")
)
err := c.ShouldBindJSON(&request)

8
module/base/mgt/internal/logic/department/fetch_pmn.go
View File

@@ -1,9 +1,11 @@
package department
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"
@@ -15,7 +17,7 @@ func PermissionsFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{})
db = impl.DBService.Model(&models.MgtDepartment{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -55,7 +57,7 @@ func PermissionsFetch(c *gin.Context) {
deptIds = append(deptIds, d.ID)
}
var links []models.MgtLinkDptPmn
if err := models.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
if err := impl.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -71,7 +73,7 @@ func PermissionsFetch(c *gin.Context) {
}
var perms []models.MgtPermission
if len(pmnIds) > 0 {
if err := models.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id").
if err := impl.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id").
Where("id in ?", pmnIds).Find(&perms).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

8
module/base/mgt/internal/logic/department/fetch_pmn_tree.go
View File

@@ -1,9 +1,11 @@
package department
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"
@@ -15,7 +17,7 @@ func PermissionsFetchTree(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{})
db = impl.DBService.Model(&models.MgtDepartment{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -55,7 +57,7 @@ func PermissionsFetchTree(c *gin.Context) {
deptIds = append(deptIds, d.ID)
}
var links []models.MgtLinkDptPmn
if err := models.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
if err := impl.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -71,7 +73,7 @@ func PermissionsFetchTree(c *gin.Context) {
}
var perms []models.MgtPermission
if len(pmnIds) > 0 {
if err := models.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id", "menu_path", "code", "component", "is_web_page", "is_new_tab", "web_url").
if err := impl.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id", "menu_path", "code", "component", "is_web_page", "is_new_tab", "web_url").
Where("id in ?", pmnIds).Order("sort_key").Find(&perms).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

4
module/base/mgt/internal/logic/department/fetch_tree.go
View File

@@ -1,9 +1,11 @@
package department
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"
@@ -37,7 +39,7 @@ func FetchTree(c *gin.Context) {
return
}
if err := models.DBService.Model(&models.MgtDepartment{}).
if err := impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ?", appId).
Select("id", "identity", "name", "app_id", "parent_id").
Order("parent_id asc").Find(&data).Error; err != nil {

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

@@ -1,9 +1,11 @@
package department
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"
@@ -38,7 +40,7 @@ func List(c *gin.Context) {
return
}
db := models.DBService.Model(&models.MgtDepartment{}).
db := impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ?", appId).
Select("id", "identity", "name", "app_id", "parent_id")
if request.Keyword != "" {

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

@@ -3,9 +3,11 @@ package department
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"
@@ -36,7 +38,7 @@ func Modify(c *gin.Context) {
return
}
if err = models.DBService.Select("id", "app_id", "identity").Where("id = ?", request.ID).First(&data).Error; err != nil {
if err = impl.DBService.Select("id", "app_id", "identity").Where("id = ?", request.ID).First(&data).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -52,7 +54,7 @@ func Modify(c *gin.Context) {
infra.Response.Error(c, errcode.ErrInvalidArgument)
return
}
descendantIds, err := getDepartmentIdsRecursive(models.DBService, appId, request.ID)
descendantIds, err := getDepartmentIdsRecursive(impl.DBService, appId, request.ID)
if err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
@@ -68,7 +70,7 @@ func Modify(c *gin.Context) {
if request.Name != "" {
var exist models.MgtDepartment
if err = models.DBService.Model(&models.MgtDepartment{}).
if err = impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ? and name = ? and id <> ?", appId, request.Name, request.ID).First(&exist).Error; err == nil {
infra.Response.Error(c, errcode.ErrAlreadyExists)
return
@@ -81,7 +83,7 @@ func Modify(c *gin.Context) {
if request.ParentID > 0 {
var parent models.MgtDepartment
if err = models.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if err = impl.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrInvalidArgument)
return
@@ -102,7 +104,7 @@ func Modify(c *gin.Context) {
LeaderID: request.LeaderID,
Std_IICUDS: coreTypes.Std_IICUDS{Status: request.Status},
}
if err := models.DBService.Model(&models.MgtDepartment{}).Where("id = ?", request.ID).Updates(&dataModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtDepartment{}).Where("id = ?", request.ID).Updates(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

14
module/base/mgt/internal/logic/department/set_pmn.go
View File

@@ -3,9 +3,11 @@ package department
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 SetPmn(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -61,7 +63,7 @@ func SetPmn(c *gin.Context) {
pmnData = append(pmnData, models.MgtLinkDptPmn{AppId: appId, PmnId: v, DptId: request.Id})
}
if err := models.DBService.Clauses(clause.OnConflict{
if err := impl.DBService.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "dpt_id"}, {Name: "app_id"}, {Name: "pmn_id"}},
DoUpdates: clause.AssignmentColumns([]string{"dpt_id", "app_id", "pmn_id"}),
}).Create(&pmnData).Error; err != nil {
@@ -97,7 +99,7 @@ func ModifyPmn(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -120,7 +122,7 @@ func ModifyPmn(c *gin.Context) {
pmnData = append(pmnData, models.MgtLinkDptPmn{AppId: appId, PmnId: v, DptId: 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("dpt_id = ? and app_id = ?", request.Id, appId).Delete(&models.MgtLinkDptPmn{}).Error; err != nil {
return err
}
@@ -165,7 +167,7 @@ func DelPmn(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -188,7 +190,7 @@ func DelPmn(c *gin.Context) {
}
pmnIds = append(pmnIds, v)
}
if err := models.DBService.Where("dpt_id = ? AND app_id = ? AND pmn_id in ?", request.Id, appId, pmnIds).
if err := impl.DBService.Where("dpt_id = ? AND app_id = ? AND pmn_id in ?", request.Id, appId, pmnIds).
Delete(&models.MgtLinkDptPmn{}).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

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

@@ -3,9 +3,11 @@ package department
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"
@@ -27,7 +29,7 @@ func SetUser(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id").Where("id = ?", request.DptId).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id").Where("id = ?", request.DptId).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -40,7 +42,7 @@ func SetUser(c *gin.Context) {
for _, uid := range request.UserIds {
list = append(list, models.MgtLinkUserDpt{UserId: uid, DptId: request.DptId})
}
if err := models.DBService.Clauses(clause.OnConflict{
if err := impl.DBService.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "user_id"}, {Name: "dpt_id"}},
DoNothing: true,
}).Create(&list).Error; err != nil {
@@ -64,7 +66,7 @@ func DelUser(c *gin.Context) {
return
}
result := models.DBService.Where("dpt_id = ? and user_id in ?", request.DptId, request.UserIds).
result := impl.DBService.Where("dpt_id = ? and user_id in ?", request.DptId, request.UserIds).
Delete(&models.MgtLinkUserDpt{})
if result.Error != nil {
infra.Response.Error(c, errcode.ErrDB)
@@ -80,7 +82,7 @@ func UserFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{})
db = impl.DBService.Model(&models.MgtDepartment{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)

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 {

5
module/base/mgt/internal/logic/pub/forget.go
View File

@@ -7,6 +7,7 @@ import (
"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 +39,7 @@ func ForgetPwdBySms(c *gin.Context) {
}
var data models.MgtUser
if err := models.DBService.Model(&models.MgtUser{}).Where("account = ?", request.Account).First(&data).Error; err != nil {
if err := impl.DBService.Model(&models.MgtUser{}).Where("account = ?", request.Account).First(&data).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -82,7 +83,7 @@ func ForgetPwdBySms(c *gin.Context) {
return
}
if err := models.DBService.Model(&models.MgtUser{}).Where("id = ?", data.ID).Updates(map[string]interface{}{
if err := impl.DBService.Model(&models.MgtUser{}).Where("id = ?", data.ID).Updates(map[string]interface{}{
"password": string(hashedPassword),
"salt": data.Salt,
}).Error; err != nil {

3
module/base/mgt/internal/logic/pub/login.go
View File

@@ -10,6 +10,7 @@ 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/crypto/token"
"git.apinb.com/bsm-sdk/core/env"
"git.apinb.com/bsm-sdk/core/errcode"
@@ -60,7 +61,7 @@ func Login(c *gin.Context) {
}
// 获取用户信息
if err = models.DBService.Model(&models.MgtUser{}).Where("account=?", account).First(&user).Error; err != nil {
if err = impl.DBService.Model(&models.MgtUser{}).Where("account=?", account).First(&user).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return

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

@@ -3,9 +3,11 @@ package role
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,15 +40,15 @@ func Create(c *gin.Context) {
return
}
db := models.DBService.Model(&models.MgtRole{})
db := impl.DBService.Model(&models.MgtRole{})
if err = db.Where("name = ? ", request.Name).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
return
}
var deletedData models.MgtRole
if err = models.DBService.Unscoped().Where("name = ?", request.Name).First(&deletedData).Error; err == nil {
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
if err = impl.DBService.Unscoped().Where("name = ?", request.Name).First(&deletedData).Error; err == nil {
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -62,7 +64,7 @@ func Create(c *gin.Context) {
Name: request.Name,
Std_IICUDS: coreTypes.Std_IICUDS{Identity: coreutils.UUID(), Status: 1},
}
if err = models.DBService.Model(&models.MgtRole{}).Create(&dataModel).Error; err != nil {
if err = impl.DBService.Model(&models.MgtRole{}).Create(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

8
module/base/mgt/internal/logic/role/del.go
View File

@@ -1,9 +1,11 @@
package role
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"
@@ -35,13 +37,13 @@ func Del(c *gin.Context) {
return
}
if err := models.DBService.Model(&models.MgtLinkRolePmn{}).Where("role_id=?", request.ID).Pluck("pmn_id", &pmnId).Error; err != nil {
if err := impl.DBService.Model(&models.MgtLinkRolePmn{}).Where("role_id=?", request.ID).Pluck("pmn_id", &pmnId).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
if len(pmnId) > 0 {
if err := models.DBService.Model(&models.MgtLinkUserRole{}).
if err := impl.DBService.Model(&models.MgtLinkUserRole{}).
Where("role_id = ?", request.ID).
Pluck("user_id", &userIds).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
@@ -49,7 +51,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 len(pmnId) > 0 && len(userIds) > 0 {
if err := tx.Where("user_id in ? and pmn_id in ?", userIds, pmnId).
Delete(&models.MgtLinkUserPmn{}).Error; err != nil {

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

@@ -3,9 +3,11 @@ package role
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.MgtRole{}).Select("id", "identity", "name", "description").Where("id = ?", request.ID).First(&data).Error; err != nil {
if err = impl.DBService.Model(&models.MgtRole{}).Select("id", "identity", "name", "description").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/role/fetch.go
View File

@@ -1,10 +1,12 @@
package role
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.RoleReq{}
count int64 = 0
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{}).Select("id", "identity", "name", "description")
db = impl.DBService.Model(&models.MgtRole{}).Select("id", "identity", "name", "description")
)
// 解析JSON请求

10
module/base/mgt/internal/logic/role/fetch_other.go
View File

@@ -1,9 +1,11 @@
package role
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"
"github.com/gin-gonic/gin"
@@ -14,7 +16,7 @@ func PermissionsFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -42,7 +44,7 @@ func PermissionsFetchTree(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
@@ -83,7 +85,7 @@ func ApplicationsFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -109,7 +111,7 @@ func UserFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)

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

@@ -3,9 +3,11 @@ package role
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 Midify(c *gin.Context) {
}
if request.Name != "" {
db := models.DBService.Model(&models.MgtRole{})
db := impl.DBService.Model(&models.MgtRole{})
if err = db.Where("name = ? and id<> ?", request.Name, request.ID).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
@@ -57,7 +59,7 @@ func Midify(c *gin.Context) {
Description: request.Description,
Std_IICUDS: coreTypes.Std_IICUDS{Status: request.Status},
}
if err := models.DBService.Model(&models.MgtRole{}).Where("id = ?", request.ID).Updates(&roleModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtRole{}).Where("id = ?", request.ID).Updates(&roleModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

8
module/base/mgt/internal/logic/role/set.go
View File

@@ -1,9 +1,11 @@
package role
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.MgtLinkRoleApp{AppId: appId, RoleId: 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: "role_id"}},
DoUpdates: clause.AssignmentColumns([]string{"app_id", "pmn_id", "role_id"}),
@@ -104,7 +106,7 @@ func ModifyPmn(c *gin.Context) {
Appdta = models.MgtLinkRoleApp{AppId: appId, RoleId: 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 role_id = ?", appId, request.Id).Delete(&models.MgtLinkRolePmn{}).Error; err != nil {
printer.Error("删除角色权限关联失败: %v", err)
return err
@@ -159,7 +161,7 @@ func DelPmn(c *gin.Context) {
}
pmnIds = append(pmnIds, v)
}
if err := models.DBService.Where("app_id = ? AND role_id = ? AND pmn_id in ?", appId, request.Id, pmnIds).
if err := impl.DBService.Where("app_id = ? AND role_id = ? AND pmn_id in ?", appId, request.Id, pmnIds).
Delete(&models.MgtLinkRolePmn{}).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

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

6
module/base/mgt/internal/middleware/rbac.go
View File

@@ -1,7 +1,9 @@
package middleware
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/models"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
coremw "git.apinb.com/bsm-sdk/core/middleware"
@@ -16,13 +18,13 @@ const (
// IsSuperAdmin 判断用户是否为 root 账号或拥有超级管理员角色
func IsSuperAdmin(userID uint) bool {
var user models.MgtUser
if err := models.DBService.Select("id", "account").Where("id = ?", userID).First(&user).Error; err != nil {
if err := impl.DBService.Select("id", "account").Where("id = ?", userID).First(&user).Error; err != nil {
return false
}
if user.Account == rootAccount {
return true
}
if err := models.DBService.Preload("Roles").Where("id = ?", userID).First(&user).Error; err != nil {
if err := impl.DBService.Preload("Roles").Where("id = ?", userID).First(&user).Error; err != nil {
return false
}
for _, role := range user.Roles {

1
module/base/mgt/internal/models/impl.go
View File

@@ -6,6 +6,7 @@ import (
"strings"
"bsm/full/module/base/mgt/internal/config"
"git.apinb.com/bsm-sdk/core/database/sql"
"git.apinb.com/bsm-sdk/core/types"
"git.apinb.com/bsm-sdk/core/vars"

1
module/base/mgt/internal/routers/register.go
View File

@@ -9,6 +9,7 @@ import (
"bsm/full/module/base/mgt/internal/logic/role"
"bsm/full/module/base/mgt/internal/logic/user"
mgtmw "bsm/full/module/base/mgt/internal/middleware"
"git.apinb.com/bsm-sdk/core/middleware"
"github.com/gin-gonic/gin"
)

32
module/base/mgt/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/mgt/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemorySerice = deps.Cache
}
}

15
module/base/mgt/service/expose.go
View File

@@ -8,10 +8,17 @@ import (
type Config = config.SrvConfig
func Expose(engine *gin.Engine, cfg *Config) error {
if cfg != nil {
config.Spec = *cfg
type ExposeOptions struct {
Dependencies
Engine *gin.Engine
Config *Config
}
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
if options.Config != nil {
config.Spec = *options.Config
}
routers.Register("mgt", engine)
routers.Register("mgt", options.Engine)
return nil
}

32
module/base/passport/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/passport/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemoryService = deps.Cache
}
}

2
module/base/passport/service/expose.go
View File

@@ -11,6 +11,7 @@ import (
)
type ExposeOptions struct {
Dependencies
GRPC *grpc.Server
Gateway *gwRuntime.ServeMux
Config *Config
@@ -19,6 +20,7 @@ type ExposeOptions struct {
type Config = config.SrvConfig
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
if options.Config != nil {
config.Spec = *options.Config
}

32
module/base/sender/service/dependencies.go Normal file
View File

@@ -0,0 +1,32 @@
package service
import (
"bsm/full/module/base/sender/internal/impl"
"git.apinb.com/bsm-sdk/core/cache/redis"
cache "github.com/patrickmn/go-cache"
clientv3 "go.etcd.io/etcd/client/v3"
"gorm.io/gorm"
)
// Dependencies contains shared infrastructure supplied by the all module.
type Dependencies struct {
Redis *redis.RedisClient
Etcd *clientv3.Client
DB *gorm.DB
Cache *cache.Cache
}
func applyDependencies(deps Dependencies) {
if deps.Redis != nil {
impl.RedisService = deps.Redis
}
if deps.Etcd != nil {
impl.EtcdService = deps.Etcd
}
if deps.DB != nil {
impl.DBService = deps.DB
}
if deps.Cache != nil {
impl.MemorySerice = deps.Cache
}
}

2
module/base/sender/service/expose.go
View File

@@ -11,6 +11,7 @@ import (
)
type ExposeOptions struct {
Dependencies
GRPC *grpc.Server
Gateway *gwRuntime.ServeMux
Config *Config
@@ -19,6 +20,7 @@ type ExposeOptions struct {
type Config = config.SrvConfig
func Expose(options ExposeOptions) error {
applyDependencies(options.Dependencies)
if options.Config != nil {
config.Spec = *options.Config
}