Merge branch 'master' of https://git.banshen.xyz/huangguangrong/slow_wild_gateway

api/slow_wild.api

@@ -322,9 +322,9 @@ type (
 		Total int64         `json:"total"`
 	}
 	GetReplyListReq {
-		Page      int32 `from:"page,default=1"`
-		PageSize  int32 `from:"page_size,default=10"`
-		CommentId int64 `from:"comment_id"`
+		Page      int32 `form:"page,default=1"`
+		PageSize  int32 `form:"page_size,default=10"`
+		CommentId int64 `form:"comment_id"`
 	}
 	GetReplyListRsp {
 		List  []RepliesItem `json:"list"`
@@ -351,27 +351,27 @@ type (
 		Success bool `json:"success"`
 	}
 	GetUserPostListReq {
-		Page        int64 `from:"page,default=1"`
-		PageSize    int64 `from:"page_size,default=10"`
-		QueryUserId int64 `from:"query_user_id"`
+		Page        int64 `form:"page,default=1"`
+		PageSize    int64 `form:"page_size,default=10"`
+		QueryUserId int64 `form:"query_user_id"`
 	}
 	GetUserPostListRsp {
 		List  []GetPostListItem `json:"list"`
 		Total int64             `json:"total"`
 	}
 	GetUserPostCollectionListReq {
-		Page        int64 `from:"page,default=1"`
-		PageSize    int64 `from:"page_size,default=10"`
-		QueryUserId int64 `from:"query_user_id"`
+		Page        int64 `form:"page,default=1"`
+		PageSize    int64 `form:"page_size,default=10"`
+		QueryUserId int64 `form:"query_user_id"`
 	}
 	GetUserPostCollectionListRsp {
 		List  []GetPostListItem `json:"list"`
 		Total int64             `json:"total"`
 	}
 	GetUserPostLikeListReq {
-		Page        int64 `from:"page,default=1"`
-		PageSize    int64 `from:"page_size,default=10"`
-		QueryUserId int64 `from:"query_user_id"`
+		Page        int64 `form:"page,default=1"`
+		PageSize    int64 `form:"page_size,default=10"`
+		QueryUserId int64 `form:"query_user_id"`
 	}
 	GetUserPostLikeListRsp {
 		List  []GetPostListItem `json:"list"`

apps/internal/handler/routes.go

@@ -13,11 +13,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
 		[]rest.Route{
 			{
+				// 登录方法
 				Method:  http.MethodPost,
 				Path:    "/user/login",
 				Handler: loginHandler(serverCtx),
 			},
 			{
+				// 用户注册
 				Method:  http.MethodPost,
 				Path:    "/user/register",
 				Handler: registerHandler(serverCtx),
@@ -29,41 +31,49 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
 		[]rest.Route{
 			{
+				// 获取粉丝
 				Method:  http.MethodGet,
 				Path:    "/user/fans",
 				Handler: getFansHandler(serverCtx),
 			},
 			{
+				// 查询用户
 				Method:  http.MethodPost,
 				Path:    "/user/find",
 				Handler: findUserHandler(serverCtx),
 			},
 			{
+				// 关注用户
 				Method:  http.MethodPost,
 				Path:    "/user/follow",
 				Handler: followUserHandler(serverCtx),
 			},
 			{
+				// 获取关注列表
 				Method:  http.MethodGet,
 				Path:    "/user/follows",
 				Handler: getFollowsHandler(serverCtx),
 			},
 			{
+				// 获取用户信息
 				Method:  http.MethodGet,
 				Path:    "/user/info",
 				Handler: getUserInfoHandler(serverCtx),
 			},
 			{
+				// 获取用户信息
 				Method:  http.MethodGet,
 				Path:    "/user/profile",
 				Handler: getUserProfileHandler(serverCtx),
 			},
 			{
+				// 搜索用户
 				Method:  http.MethodGet,
 				Path:    "/user/search",
 				Handler: searchUsernameHandler(serverCtx),
 			},
 			{
+				// 取消关注用户
 				Method:  http.MethodPost,
 				Path:    "/user/unfollow",
 				Handler: unfollowUserHandler(serverCtx),
@@ -76,46 +86,55 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
 		[]rest.Route{
 			{
+				// 评论删除
 				Method:  http.MethodPost,
 				Path:    "/comment/delete",
 				Handler: commentDeleteHandler(serverCtx),
 			},
 			{
+				// 帖子收藏
 				Method:  http.MethodPost,
 				Path:    "/post/collection",
 				Handler: postCollectionHandler(serverCtx),
 			},
 			{
+				// 发布评论
 				Method:  http.MethodPost,
 				Path:    "/post/comment",
 				Handler: postCommentHandler(serverCtx),
 			},
 			{
+				// 评论点赞
 				Method:  http.MethodPost,
 				Path:    "/post/comment/upvote",
 				Handler: postCommentUpvoteHandler(serverCtx),
 			},
 			{
+				// 创建帖子
 				Method:  http.MethodPost,
 				Path:    "/post/create",
 				Handler: createPostHandler(serverCtx),
 			},
 			{
+				// 帖子删除
 				Method:  http.MethodPost,
 				Path:    "/post/delete",
 				Handler: postDeleteHandler(serverCtx),
 			},
 			{
+				// 回复评论
 				Method:  http.MethodPost,
 				Path:    "/post/reply",
 				Handler: postReplyHandler(serverCtx),
 			},
 			{
+				// 帖子分享
 				Method:  http.MethodPost,
 				Path:    "/post/share",
 				Handler: postShareHandler(serverCtx),
 			},
 			{
+				// 帖子点赞
 				Method:  http.MethodPost,
 				Path:    "/post/upvote",
 				Handler: postUpvoteHandler(serverCtx),
@@ -130,46 +149,55 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			[]rest.Middleware{serverCtx.OptionalJwtMiddleware},
 			[]rest.Route{
 				{
+					// 获取帖子详情
 					Method:  http.MethodGet,
 					Path:    "/post",
 					Handler: getPostHandler(serverCtx),
 				},
 				{
+					// 获取评论列表
 					Method:  http.MethodGet,
 					Path:    "/post/comment/list",
 					Handler: getPostCommentListHandler(serverCtx),
 				},
 				{
+					// 获取帖子列表
 					Method:  http.MethodGet,
 					Path:    "/post/list",
 					Handler: getPostListHandler(serverCtx),
 				},
 				{
+					// 获取回复列表
 					Method:  http.MethodGet,
 					Path:    "/post/reply/list",
 					Handler: getReplyListHandler(serverCtx),
 				},
 				{
+					// 获取话题详情
 					Method:  http.MethodGet,
 					Path:    "/tag",
 					Handler: getTagHandler(serverCtx),
 				},
 				{
+					// 获取话题列表
 					Method:  http.MethodGet,
 					Path:    "/tag/list",
 					Handler: getTagListHandler(serverCtx),
 				},
 				{
+					// 获取用户收藏的帖子列表
 					Method:  http.MethodGet,
 					Path:    "/user/post/collection/list",
 					Handler: getUserPostCollectionListHandler(serverCtx),
 				},
 				{
+					// 获取用户点赞的帖子列表
 					Method:  http.MethodGet,
 					Path:    "/user/post/like/list",
 					Handler: getUserPostLikeListHandler(serverCtx),
 				},
 				{
+					// 获取用户发布的帖子列表
 					Method:  http.MethodGet,
 					Path:    "/user/post/list",
 					Handler: getUserPostListHandler(serverCtx),
@@ -182,6 +210,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
 		[]rest.Route{
 			{
+				// 上传文件
 				Method:  http.MethodPost,
 				Path:    "/attachment/upload",
 				Handler: attachmentUploadHandler(serverCtx),

apps/internal/logic/getuserpostcollectionlistlogic.go

@@ -35,6 +35,9 @@ func (l *GetUserPostCollectionListLogic) GetUserPostCollectionList(req *types.Ge
 	if err != nil {
 		return nil, err
 	}
-	resp.Data = rpcResp
+	resp.Data = map[string]interface{}{
+		"list":  rpcResp.GetList(),
+		"total": rpcResp.GetTotal(),
+	}
 	return
 }

apps/internal/logic/getuserpostlikelistlogic.go

@@ -35,6 +35,9 @@ func (l *GetUserPostLikeListLogic) GetUserPostLikeList(req *types.GetUserPostLik
 	if err != nil {
 		return nil, err
 	}
-	resp.Data = rpcResp
+	resp.Data = map[string]interface{}{
+		"list":  rpcResp.GetList(),
+		"total": rpcResp.GetTotal(),
+	}
 	return
 }

apps/internal/logic/getuserpostlistlogic.go

@@ -35,6 +35,9 @@ func (l *GetUserPostListLogic) GetUserPostList(req *types.GetUserPostListReq) (r
 	if err != nil {
 		return nil, err
 	}
-	resp.Data = rpcResp
+	resp.Data = map[string]interface{}{
+		"list":  rpcResp.GetList(),
+		"total": rpcResp.GetTotal(),
+	}
 	return
 }

apps/internal/logic/getuserprofilelogic.go

@@ -2,11 +2,14 @@ package logic
 
 import (
 	"context"
+	"encoding/json"
 
+	"slow_wild_api/apps/internal/constants"
 	"slow_wild_api/apps/internal/svc"
 	"slow_wild_api/apps/internal/types"
 
 	"git.banshen.xyz/huangguangrong/slow_wild_protobuff/slowwild/slowwildserver"
+	"github.com/spf13/cast"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -27,8 +30,9 @@ func NewGetUserProfileLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
 
 func (l *GetUserProfileLogic) GetUserProfile(req *types.GetUserProfileReq) (resp *types.BaseReturnData, err error) {
 	resp = &types.BaseReturnData{}
+	userId := l.ctx.Value(constants.UserIdKey).(json.Number)
 	rpcResp, err := l.svcCtx.SlowWildPb.GetUserProfile(l.ctx, &slowwildserver.GetUserProfileReq{
-		UserId: req.UserId,
+		UserId: cast.ToInt64(userId),
 	})
 	if err != nil {
 		return nil, err

apps/internal/types/types.go

@@ -174,9 +174,9 @@ type GetPostRsp struct {
 }
 
 type GetReplyListReq struct {
-	Page      int32 `from:"page,default=1"`
-	PageSize  int32 `from:"page_size,default=10"`
-	CommentId int64 `from:"comment_id"`
+	Page      int32 `form:"page,default=1"`
+	PageSize  int32 `form:"page_size,default=10"`
+	CommentId int64 `form:"comment_id"`
 }
 
 type GetReplyListRsp struct {
@@ -224,9 +224,9 @@ type GetUserInfoResp struct {
 }
 
 type GetUserPostCollectionListReq struct {
-	Page        int64 `from:"page,default=1"`
-	PageSize    int64 `from:"page_size,default=10"`
-	QueryUserId int64 `from:"query_user_id"`
+	Page        int64 `form:"page,default=1"`
+	PageSize    int64 `form:"page_size,default=10"`
+	QueryUserId int64 `form:"query_user_id"`
 }
 
 type GetUserPostCollectionListRsp struct {
@@ -235,9 +235,9 @@ type GetUserPostCollectionListRsp struct {
 }
 
 type GetUserPostLikeListReq struct {
-	Page        int64 `from:"page,default=1"`
-	PageSize    int64 `from:"page_size,default=10"`
-	QueryUserId int64 `from:"query_user_id"`
+	Page        int64 `form:"page,default=1"`
+	PageSize    int64 `form:"page_size,default=10"`
+	QueryUserId int64 `form:"query_user_id"`
 }
 
 type GetUserPostLikeListRsp struct {
@@ -246,9 +246,9 @@ type GetUserPostLikeListRsp struct {
 }
 
 type GetUserPostListReq struct {
-	Page        int64 `from:"page,default=1"`
-	PageSize    int64 `from:"page_size,default=10"`
-	QueryUserId int64 `from:"query_user_id"`
+	Page        int64 `form:"page,default=1"`
+	PageSize    int64 `form:"page_size,default=10"`
+	QueryUserId int64 `form:"query_user_id"`
 }
 
 type GetUserPostListRsp struct {

go.mod

@@ -57,6 +57,7 @@ require (
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/redis/go-redis/v9 v9.7.1 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/spf13/cast v1.7.1
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.62
 	go.etcd.io/etcd/api/v3 v3.5.15 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect

go.sum

@@ -140,6 +140,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=