TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2026-01-04 22:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

支持购买套餐/续费套餐/用户账户操作等

Browse Source
This commit is contained in:
刘祥超
2021-11-08 20:52:15 +08:00
parent 07bf994b68
commit e80441639c
24 changed files with 582 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/rpc/services/nameservers/service_ns_domain.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/TeaOSLab/EdgeAPI/internal/rpc/services"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/maps"
)
// NSDomainService 域名相关服务
@@ -89,7 +90,7 @@ func (this *NSDomainService) FindEnabledNSDomain(ctx context.Context, req *pb.Fi
// 用户
var pbUser *pb.User
if domain.UserId > 0 {
user, err := models.SharedUserDAO.FindEnabledUser(tx, int64(domain.UserId))
user, err := models.SharedUserDAO.FindEnabledUser(tx, int64(domain.UserId), nil)
if err != nil {
return nil, err
}
@@ -148,6 +149,7 @@ func (this *NSDomainService) ListEnabledNSDomains(ctx context.Context, req *pb.L
return nil, err
}
pbDomains := []*pb.NSDomain{}
var cacheMap = maps.Map{}
for _, domain := range domains {
// 集群
cluster, err := models.SharedNSClusterDAO.FindEnabledNSCluster(tx, int64(domain.ClusterId))
@@ -161,7 +163,7 @@ func (this *NSDomainService) ListEnabledNSDomains(ctx context.Context, req *pb.L
// 用户
var pbUser *pb.User
if domain.UserId > 0 {
user, err := models.SharedUserDAO.FindEnabledUser(tx, int64(domain.UserId))
user, err := models.SharedUserDAO.FindEnabledUser(tx, int64(domain.UserId), cacheMap)
if err != nil {
return nil, err
}

2
internal/rpc/services/service_user.go
View File

@@ -163,7 +163,7 @@ func (this *UserService) FindEnabledUser(ctx context.Context, req *pb.FindEnable
tx := this.NullTx()
user, err := models.SharedUserDAO.FindEnabledUser(tx, req.UserId)
user, err := models.SharedUserDAO.FindEnabledUser(tx, req.UserId, nil)
if err != nil {
return nil, err
}