Merge pull request #20 from CloudStriver/fix/新增删除评论区和评论的所有关系

CloudStriver · Apr 6, 2024 · b7090c0 · b7090c0
2 parents 3a00c41 + d588e39
commit b7090c0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/app/mq/deleteCommentRelation.go b/app/mq/deleteCommentRelation.go
@@ -6,8 +6,7 @@ import (
 	"github.com/CloudStriver/cloudmind-mq/app/util/message"
 	"github.com/CloudStriver/go-pkg/utils/pconvertor"
 	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/basic"
-	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform/comment"
-	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform/relation"
+	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform"
 	"github.com/bytedance/sonic"
 	"github.com/samber/lo"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -33,7 +32,7 @@ func (l *DeleteCommentRelationMq) Consume(_, value string) error {
 		return err
 	}
 
-	_, err := l.svcCtx.RelationRPC.DeleteNode(l.ctx, &relation.DeleteNodeReq{
+	_, err := l.svcCtx.PlatformRPC.DeleteNode(l.ctx, &platform.DeleteNodeReq{
 		NodeId:   msg.FromId,
 		NodeType: msg.FromType,
 	})
@@ -43,9 +42,9 @@ func (l *DeleteCommentRelationMq) Consume(_, value string) error {
 	}
 
 	for {
-		var res *comment.GetCommentListResp
-		res, err = l.svcCtx.CommentRPC.GetCommentList(l.ctx, &comment.GetCommentListReq{
-			FilterOptions: &comment.CommentFilterOptions{
+		var res *platform.GetCommentListResp
+		res, err = l.svcCtx.PlatformRPC.GetCommentList(l.ctx, &platform.GetCommentListReq{
+			FilterOptions: &platform.CommentFilterOptions{
 				OnlySubjectId: lo.ToPtr(msg.FromId),
 			},
 			Pagination: &basic.PaginationOptions{
@@ -61,18 +60,18 @@ func (l *DeleteCommentRelationMq) Consume(_, value string) error {
 		}
 
 		err = mr.Finish(func() error {
-			ids := lo.Map(res.Comments, func(val *comment.CommentInfo, _ int) string {
+			ids := lo.Map(res.Comments, func(val *platform.CommentInfo, _ int) string {
 				return val.Id
 			})
-			_, err1 := l.svcCtx.CommentRPC.DeleteCommentByIds(l.ctx, &comment.DeleteCommentByIdsReq{Ids: ids})
+			_, err1 := l.svcCtx.PlatformRPC.DeleteCommentByIds(l.ctx, &platform.DeleteCommentByIdsReq{Ids: ids})
 			if err1 != nil {
 				logx.Errorf("DeleteCommentRelationMq->Consume DeleteCommentByIds err : %v , val : %s", err1, ids)
 				return err1
 			}
 			return nil
 		}, func() error {
 			for _, val := range res.Comments {
-				_, err2 := l.svcCtx.RelationRPC.DeleteNode(l.ctx, &relation.DeleteNodeReq{
+				_, err2 := l.svcCtx.PlatformRPC.DeleteNode(l.ctx, &platform.DeleteNodeReq{
 					NodeId:   val.Id,
 					NodeType: msg.FromType,
 				})

diff --git a/app/mq/deleteFileRelation.go b/app/mq/deleteFileRelation.go
@@ -5,7 +5,7 @@ import (
 	"github.com/CloudStriver/cloudmind-mq/app/svc"
 	"github.com/CloudStriver/cloudmind-mq/app/util/message"
 	"github.com/CloudStriver/go-pkg/utils/pconvertor"
-	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform/relation"
+	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform"
 	"github.com/bytedance/sonic"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -30,7 +30,7 @@ func (l *DeleteFileRelationMq) Consume(_, value string) error {
 	}
 
 	for _, v := range msg.FromIds {
-		_, err := l.svcCtx.RelationRPC.DeleteNode(l.ctx, &relation.DeleteNodeReq{
+		_, err := l.svcCtx.PlatformRPC.DeleteNode(l.ctx, &platform.DeleteNodeReq{
 			NodeId:   v,
 			NodeType: msg.FromType,
 		})

diff --git a/app/svc/serviceContext.go b/app/svc/serviceContext.go
@@ -5,24 +5,21 @@ import (
 	"github.com/CloudStriver/go-pkg/utils/kitex/client"
 	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/cloudmind/content/contentservice"
 	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/cloudmind/system/systemservice"
-	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform/comment/commentservice"
-	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform/relation/relationservice"
+	"github.com/CloudStriver/service-idl-gen-go/kitex_gen/platform/platformservice"
 )
 
 type ServiceContext struct {
 	Config              config.Config
 	CloudMindSystemRPC  systemservice.Client
 	CloudMindContentRPC contentservice.Client
-	RelationRPC         relationservice.Client
-	CommentRPC          commentservice.Client
+	PlatformRPC         platformservice.Client
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:              c,
 		CloudMindSystemRPC:  client.NewClient(c.Name, "cloudmind-system", systemservice.NewClient),
 		CloudMindContentRPC: client.NewClient(c.Name, "cloudmind-content", contentservice.NewClient),
-		CommentRPC:          client.NewClient(c.Name, "platform-comment", commentservice.NewClient),
-		RelationRPC:         client.NewClient(c.Name, "platform-relation", relationservice.NewClient),
+		PlatformRPC:         client.NewClient(c.Name, "platform", platformservice.NewClient),
 	}
 }
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/CloudStriver/go-pkg v0.0.0-20240206060942-84060a3dd273
-	github.com/CloudStriver/service-idl-gen-go v0.0.0-20240406082442-939ea3e0c24f
+	github.com/CloudStriver/service-idl-gen-go v0.0.0-20240406140558-0b39494165c0
 	github.com/bytedance/sonic v1.10.2
 	github.com/cloudwego/kitex v0.8.0
 	github.com/samber/lo v1.39.0

diff --git a/go.sum b/go.sum
@@ -375,8 +375,8 @@ github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHg
 github.com/ClickHouse/clickhouse-go/v2 v2.0.14/go.mod h1:iq2DUGgpA4BBki2CVwrF8x43zqBjdgHtbexkFkh5a6M=
 github.com/CloudStriver/go-pkg v0.0.0-20240206060942-84060a3dd273 h1:lWVL1fCa0QJg9gvE926r1YJZR8DoxupPpbZr3TunJDM=
 github.com/CloudStriver/go-pkg v0.0.0-20240206060942-84060a3dd273/go.mod h1:SsAxWs5EIcaDE/0e5buoFOWsM4lTvFZhySkV68+RT3g=
-github.com/CloudStriver/service-idl-gen-go v0.0.0-20240406082442-939ea3e0c24f h1:cF4lveykuUUFNtR0WZodv1ROXzVxHU2jFsOipq2A5iY=
-github.com/CloudStriver/service-idl-gen-go v0.0.0-20240406082442-939ea3e0c24f/go.mod h1:chtR82RvfrjUujTGWROSCNAwF9Lh/U959k34bXIDvBI=
+github.com/CloudStriver/service-idl-gen-go v0.0.0-20240406140558-0b39494165c0 h1:y2ABwBsTxL6vmJFe5dbWw+uIsbK3hRXW3rkU14AoAlM=
+github.com/CloudStriver/service-idl-gen-go v0.0.0-20240406140558-0b39494165c0/go.mod h1:chtR82RvfrjUujTGWROSCNAwF9Lh/U959k34bXIDvBI=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=