Redis-pool

.gitignore

@@ -20,4 +20,6 @@
 # Go workspace file
 go.work
 
-.idea
+.idea
+
+.vscode

README.md

@@ -19,4 +19,9 @@ go build && ./simple-demo
 
 ### 测试数据
 
-测试数据写在 demo_data.go 中，用于列表接口的 mock 测试
+测试数据写在 demo_data.go 中，用于列表接口的 mock 测试
+
+### 目录结构说明
+
+- document: 项目相关的一些文档记录
+- model: gorm模型

controller/comment.go

@@ -1,47 +1,61 @@
 package controller
 
 import (
-	"github.com/gin-gonic/gin"
+	"context"
+	"fmt"
 	"net/http"
-)
-
-type CommentListResponse struct {
-	Response
-	CommentList []Comment `json:"comment_list,omitempty"`
-}
+	"strconv"
 
-type CommentActionResponse struct {
-	Response
-	Comment Comment `json:"comment,omitempty"`
-}
+	"github.com/BaiZe1998/douyin-simple-demo/db/model"
+	"github.com/BaiZe1998/douyin-simple-demo/dto"
+	"github.com/BaiZe1998/douyin-simple-demo/pkg/util"
+	"github.com/BaiZe1998/douyin-simple-demo/service"
+	"github.com/gin-gonic/gin"
+)
 
 // CommentAction no practical effect, just check if token is valid
 func CommentAction(c *gin.Context) {
 	token := c.Query("token")
 	actionType := c.Query("action_type")
+	videoId, _ := strconv.ParseInt(c.Query("video_id"), 10, 64)
+	userClaims, _ := util.ParseToken(token)
+	userModel, _ := model.QueryUserById(context.Background(), userClaims.ID)
+	users := dto.User{
+		Id:            userModel.ID,
+		Name:          userModel.Name,
+		FollowCount:   userModel.FollowCount,
+		FollowerCount: userModel.FollowerCount,
+		IsFollow:      false,
+	}
 
-	if user, exist := usersLoginInfo[token]; exist {
+	if userModel.ID > 0 {
 		if actionType == "1" {
 			text := c.Query("comment_text")
-			c.JSON(http.StatusOK, CommentActionResponse{Response: Response{StatusCode: 0},
-				Comment: Comment{
-					Id:         1,
-					User:       user,
-					Content:    text,
-					CreateDate: "05-01",
-				}})
-			return
+			//comment addcomment
+			responseComment := service.AddComment(text, users, videoId)
+			c.JSON(http.StatusOK,
+				dto.CommentActionResponse{
+					Response: dto.Response{StatusCode: 0},
+					Comment:  responseComment,
+				})
+		} else {
+			commentId, _ := strconv.ParseInt(c.Query("comment_id"), 10, 64)
+			//comment delete
+			model.DeleteCommnet(context.Background(), commentId)
+			c.JSON(http.StatusOK, Response{StatusCode: 0})
 		}
-		c.JSON(http.StatusOK, Response{StatusCode: 0})
 	} else {
 		c.JSON(http.StatusOK, Response{StatusCode: 1, StatusMsg: "User doesn't exist"})
 	}
 }
 
 // CommentList all videos have same demo comment list
 func CommentList(c *gin.Context) {
-	c.JSON(http.StatusOK, CommentListResponse{
-		Response:    Response{StatusCode: 0},
-		CommentList: DemoComments,
+	videoId, _ := strconv.ParseInt(c.Query("video_id"), 10, 64)
+	res, total, _ := model.QueryComment(context.Background(), videoId, 10, 0)
+	c.JSON(http.StatusOK, dto.CommentListResponse{
+		Response:    dto.Response{StatusCode: 0, StatusMsg: ""},
+		CommentList: res,
 	})
+	fmt.Println(total)
 }

controller/common.go

@@ -1,29 +1,32 @@
 package controller
 
+import "github.com/BaiZe1998/douyin-simple-demo/dto"
+
 type Response struct {
 	StatusCode int32  `json:"status_code"`
 	StatusMsg  string `json:"status_msg,omitempty"`
+	NextTime   int64  `json:"next_time,omitempty"`
 }
 
 type Video struct {
-	Id            int64  `json:"id,omitempty"`
-	Author        User   `json:"author"`
-	PlayUrl       string `json:"play_url" json:"play_url,omitempty"`
-	CoverUrl      string `json:"cover_url,omitempty"`
-	FavoriteCount int64  `json:"favorite_count,omitempty"`
-	CommentCount  int64  `json:"comment_count,omitempty"`
-	IsFavorite    bool   `json:"is_favorite,omitempty"`
+	Id            int64    `json:"id,omitempty"`
+	Author        dto.User `json:"author"`
+	PlayUrl       string   `json:"play_url" json:"play_url,omitempty"`
+	CoverUrl      string   `json:"cover_url,omitempty"`
+	FavoriteCount int64    `json:"favorite_count,omitempty"`
+	CommentCount  int64    `json:"comment_count,omitempty"`
+	IsFavorite    bool     `json:"is_favorite,omitempty"`
 }
 
 type Comment struct {
-	Id         int64  `json:"id,omitempty"`
-	User       User   `json:"user"`
-	Content    string `json:"content,omitempty"`
-	CreateDate string `json:"create_date,omitempty"`
+	Id         int64    `json:"id,omitempty"`
+	User       dto.User `json:"dto.user"`
+	Content    string   `json:"content,omitempty"`
+	CreateDate string   `json:"create_date,omitempty"`
 }
 
 type User struct {
-	Id            int64  `json:"id,omitempty"`
+	Id            string `json:"id,omitempty"`
 	Name          string `json:"name,omitempty"`
 	FollowCount   int64  `json:"follow_count,omitempty"`
 	FollowerCount int64  `json:"follower_count,omitempty"`

controller/demo_data.go

@@ -1,30 +1,45 @@
 package controller
 
+import "github.com/BaiZe1998/douyin-simple-demo/dto"
+
 var DemoVideos = []Video{
 	{
 		Id:            1,
-		Author:        DemoUser,
-		PlayUrl:       "https://www.w3schools.com/html/movie.mp4",
+		Author:        DemoUser1,
+		PlayUrl:       "http://niuyefan.oss-cn-beijing.aliyuncs.com/douyin/bear.mp4",
 		CoverUrl:      "https://cdn.pixabay.com/photo/2016/03/27/18/10/bear-1283347_1280.jpg",
-		FavoriteCount: 0,
-		CommentCount:  0,
+		FavoriteCount: 2,
+		CommentCount:  2,
 		IsFavorite:    false,
 	},
 }
 
-var DemoComments = []Comment{
-	{
-		Id:         1,
-		User:       DemoUser,
-		Content:    "Test Comment",
-		CreateDate: "05-01",
-	},
-}
+// var DemoComments = []Comment{
+// 	{
+// 		Id:         1,
+// 		User:       DemoUser1,
+// 		Content:    "Test Comment",
+// 		CreateDate: "05-01",
+// 	},
+// 	{
+// 		Id:         2,
+// 		User:       DemoUser1,
+// 		Content:    "Test Commen22",
+// 		CreateDate: "05-012",
+// 	},
+// }
 
-var DemoUser = User{
+var DemoUser1 = dto.User{
 	Id:            1,
 	Name:          "TestUser",
 	FollowCount:   0,
 	FollowerCount: 0,
 	IsFollow:      false,
 }
+var DemoUser = User{
+	Id:            "1",
+	Name:          "TestUser",
+	FollowCount:   0,
+	FollowerCount: 0,
+	IsFollow:      false,
+}

controller/favorite.go

@@ -7,13 +7,13 @@ import (
 
 // FavoriteAction no practical effect, just check if token is valid
 func FavoriteAction(c *gin.Context) {
-	token := c.Query("token")
+	//token := c.Query("token")
 
-	if _, exist := usersLoginInfo[token]; exist {
-		c.JSON(http.StatusOK, Response{StatusCode: 0})
-	} else {
-		c.JSON(http.StatusOK, Response{StatusCode: 1, StatusMsg: "User doesn't exist"})
-	}
+	//if _, exist := usersLoginInfo[token]; exist {
+	//	c.JSON(http.StatusOK, Response{StatusCode: 0})
+	//} else {
+	//	c.JSON(http.StatusOK, Response{StatusCode: 1, StatusMsg: "User doesn't exist"})
+	//}
 }
 
 // FavoriteList all users have same favorite video list

controller/feed.go

@@ -1,22 +1,25 @@
 package controller
 
 import (
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"time"
+
+	"github.com/gin-gonic/gin"
 )
 
 type FeedResponse struct {
 	Response
-	VideoList []Video `json:"video_list,omitempty"`
-	NextTime  int64   `json:"next_time,omitempty"`
+	VideoList    []Video `json:"video_list,omitempty"`
+	NextTime     int64   `json:"next_time,omitempty"`
+	CommentCount int64   `json:"comment_count,omitempty"`
 }
 
 // Feed same demo video list for every request
 func Feed(c *gin.Context) {
 	c.JSON(http.StatusOK, FeedResponse{
-		Response:  Response{StatusCode: 0},
+		Response: Response{StatusCode: 0,
+			StatusMsg: "",
+			NextTime:  time.Now().Unix()},
 		VideoList: DemoVideos,
-		NextTime:  time.Now().Unix(),
 	})
 }

controller/publish.go

@@ -1,10 +1,8 @@
 package controller
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"net/http"
-	"path/filepath"
 )
 
 type VideoListResponse struct {
@@ -14,38 +12,38 @@ type VideoListResponse struct {
 
 // Publish check token then save upload file to public directory
 func Publish(c *gin.Context) {
-	token := c.PostForm("token")
-
-	if _, exist := usersLoginInfo[token]; !exist {
-		c.JSON(http.StatusOK, Response{StatusCode: 1, StatusMsg: "User doesn't exist"})
-		return
-	}
-
-	data, err := c.FormFile("data")
-	if err != nil {
-		c.JSON(http.StatusOK, Response{
-			StatusCode: 1,
-			StatusMsg:  err.Error(),
-		})
-		return
-	}
-
-	filename := filepath.Base(data.Filename)
-	user := usersLoginInfo[token]
-	finalName := fmt.Sprintf("%d_%s", user.Id, filename)
-	saveFile := filepath.Join("./public/", finalName)
-	if err := c.SaveUploadedFile(data, saveFile); err != nil {
-		c.JSON(http.StatusOK, Response{
-			StatusCode: 1,
-			StatusMsg:  err.Error(),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, Response{
-		StatusCode: 0,
-		StatusMsg:  finalName + " uploaded successfully",
-	})
+	//token := c.PostForm("token")
+	//
+	//if _, exist := usersLoginInfo[token]; !exist {
+	//	c.JSON(http.StatusOK, Response{StatusCode: 1, StatusMsg: "User doesn't exist"})
+	//	return
+	//}
+	//
+	//data, err := c.FormFile("data")
+	//if err != nil {
+	//	c.JSON(http.StatusOK, Response{
+	//		StatusCode: 1,
+	//		StatusMsg:  err.Error(),
+	//	})
+	//	return
+	//}
+	//
+	////filename := filepath.Base(data.Filename)
+	////user := usersLoginInfo[token]
+	//finalName := fmt.Sprintf("%d_%s", user.Id, filename)
+	//saveFile := filepath.Join("./public/", finalName)
+	//if err := c.SaveUploadedFile(data, saveFile); err != nil {
+	//	c.JSON(http.StatusOK, Response{
+	//		StatusCode: 1,
+	//		StatusMsg:  err.Error(),
+	//	})
+	//	return
+	//}
+	//
+	//c.JSON(http.StatusOK, Response{
+	//	StatusCode: 0,
+	//	StatusMsg:  finalName + " uploaded successfully",
+	//})
 }
 
 // PublishList all users have same publish video list