From 049b9b52dd721c123216d7b31e8e73d4f2da6f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Wed, 24 Nov 2021 20:06:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=9D=9E=E5=95=86=E4=B8=9A?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BB=8E=E7=94=A8=E6=88=B7=E7=AB=AF=E7=99=BB?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/rpc/services/service_user.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/rpc/services/service_user.go b/internal/rpc/services/service_user.go index e9de0972..3a3c1307 100644 --- a/internal/rpc/services/service_user.go +++ b/internal/rpc/services/service_user.go @@ -3,6 +3,7 @@ package services import ( "context" "encoding/json" + teaconst "github.com/TeaOSLab/EdgeAPI/internal/const" "github.com/TeaOSLab/EdgeAPI/internal/db/models" rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils" "github.com/TeaOSLab/EdgeAPI/internal/utils" @@ -221,11 +222,19 @@ func (this *UserService) CheckUserUsername(ctx context.Context, req *pb.CheckUse // LoginUser 登录 func (this *UserService) LoginUser(ctx context.Context, req *pb.LoginUserRequest) (*pb.LoginUserResponse, error) { - _, _, _, err := rpcutils.ValidateRequest(ctx) + _, err := this.ValidateUserNode(ctx) if err != nil { return nil, err } + if !teaconst.IsPlus { + return &pb.LoginUserResponse{ + UserId: 0, + IsOk: false, + Message: "你正在使用的系统版本为非商业版本或已过期，请管理员续费后才能登录", + }, nil + } + if len(req.Username) == 0 || len(req.Password) == 0 { return &pb.LoginUserResponse{ UserId: 0,