🎨 remove ent orm & add xorm

app/core/api/internal/logic/comment/get_comment_list_logic.go

@@ -3,11 +3,10 @@ package comment
 import (
 	"context"
 
-	"schisandra-album-cloud-microservices/app/core/api/common/response"
+	"github.com/zeromicro/go-zero/core/logx"
+
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
-
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetCommentListLogic struct {
@@ -25,7 +24,12 @@ func NewGetCommentListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
 }
 
 func (l *GetCommentListLogic) GetCommentList(req *types.CommentListRequest) (resp *types.Response, err error) {
-	// todo: add your logic here and delete this line
+	// 获取用户ID
+	// uid, ok := l.ctx.Value("user_id").(string)
+	// if !ok {
+	// 	return nil, errors.New("user_id not found in context")
+	// }
 
-	return response.Success(), nil
+	// 查询评论列表
+	return
 }

app/core/api/internal/logic/comment/submit_comment_logic.go

@@ -14,6 +14,7 @@ import (
 	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -57,11 +58,14 @@ func (l *SubmitCommentLogic) SubmitComment(r *http.Request, req *types.CommentRe
 	browser, _ := ua.Browser()
 	operatingSystem := ua.OS()
 	isAuthor := 0
-	session, wrong := l.svcCtx.Session.Get(r, constant.SESSION_KEY)
-	if wrong == nil {
-		return nil, wrong
+	session, err := l.svcCtx.Session.Get(r, constant.SESSION_KEY)
+	if err == nil {
+		return nil, err
+	}
+	uid, ok := session.Values["uid"].(string)
+	if !ok {
+		return nil, errors.New("uid not found in session")
 	}
-	uid := session.Values["uid"].(string)
 	if uid == req.Author {
 		isAuthor = 1
 	}
@@ -70,39 +74,36 @@ func (l *SubmitCommentLogic) SubmitComment(r *http.Request, req *types.CommentRe
 		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
 	}
 	commentContent := l.svcCtx.Sensitive.Replace(xssFilterContent, '*')
-	comment, err := l.svcCtx.MySQLClient.ScaCommentReply.Create().
-		SetContent(commentContent).
-		SetUserID(uid).
-		SetTopicID(req.TopicId).
-		SetCommentType(constant.CommentTopicType).
-		SetCommentType(constant.COMMENT).
-		SetAuthor(isAuthor).
-		SetCommentIP(ip).
-		SetLocation(location).
-		SetBrowser(browser).
-		SetOperatingSystem(operatingSystem).
-		SetAgent(userAgent).Save(l.ctx)
+	comment := model.ScaCommentReply{
+		Content:         commentContent,
+		UserId:          uid,
+		TopicId:         req.TopicId,
+		TopicType:       constant.CommentTopicType,
+		CommentType:     constant.COMMENT,
+		Author:          isAuthor,
+		CommentIp:       ip,
+		Location:        location,
+		Browser:         browser,
+		OperatingSystem: operatingSystem,
+		Agent:           userAgent,
+	}
+	affected, err := l.svcCtx.DB.InsertOne(&comment)
 	if err != nil {
 		return nil, err
 	}
+	if affected == 0 {
+		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
+	}
+
 	if len(req.Images) > 0 {
-		imagesDataCh := make(chan [][]byte)
-		go func() {
-			imagesData, err := utils.ProcessImages(req.Images)
-			if err != nil {
-				imagesDataCh <- nil
-				return
-			}
-			imagesDataCh <- imagesData
-		}()
-		imagesData := <-imagesDataCh
-		if imagesData == nil {
-			return nil, errors.New("process images failed")
+		imagesData, err := utils.ProcessImages(req.Images)
+		if err != nil {
+			return nil, err
 		}
 		commentImages := types.CommentImages{
 			UserId:    uid,
 			TopicId:   req.TopicId,
-			CommentId: comment.ID,
+			CommentId: comment.Id,
 			Images:    imagesData,
 			CreatedAt: comment.CreatedAt.String(),
 		}
@@ -111,7 +112,7 @@ func (l *SubmitCommentLogic) SubmitComment(r *http.Request, req *types.CommentRe
 		}
 	}
 	commentResponse := types.CommentResponse{
-		Id:              comment.ID,
+		Id:              comment.Id,
 		Content:         commentContent,
 		UserId:          uid,
 		TopicId:         req.TopicId,

app/core/api/internal/logic/comment/submit_reply_comment_logic.go

@@ -2,7 +2,9 @@ package comment
 
 import (
 	"context"
+	"errors"
 	"net/http"
+	"time"
 
 	"github.com/mssola/useragent"
 
@@ -12,6 +14,7 @@ import (
 	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -53,20 +56,96 @@ func (l *SubmitReplyCommentLogic) SubmitReplyComment(r *http.Request, req *types
 
 	browser, _ := ua.Browser()
 	operatingSystem := ua.OS()
-	isAuthor := 0
-	session, wrong := l.svcCtx.Session.Get(r, constant.SESSION_KEY)
-	if wrong == nil {
-		return nil, wrong
+	session, err := l.svcCtx.Session.Get(r, constant.SESSION_KEY)
+	if err != nil {
+		return nil, err
 	}
-	uid := session.Values["uid"].(string)
+
+	uid, ok := session.Values["uid"].(string)
+	if !ok {
+		return nil, errors.New("uid not found in session")
+	}
+	isAuthor := 0
 	if uid == req.Author {
 		isAuthor = 1
 	}
+
 	xssFilterContent := utils.XssFilter(req.Content)
 	if xssFilterContent == "" {
 		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
 	}
 	commentContent := l.svcCtx.Sensitive.Replace(xssFilterContent, '*')
 
-	return
+	tx := l.svcCtx.DB.NewSession()
+	defer tx.Close()
+	if err = tx.Begin(); err != nil {
+		return nil, err
+	}
+
+	reply := model.ScaCommentReply{
+		Content:         commentContent,
+		UserId:          uid,
+		TopicId:         req.TopicId,
+		TopicType:       constant.CommentTopicType,
+		CommentType:     constant.COMMENT,
+		Author:          isAuthor,
+		CommentIp:       ip,
+		Location:        location,
+		Browser:         browser,
+		OperatingSystem: operatingSystem,
+		Agent:           userAgent,
+		ReplyId:         req.ReplyId,
+		ReplyUser:       req.ReplyUser,
+	}
+	affected, err := tx.Insert(&reply)
+	if err != nil {
+		return nil, err
+	}
+	if affected == 0 {
+		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
+	}
+	update, err := tx.Table(model.ScaCommentReply{}).Where("id = ? and deleted = 0", req.ReplyId).Incr("reply_count", 1).Update(nil)
+	if err != nil {
+		return nil, err
+	}
+	if update == 0 {
+		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
+	}
+
+	if len(req.Images) > 0 {
+		imagesData, err := utils.ProcessImages(req.Images)
+		if err != nil {
+			return nil, err
+		}
+
+		commentImages := types.CommentImages{
+			UserId:    uid,
+			TopicId:   req.TopicId,
+			CommentId: reply.Id,
+			Images:    imagesData,
+			CreatedAt: reply.CreatedAt.String(),
+		}
+		if _, err = l.svcCtx.MongoClient.Collection("comment_images").InsertOne(l.ctx, commentImages); err != nil {
+			return nil, err
+		}
+	}
+
+	commentResponse := types.CommentResponse{
+		Id:              reply.Id,
+		Content:         commentContent,
+		UserId:          uid,
+		TopicId:         reply.TopicId,
+		Author:          isAuthor,
+		Location:        location,
+		Browser:         browser,
+		OperatingSystem: operatingSystem,
+		CreatedTime:     time.Now(),
+		ReplyId:         reply.ReplyId,
+		ReplyUser:       reply.ReplyUser,
+	}
+	err = tx.Commit()
+	if err != nil {
+		return nil, err
+	}
+	return response.SuccessWithData(commentResponse), nil
 }

app/core/api/internal/logic/comment/submit_reply_reply_logic.go

@@ -2,9 +2,19 @@ package comment
 
 import (
 	"context"
+	"errors"
+	"net/http"
+	"time"
 
+	"github.com/mssola/useragent"
+
+	"schisandra-album-cloud-microservices/app/core/api/common/captcha/verify"
+	"schisandra-album-cloud-microservices/app/core/api/common/constant"
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
+	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -23,8 +33,133 @@ func NewSubmitReplyReplyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 	}
 }
 
-func (l *SubmitReplyReplyLogic) SubmitReplyReply(req *types.ReplyReplyRequest) (resp *types.Response, err error) {
-	// todo: add your logic here and delete this line
+func (l *SubmitReplyReplyLogic) SubmitReplyReply(r *http.Request, req *types.ReplyReplyRequest) (resp *types.Response, err error) {
+	// 验证验证码
+	if !verify.VerifySlideCaptcha(l.ctx, l.svcCtx.RedisClient, req.Point, req.Key) {
+		return response.ErrorWithI18n(l.ctx, "captcha.verificationFailure"), nil
+	}
 
-	return
+	// 检查图片数量
+	if len(req.Images) > 3 {
+		return response.ErrorWithI18n(l.ctx, "comment.tooManyImages"), nil
+	}
+
+	// 获取用户代理
+	userAgent := r.Header.Get("User-Agent")
+	if userAgent == "" {
+		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
+	}
+	ua := useragent.New(userAgent)
+
+	// 获取客户端IP及位置信息
+	ip := utils.GetClientIP(r)
+	location, err := l.svcCtx.Ip2Region.SearchByStr(ip)
+	if err != nil {
+		return nil, err
+	}
+	location = utils.RemoveZeroAndAdjust(location)
+
+	// 获取浏览器与操作系统信息
+	browser, _ := ua.Browser()
+	operatingSystem := ua.OS()
+
+	// 获取用户会话信息
+	session, err := l.svcCtx.Session.Get(r, constant.SESSION_KEY)
+	if err != nil {
+		return nil, err
+	}
+	uid, ok := session.Values["uid"].(string)
+	if !ok {
+		return nil, errors.New("uid not found in session")
+	}
+
+	// 判断作者身份
+	isAuthor := 0
+	if uid == req.Author {
+		isAuthor = 1
+	}
+
+	// XSS过滤
+	xssFilterContent := utils.XssFilter(req.Content)
+	if xssFilterContent == "" {
+		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
+	}
+	commentContent := l.svcCtx.Sensitive.Replace(xssFilterContent, '*')
+
+	tx := l.svcCtx.DB.NewSession()
+	defer tx.Close()
+	if err = tx.Begin(); err != nil {
+		return nil, err
+	}
+
+	replyReply := model.ScaCommentReply{
+		Content:         commentContent,
+		UserId:          uid,
+		TopicId:         req.TopicId,
+		TopicType:       constant.CommentTopicType,
+		CommentType:     constant.COMMENT,
+		Author:          isAuthor,
+		CommentIp:       ip,
+		Location:        location,
+		Browser:         browser,
+		OperatingSystem: operatingSystem,
+		Agent:           userAgent,
+		ReplyId:         req.ReplyId,
+		ReplyUser:       req.ReplyUser,
+		ReplyTo:         req.ReplyTo,
+	}
+	affected, err := tx.Insert(&replyReply)
+	if err != nil {
+		return nil, err
+	}
+	if affected == 0 {
+		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
+	}
+	update, err := tx.Table(model.ScaCommentReply{}).Where("id = ? and version = ? and deleted = 0", req.ReplyId, replyReply.Version).Incr("reply_count", 1).Update(nil)
+	if err != nil {
+		return nil, err
+	}
+	if update == 0 {
+		return response.ErrorWithI18n(l.ctx, "comment.commentError"), nil
+	}
+
+	// 处理图片
+	if len(req.Images) > 0 {
+		imagesData, err := utils.ProcessImages(req.Images)
+		if err != nil {
+			return nil, err
+		}
+		commentImages := types.CommentImages{
+			UserId:    uid,
+			TopicId:   req.TopicId,
+			CommentId: replyReply.Id,
+			Images:    imagesData,
+			CreatedAt: replyReply.CreatedAt.String(),
+		}
+		if _, err = l.svcCtx.MongoClient.Collection("comment_images").InsertOne(l.ctx, commentImages); err != nil {
+			return nil, err
+		}
+	}
+
+	// 构建响应
+	commentResponse := types.CommentResponse{
+		Id:              replyReply.Id,
+		Content:         commentContent,
+		UserId:          uid,
+		TopicId:         replyReply.TopicId,
+		Author:          isAuthor,
+		Location:        location,
+		Browser:         browser,
+		OperatingSystem: operatingSystem,
+		CreatedTime:     time.Now(),
+		ReplyId:         replyReply.ReplyId,
+		ReplyUser:       replyReply.ReplyUser,
+		ReplyTo:         replyReply.ReplyTo,
+	}
+
+	// 提交事务
+	if err = tx.Commit(); err != nil {
+		return nil, err
+	}
+	return response.SuccessWithData(commentResponse), nil
 }