Merge branch 'feature/v1.2.11_ws' of SocialPlatform/messageCenter into feature/v1.2.11

.idea/workspace.xml

@@ -9,6 +9,8 @@
       <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/findmessagelogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/findmessagelogic.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/messageaddlogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/messageaddlogic.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/messagecountlogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/messagecountlogic.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

api/messagecenter/internal/logic/findmessagelogic.go

@@ -37,7 +37,7 @@ func (l *FindMessageLogic) FindMessage(req *types.MessageReq) (resp *types.Commo
 			return nil, err
 		}
 		req.NewUserId = r.BaseUserId
-		req.PositionId = r.BaseUserId
+		req.PositionId = r.PositionId
 	}
 	var res *messagecenter.MessageResp
 	res, err = l.svcCtx.Message.FindMessage(l.ctx, &messagecenter.MessageReq{

api/messagecenter/internal/logic/messageaddlogic.go

@@ -51,7 +51,7 @@ func (l *MessageAddLogic) MessageAdd(req *types.MessageEntity) (*types.CommonRes
 			return nil, err
 		}
 		req.NewUserId = r.BaseUserId
-		req.PositionId = r.BaseUserId
+		req.PositionId = r.PositionId
 	}
 	receiverIds := []int64{}
 	for _, v := range req.ReceiverIds {

api/messagecenter/internal/logic/messagecountlogic.go

@@ -35,7 +35,7 @@ func (l *MessageCountLogic) MessageCount(req *types.CountReq) (resp *types.Commo
 			return nil, err
 		}
 		req.NewUserId = r.BaseUserId
-		req.PositionId = r.BaseUserId
+		req.PositionId = r.PositionId
 	}
 	res, err := l.svcCtx.Message.Count(l.ctx, &messagecenter.CountReq{
 		UserType:   req.UserType,

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
-	bp.jydev.jianyu360.cn/SocialPlatform/socialPlatform v0.0.0-20240821071958-802586d36ec8
+	bp.jydev.jianyu360.cn/SocialPlatform/socialPlatform v0.0.0-20240823063953-96122c0cc4c2
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/gogf/gf/v2 v2.0.6
 	github.com/microcosm-cc/bluemonday v1.0.23

go.sum

@@ -24,8 +24,8 @@ bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220704032709-ba714ee655b0 h1:HGLTJI3NH4u1R6NPdslZsVtkhGKwDJFhyGiMjtXpWuc=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220704032709-ba714ee655b0/go.mod h1:6TePXVLkKusfyXhYOqL2qvT+uvu2uvhyw8CdOOsIdDQ=
 bp.jydev.jianyu360.cn/SocialPlatform/messageCenter v0.0.0-20230509083421-a1e4689d566a/go.mod h1:oT4+Q6HwwsVAAWkDNspdlwM1scif7Usgp8kapzYECJ0=
-bp.jydev.jianyu360.cn/SocialPlatform/socialPlatform v0.0.0-20240821071958-802586d36ec8 h1:h92aC5CXSVmatQwUFwC24cH+Y8pD3wTWh7BbfLUUycM=
-bp.jydev.jianyu360.cn/SocialPlatform/socialPlatform v0.0.0-20240821071958-802586d36ec8/go.mod h1:yToVjZlSlGPfya3jqgmazxGxcSPdHF/dFhyBSnUbpPU=
+bp.jydev.jianyu360.cn/SocialPlatform/socialPlatform v0.0.0-20240823063953-96122c0cc4c2 h1:RB9QUfMYFK9LLcXnx7J+RuKRrV5Q4SQE2ocv0fJ50CE=
+bp.jydev.jianyu360.cn/SocialPlatform/socialPlatform v0.0.0-20240823063953-96122c0cc4c2/go.mod h1:yToVjZlSlGPfya3jqgmazxGxcSPdHF/dFhyBSnUbpPU=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=