完善套餐

This commit is contained in:
GoEdgeLab
2021-11-28 20:11:36 +08:00
parent 3a8540f8a4
commit cd384f5e8b
7 changed files with 142 additions and 109 deletions

View File

@@ -10,6 +10,7 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/userconfigs"
"github.com/iwind/TeaGo/types"
timeutil "github.com/iwind/TeaGo/utils/time"
"time"
@@ -426,9 +427,7 @@ func (this *UserService) FindUserFeatures(ctx context.Context, req *pb.FindUserF
return nil, err
}
if userId > 0 {
if userId != req.UserId {
return nil, this.PermissionError()
}
req.UserId = userId
}
tx := this.NullTx()
@@ -453,7 +452,7 @@ func (this *UserService) FindAllUserFeatureDefinitions(ctx context.Context, req
return nil, err
}
features := models.FindAllUserFeatures()
features := userconfigs.FindAllUserFeatures()
result := []*pb.UserFeature{}
for _, feature := range features {
result = append(result, feature.ToPB())