fix: token and latest time can't be empty

cmd/video/handler.go

@@ -20,16 +20,18 @@ type VideoServiceImpl struct{}
 // Feed implements the VideoServiceImpl interface.
 func (s *VideoServiceImpl) Feed(ctx context.Context, req *video.FeedRequest) (resp *video.FeedResponse, err error) {
 	resp = new(video.FeedResponse)
-	if req.LatestTime == 0 {
-		req.LatestTime = time.Now().Unix()
+	if req.LatestTime == nil {
+		currentTime := time.Now().Unix()
+		req.LatestTime = &currentTime
 	}
-	if req.Token == "" {
-		req.Token, err = utils.CreateToken(10000)
+	if req.Token == nil {
+		req.Token = new(string)
+		*req.Token, err = utils.CreateToken(10000)
 		if err != nil {
 			resp.Base = pack.BuildBaseResp(errno.ParamError)
 		}
 	}
-	if _, err := utils.CheckToken(req.Token); err != nil {
+	if _, err := utils.CheckToken(*req.Token); err != nil {
 		resp.Base = pack.BuildBaseResp(errno.AuthorizationFailedError)
 		return resp, nil
 	}
@@ -159,12 +161,12 @@ func (s *VideoServiceImpl) PutVideo(ctx context.Context, req *video.PutVideoRequ
 	// 上传视频
 	eg.Go(func() error {
 		err = service.NewVideoService(ctx).UploadVideo(req, videoName)
-		return err
+		return errno.FileUploadError
 	})
 	// 截取并上传封面
 	eg.Go(func() error {
 		err = service.NewVideoService(ctx).UploadCover(req, coverName)
-		return err
+		return errno.FileUploadError
 	})
 	// 将视频数据写入数据库
 	eg.Go(func() error {

cmd/video/service/feed_video.go

@@ -16,21 +16,21 @@ func (s *VideoService) FeedVideo(req *video.FeedRequest) ([]db.Video, []*user.Us
 	var videoList []db.Video
 	var err error
 
-	if exist, err := cache.IsExistVideoInfo(s.ctx, req.LatestTime); exist == 1 {
+	if exist, err := cache.IsExistVideoInfo(s.ctx, *req.LatestTime); exist == 1 {
 		if err != nil {
 			return nil, nil, nil, nil, nil, err
 		}
-		videoList, err = cache.GetVideoList(s.ctx, req.LatestTime)
+		videoList, err = cache.GetVideoList(s.ctx, *req.LatestTime)
 		if err != nil {
 			return nil, nil, nil, nil, nil, err
 		}
 	} else {
-		formattedTime := time.Unix(req.LatestTime, 0).Format("2006-01-02 15:04:05")
+		formattedTime := time.Unix(*req.LatestTime, 0).Format("2006-01-02 15:04:05")
 		videoList, err := db.GetVideoInfoByTime(s.ctx, formattedTime)
 		if err != nil {
 			return nil, nil, nil, nil, nil, err
 		}
-		go cache.AddVideoList(s.ctx, videoList, req.LatestTime)
+		go cache.AddVideoList(s.ctx, videoList, *req.LatestTime)
 	}
 	// 创建错误组
 	var eg errgroup.Group
@@ -46,7 +46,7 @@ func (s *VideoService) FeedVideo(req *video.FeedRequest) ([]db.Video, []*user.Us
 			// 获取user信息
 			userInfo, err := rpc.GetUser(s.ctx, &user.InfoRequest{
 				UserId: videoList[index].UserID,
-				Token:  req.Token,
+				Token:  *req.Token,
 			})
 			if err == nil {
 				userResults <- userInfo
@@ -57,7 +57,7 @@ func (s *VideoService) FeedVideo(req *video.FeedRequest) ([]db.Video, []*user.Us
 			// 获取favoriteCount
 			favoriteCount, err := rpc.GetVideoFavoriteCount(s.ctx, &interaction.VideoFavoritedCountRequest{
 				VideoId: videoList[index].Id,
-				Token:   req.Token,
+				Token:   *req.Token,
 			})
 			if err == nil {
 				favoriteCountResults <- favoriteCount
@@ -68,7 +68,7 @@ func (s *VideoService) FeedVideo(req *video.FeedRequest) ([]db.Video, []*user.Us
 			// 获取commentCount
 			commentCount, err := rpc.GetCommentCount(s.ctx, &interaction.CommentCountRequest{
 				VideoId: videoList[index].Id,
-				Token:   &req.Token,
+				Token:   req.Token,
 			})
 			if err == nil {
 				commentCountResults <- commentCount
@@ -80,7 +80,7 @@ func (s *VideoService) FeedVideo(req *video.FeedRequest) ([]db.Video, []*user.Us
 			isFavorite, err := rpc.GetVideoIsFavorite(s.ctx, &interaction.InteractionServiceIsFavoriteArgs{Req: &interaction.IsFavoriteRequest{
 				UserId:  videoList[index].UserID,
 				VideoId: videoList[index].Id,
-				Token:   req.Token,
+				Token:   *req.Token,
 			}})
 			if err == nil {
 				isFavoriteResults <- isFavorite

cmd/video/service/feed_video_test.go

@@ -23,10 +23,12 @@ func TestFeedVideo(t *testing.T) {
 		t.Fail()
 	}
 	videoService := service.NewVideoService(context.Background())
+	testTime := new(int64)
+	*testTime = 1693101739
 	// 第一次从数据库读取，并写入redis
 	_, _, _, _, _, err = videoService.FeedVideo(&video.FeedRequest{
-		LatestTime: 1693101739,
-		Token:      token,
+		LatestTime: testTime,
+		Token:      &token,
 	})
 	if err != nil {
 		t.Error(err)
@@ -36,8 +38,8 @@ func TestFeedVideo(t *testing.T) {
 	time.Sleep(time.Second)
 	// 第二次直接从redis读取
 	_, _, _, _, _, err = videoService.FeedVideo(&video.FeedRequest{
-		LatestTime: 1693101739,
-		Token:      token,
+		LatestTime: testTime,
+		Token:      &token,
 	})
 	if err != nil {
 		t.Error(err)

idl/video.proto

@@ -36,8 +36,8 @@ message Video{
 }
 
 message FeedRequest{
-    int64 latest_time = 1;
-    string token = 2;
+    optional int64 latest_time = 1;
+    optional string token = 2;
 }
 
 message FeedResponse{