Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss into dev

@@ -521,6 +521,7 @@ type (
 		ArticleId   int64     `json:"articleId"`
 		ArticleId   int64     `json:"articleId"`
 		Title       string    `json:"title"`
 		Title       string    `json:"title"`
 		Author      string    `json:"author"` // 发布人
 		Author      string    `json:"author"` // 发布人
+		Avatar 	    string    `json:"avatar"`// 发布人的头像
 		Images      []string  `json:"images"`
 		Images      []string  `json:"images"`
 		CreatedAt   int64     `json:"createdAt"`
 		CreatedAt   int64     `json:"createdAt"`
 		MeReadFlag  int       `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]
 		MeReadFlag  int       `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 获取所有的标签
 func MiniAllArticleTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniAllArticleTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniAllArticleTagRequest
 		var req types.MiniAllArticleTagRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 获取文章的编辑记录
 func MiniArticleBackupSearchHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniArticleBackupSearchHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleBackupSearchRequest
 		var req types.MiniArticleBackupSearchRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/api/internal/types"
 )
 )
 
 
+// 获取我的文章浏览记录
 func MiniArticleMarkListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniArticleMarkListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleMarkListRequest
 		var req types.MiniArticleMarkListRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 获取我发布的文章
 func MiniArticleSearchMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniArticleSearchMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleSearchMeRequest
 		var req types.MiniArticleSearchMeRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 设置文章的定性标签
 func MiniArticleSetTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniArticleSetTagHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleSetTagRequest
 		var req types.MiniArticleSetTagRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 保存文章进草稿箱
 func MiniCreateArticleDraftHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniCreateArticleDraftHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftCreateRequest
 		var req types.MiniArticleDraftCreateRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 发布新的文章
 func MiniCreateArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniCreateArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleCreateRequest
 		var req types.MiniArticleCreateRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 删除文章的草稿箱
 func MiniDeleteArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniDeleteArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftDeleteMeRequest
 		var req types.MiniArticleDraftDeleteMeRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 获取我的文章草稿内容
 func MiniGetArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniGetArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftGetMeRequest
 		var req types.MiniArticleDraftGetMeRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 小程序端展示文章内容
 func MiniGetArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniGetArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleGetRequest
 		var req types.MiniArticleGetRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 查询我的草稿箱内容列表
 func MiniSearchArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniSearchArticleDraftMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftSearchMeRequest
 		var req types.MiniArticleDraftSearchMeRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 设置文章\评论的点赞操作
 func MiniSetUserLikeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniSetUserLikeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniSetUserLikeRequset
 		var req types.MiniSetUserLikeRequset

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 更新文章草稿箱的内容
 func MiniUpdateArticleDraftHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniUpdateArticleDraftHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleDraftUpdateRequest
 		var req types.MiniArticleDraftUpdateRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 获取点赞文章的的人员列表
 func MiniUserLikeArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniUserLikeArticleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniUserLikeArticleRequest
 		var req types.MiniUserLikeArticleRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 填写评估时@谁 的可选择者列表
 func MiniArticleCommentAtWhoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniArticleCommentAtWhoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniArticleCommentAtWhoRequest
 		var req types.MiniArticleCommentAtWhoRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 填写评论
 func MiniCreateArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniCreateArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniCreateArticleCommentRequest
 		var req types.MiniCreateArticleCommentRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 小程序端人员删除评论
 func MiniDeleteArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniDeleteArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniDeleteArticleCommentRequest
 		var req types.MiniDeleteArticleCommentRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 获取单条评论详情
 func MiniGetArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniGetArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniGetArticleCommentRequest
 		var req types.MiniGetArticleCommentRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 小程序端获取 根据文章id 获取评论列表
 func MiniListArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniListArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniListArticleCommentRequest
 		var req types.MiniListArticleCommentRequest

@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/result"
 )
 )
 
 
+// 获取前5的评论
 func MiniTop5ArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 func MiniTop5ArticleCommentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		var req types.MiniTop5ArticleCommentRequest
 		var req types.MiniTop5ArticleCommentRequest

@@ -25,6 +25,7 @@ func NewMiniSearchArticleDraftMeLogic(ctx context.Context, svcCtx *svc.ServiceCo
 	}
 	}
 }
 }
 
 
+// 查询我的草稿箱内容列表
 func (l *MiniSearchArticleDraftMeLogic) MiniSearchArticleDraftMe(req *types.MiniArticleDraftSearchMeRequest) (resp *types.MiniArticleDraftSearchMeResponse, err error) {
 func (l *MiniSearchArticleDraftMeLogic) MiniSearchArticleDraftMe(req *types.MiniArticleDraftSearchMeRequest) (resp *types.MiniArticleDraftSearchMeResponse, err error) {
 	var conn = l.svcCtx.DefaultDBConn()
 	var conn = l.svcCtx.DefaultDBConn()
 
 

@@ -61,15 +61,16 @@ func (l *MiniSearchArticlePageLogic) MiniSearchArticlePage(req *types.MiniSearch
 	}
 	}
 
 
 	for i, val := range articleList {
 	for i, val := range articleList {
-
 		item := types.MiniSearchArticleItem{
 		item := types.MiniSearchArticleItem{
 			ArticleId:  val.Id,
 			ArticleId:  val.Id,
 			Title:      val.Title,
 			Title:      val.Title,
 			Author:     val.Author.Name,
 			Author:     val.Author.Name,
+			Avatar:     val.Author.Avatar,
 			Images:     []string{},
 			Images:     []string{},
 			CreatedAt:  val.CreatedAt,
 			CreatedAt:  val.CreatedAt,
 			MeReadFlag: 0,
 			MeReadFlag: 0,
 		}
 		}
+
 		if _, ok := readFlag[val.Id]; ok {
 		if _, ok := readFlag[val.Id]; ok {
 			item.MeReadFlag = 1
 			item.MeReadFlag = 1
 		}
 		}

@@ -26,6 +26,7 @@ func NewMiniUpdateArticleDraftLogic(ctx context.Context, svcCtx *svc.ServiceCont
 	}
 	}
 }
 }
 
 
+// 更新文章草稿箱的内容
 func (l *MiniUpdateArticleDraftLogic) MiniUpdateArticleDraft(req *types.MiniArticleDraftUpdateRequest) (resp *types.MiniArticleDraftUpdateResponse, err error) {
 func (l *MiniUpdateArticleDraftLogic) MiniUpdateArticleDraft(req *types.MiniArticleDraftUpdateRequest) (resp *types.MiniArticleDraftUpdateResponse, err error) {
 	var conn = l.svcCtx.DefaultDBConn()
 	var conn = l.svcCtx.DefaultDBConn()
 
 

@@ -2,6 +2,7 @@ package article
 
 
 import (
 import (
 	"context"
 	"context"
+
 	"github.com/samber/lo"
 	"github.com/samber/lo"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
@@ -26,6 +27,7 @@ func NewSystemArticleGetHistoryLogic(ctx context.Context, svcCtx *svc.ServiceCon
 	}
 	}
 }
 }
 
 
+// 获取文章的编辑历史记录详情
 func (l *SystemArticleGetHistoryLogic) SystemArticleGetHistory(req *types.SystemArticleGetHistoryRequest) (resp *types.SystemArticleGetHistoryResponse, err error) {
 func (l *SystemArticleGetHistoryLogic) SystemArticleGetHistory(req *types.SystemArticleGetHistoryRequest) (resp *types.SystemArticleGetHistoryResponse, err error) {
 	var conn = l.svcCtx.DefaultDBConn()
 	var conn = l.svcCtx.DefaultDBConn()
 	backup, err := l.svcCtx.ArticleBackupRepository.FindOne(l.ctx, conn, req.Id)
 	backup, err := l.svcCtx.ArticleBackupRepository.FindOne(l.ctx, conn, req.Id)

@@ -2,6 +2,7 @@ package comment
 
 
 import (
 import (
 	"context"
 	"context"
+
 	"github.com/samber/lo"
 	"github.com/samber/lo"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/cmd/discuss/interanl/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
 	"gitlab.fjmaimaimai.com/allied-creation/sumifcc-discuss/pkg/xerr"
@@ -26,6 +27,7 @@ func NewSystemArticleCommentSearchLogic(ctx context.Context, svcCtx *svc.Service
 	}
 	}
 }
 }
 
 
+// 搜索文章的评论
 func (l *SystemArticleCommentSearchLogic) SystemArticleCommentSearch(req *types.SystemArticleCommentSearchRequest) (resp *types.SystemArticleCommentSearchResponse, err error) {
 func (l *SystemArticleCommentSearchLogic) SystemArticleCommentSearch(req *types.SystemArticleCommentSearchRequest) (resp *types.SystemArticleCommentSearchResponse, err error) {
 	var conn = l.svcCtx.DefaultDBConn()
 	var conn = l.svcCtx.DefaultDBConn()
 	queryOptions := domain.NewQueryOptions().
 	queryOptions := domain.NewQueryOptions().

@@ -24,6 +24,7 @@ func NewSystemGetAticleCommentLogic(ctx context.Context, svcCtx *svc.ServiceCont
 	}
 	}
 }
 }
 
 
+// 后台获取文章的评论详情
 func (l *SystemGetAticleCommentLogic) SystemGetAticleComment(req *types.SystemGetCommentRequest) (resp *types.SystemGetCommentResponse, err error) {
 func (l *SystemGetAticleCommentLogic) SystemGetAticleComment(req *types.SystemGetCommentRequest) (resp *types.SystemGetCommentResponse, err error) {
 	var conn = l.svcCtx.DefaultDBConn()
 	var conn = l.svcCtx.DefaultDBConn()
 
 

@@ -1223,6 +1223,7 @@ type MiniSearchArticleItem struct {
 	ArticleId  int64    `json:"articleId"`
 	ArticleId  int64    `json:"articleId"`
 	Title      string   `json:"title"`
 	Title      string   `json:"title"`
 	Author     string   `json:"author"` // 发布人
 	Author     string   `json:"author"` // 发布人
+	Avatar 	   string   `json:"avatar"`
 	Images     []string `json:"images"`
 	Images     []string `json:"images"`
 	CreatedAt  int64    `json:"createdAt"`
 	CreatedAt  int64    `json:"createdAt"`
 	MeReadFlag int      `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]
 	MeReadFlag int      `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]