Merge pull request #36 from OriTsuruHime/develop

修改游客状态的feed

Author: OriTsuruHime

server/gateway-center/controller/videoController.go

@@ -81,14 +81,15 @@ func PublishAction(c *gin.Context) {
 		VBResponse: baseResponse.VBResponse{StatusCode: e.Success, StatusMsg: e.GetMsg(e.Success)},
 	})
 	//投稿成功之后重新查询用户投稿列表，更新缓存
+	value, _ := c.Get("UserId")
+	userId := int64(value.(uint))
 	//先删除Key
-	token := grpcClient.ValidateToken(params.Token)
-	var PLKey = fmt.Sprintf("PersonVideoList:%d", token)
+	var PLKey = fmt.Sprintf("PersonVideoList:%d", userId)
 	cache.RedisDeleteKey(context.Background(), PLKey)
 	var videoList baseResponse.VideoArray
 	//调用grpc
 	videos, err := grpcClient.PublishList(context.Background(), &pb.DouyinPublishListRequest{
-		UserId: token,
+		UserId: int64(userId),
 		Token:  params.Token,
 	})
 	if err != nil {
@@ -225,7 +226,7 @@ func Feed(c *gin.Context) {
 	}
 	isLogin := false
 	isFollow := false
-	userId := grpcClient.ValidateToken(params.Token)
+	userId := validateToken(params.Token) //验证token是否有效，有效则为用户状态，无效则为游客状态
 	if userId != -1 {
 		isLogin = true
 	}
@@ -255,15 +256,15 @@ func Feed(c *gin.Context) {
 
 	for _, video := range videos {
 		var info *pb.DouyinUserResponse
-		if isLogin {
+		if isLogin { //用户模式
 			info, err = grpcClient.GetUserById(context.Background(), uint(video.Author.Id), uint(userId), params.Token)
 			if err != nil {
 				util.LogrusObj.Errorf("获取User失败 UserId:%d UserToken:%d", video.Author.Id, &params.Token)
 				continue
 			}
 			isFollow = info.User.IsFollow
-		} else {
-			info, err = grpcClient.GetUserById(context.Background(), uint(video.Author.Id), 0, "")
+		} else { //游客模式
+			info, err = grpcClient.GetUserById(context.Background(), uint(video.Author.Id), uint(video.Author.Id), "")
 			if err != nil {
 				util.LogrusObj.Errorf("获取User失败 UserId:%d UserToken:%d", video.Author.Id, &params.Token)
 				continue
@@ -501,3 +502,19 @@ func ListFav(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, response)
 }
+
+// 如果token验证失败则返回user为-1
+func validateToken(token string) int64 {
+	if len(token) == 0 {
+		return -1
+	}
+	parseToken, err := util.ParseToken(token)
+	if err != nil {
+		return -1
+	}
+	// 判断 token 是否过期
+	if parseToken.ExpiresAt < time.Now().Unix() {
+		return -1
+	}
+	return int64(parseToken.ID)
+}

server/gateway-center/grpcClient/VideoClient.go

@@ -2,14 +2,10 @@ package grpcClient
 
 import (
 	"context"
-	"fmt"
-	"gateway-center/cache"
 	"gateway-center/pkg/e"
-	"gateway-center/util"
 	"github.com/OrionLi/douyin-backend/pkg/pb"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
-	"time"
 )
 
 // ResetVideoStreamClient 重置VideoStreamClient
@@ -114,30 +110,6 @@ func Feed(ctx context.Context, req *pb.DouyinFeedRequest) ([]*pb.Video, int64, e
 	return videos, *r.NextTime, nil
 }
 
-// GetPublishListCount 通过Token获取userId对应的VideoCount
-func GetPublishListCount(ctx context.Context, token string) (count int64, err error) {
-	userId := ValidateToken(token)
-	PACountKey := fmt.Sprintf("publishlist:%d", userId)
-	vCount, err := cache.RedisGetKey(ctx, PACountKey)
-	if err != nil { //出错，没找到，查询数据库，并写入cache
-		util.LogrusObj.Errorf("Cache get PublishListCount Error ErrorMSG:%s", err.Error())
-		req := &pb.DouyinPublishListRequest{UserId: userId, Token: token}
-		r, err := VideoClient.PublishList(ctx, req)
-		if err != nil {
-			return 0, err
-		}
-		if r.StatusCode != 0 {
-			return 0, e.NewCustomError(int64(r.StatusCode), *r.StatusMsg)
-		}
-		err = cache.RedisSetKey(ctx, PACountKey, int64(len(r.VideoList)))
-		if err != nil {
-			util.LogrusObj.Errorf("Cache set PublishListCount Error ErrorMSG:%s", err.Error())
-		}
-		return int64(len(r.VideoList)), nil
-	} //找到返回结果
-	return util.StringToInt64(vCount), nil
-}
-
 // PublishAction 投稿
 func PublishAction(ctx context.Context, req *pb.DouyinPublishActionRequest) error {
 	err := VideoStreamClient.Send(req)
@@ -199,19 +171,3 @@ func ActionComment(ctx context.Context, req *pb.DouyinCommentActionRequest) (*pb
 func ListComment(ctx context.Context, req *pb.DouyinCommentListRequest) (*pb.DouyinCommentListResponse, error) {
 	return VideoInteractionClient.ListComment(ctx, req)
 }
-
-// ValidateToken 校验Token
-func ValidateToken(token string) int64 {
-	if len(token) == 0 {
-		return -1
-	}
-	parseToken, err := util.ParseToken(token)
-	if err != nil {
-		return -1
-	}
-	// 判断 token 是否过期
-	if parseToken.ExpiresAt < time.Now().Unix() {
-		return -1
-	}
-	return int64(parseToken.ID)
-}

server/video-center/handler/videoHandler.go

@@ -104,7 +104,7 @@ func (s *VideoServer) Feed(ctx context.Context, req *pb.DouyinFeedRequest) (*pb.
 	var userId int64
 	userId = 0
 	//判断token,并获取userId
-	util.LogrusObj.Infof("FeedRequest Token:%s lastest_time%d:", *req.Token, req.LatestTime)
+	util.LogrusObj.Infof("FeedRequest Token:%s lastest_time:%d", *req.Token, req.LatestTime)
 	if len(req.GetToken()) != 0 {
 		token, err := util.ParseToken(req.GetToken())
 		if err != nil {