From f5921b9c56a9be75eef5c118fe31b533278cee8c Mon Sep 17 00:00:00 2001 From: doper <849805465@qq.com> Date: Sun, 27 Nov 2022 13:33:01 +0800 Subject: [PATCH 1/3] perf(server): exit if http server start failed --- handler/server.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/handler/server.go b/handler/server.go index 796ac598..6f02706d 100644 --- a/handler/server.go +++ b/handler/server.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "net/http" + "os" "strconv" "github.com/gin-gonic/gin" @@ -207,7 +208,10 @@ func (s *Server) Run(ctx context.Context) error { } go func() { if err := s.HttpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed { + // print err info when httpServer start failed s.logger.Error("unexpected error from ListenAndServe", zap.Error(err)) + fmt.Printf("http server start error:%s\n", err.Error()) + os.Exit(1) } }() return nil From 57a6ce4f4d51e0601b8754502b2ac8476751fa29 Mon Sep 17 00:00:00 2001 From: doper <849805465@qq.com> Date: Sun, 4 Dec 2022 12:43:14 +0800 Subject: [PATCH 2/3] fix(comment): fix update post commentStatus error --- handler/admin/comment_post.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/handler/admin/comment_post.go b/handler/admin/comment_post.go index 7e1cd9e1..3e65734e 100644 --- a/handler/admin/comment_post.go +++ b/handler/admin/comment_post.go @@ -213,7 +213,11 @@ func (p *PostCommentHandler) UpdatePostCommentStatus(ctx *gin.Context) (interfac } func (p *PostCommentHandler) UpdatePostCommentStatusBatch(ctx *gin.Context) (interface{}, error) { - status, err := util.ParamInt32(ctx, "status") + strStatus, err := util.ParamString(ctx, "status") + if err != nil { + return nil, err + } + status, err := consts.CommentStatusFromString(strStatus) if err != nil { return nil, err } @@ -223,7 +227,7 @@ func (p *PostCommentHandler) UpdatePostCommentStatusBatch(ctx *gin.Context) (int if err != nil { return nil, xerr.WithStatus(err, xerr.StatusBadRequest).WithMsg("post ids error") } - comments, err := p.PostCommentService.UpdateStatusBatch(ctx, ids, consts.CommentStatus(status)) + comments, err := p.PostCommentService.UpdateStatusBatch(ctx, ids, status) if err != nil { return nil, err } From 738b1e774eec7cdc29b3eda407e448fe9b58d129 Mon Sep 17 00:00:00 2001 From: doper <849805465@qq.com> Date: Sun, 4 Dec 2022 17:32:23 +0800 Subject: [PATCH 3/3] fix(comment): fix delete comment batch error --- service/impl/comment_base.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/service/impl/comment_base.go b/service/impl/comment_base.go index 1d556d9c..3fd90ae3 100644 --- a/service/impl/comment_base.go +++ b/service/impl/comment_base.go @@ -2,7 +2,6 @@ package impl import ( "context" - "gorm.io/gen/field" "github.com/go-sonic/sonic/consts" @@ -108,7 +107,7 @@ func (b baseCommentServiceImpl) DeleteBatch(ctx context.Context, commentIDs []in if err != nil { return WrapDBErr(err) } - if deleteResult.RowsAffected != 1 { + if deleteResult.RowsAffected != int64(len(commentIDs)) { return xerr.NoType.New("").WithMsg("delete comment failed") } return nil