协议文件出错修改

api/messagecenter/internal/logic/chatgroupaddlogic.go

@@ -1,6 +1,9 @@
 package logic
 
 import (
+	quitl "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/messagecenter"
 	"context"
 
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/svc"
@@ -25,6 +28,20 @@ func NewChatGroupAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Chat
 
 func (l *ChatGroupAddLogic) ChatGroupAdd(req *types.ChatGroupAddReq) (resp *types.CommonRes, err error) {
 	// todo: add your logic here and delete this line
-
-	return
+	userIdArr := []int64{}
+	for _, v := range req.UserIdArr {
+		userIdArr = append(userIdArr, quitl.Int64All(encrypt.SE.Decode4Hex(v)))
+	}
+	result, err := l.svcCtx.Message.ChatGroupAdd(l.ctx, &messagecenter.ChatGroupAddReq{
+		PositionId: req.PositionId,
+		EntId:      req.EntId,
+		UserIdArr:  userIdArr,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &types.CommonRes{
+		Error_msg:  result.ErrorMsg,
+		Error_code: int(result.ErrorCode),
+	}, nil
 }

entity/util.go

@@ -2,7 +2,6 @@ package entity
 
 import (
 	quitl "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/go-xweb/log"
 	"app.yhyue.com/moapp/jybase/redis"
 	"encoding/json"
 	"fmt"
@@ -81,8 +80,6 @@ func SetData(userType int64, userId int64, data map[string]interface{}, survival
 }
 
 func IntJoin(elems []int64, sep string) string {
-	log.Println(quitl.InterfaceToStr(elems[0]))
-	log.Println(elems[0])
 	switch len(elems) {
 	case 0:
 		return ""

rpc/messagecenter/messagecenter/messagecenter.go

@@ -1,5 +1,5 @@
-// Code generated by goctl. DO NOT EDIT!
-// Source: messageCenter.proto
+// Code generated by goctl. DO NOT EDIT.
+// Source: messagecenter.proto
 
 package messagecenter
 
@@ -12,22 +12,38 @@ import (
 
 type (
 	MessageCenter interface {
-		//  查询数量
+		// 查询数量
 		Count(ctx context.Context, in *CountReq, opts ...grpc.CallOption) (*CountResp, error)
-		//  用户列表查询
+		// 用户列表查询
 		UserList(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResp, error)
-		//  聊天内容查询
+		// 聊天内容查询
 		FindMessage(ctx context.Context, in *MessageReq, opts ...grpc.CallOption) (*MessageResp, error)
-		//  聊天保存
+		// 聊天保存
 		SaveMessage(ctx context.Context, in *MessageEntity, opts ...grpc.CallOption) (*SaveMessageResp, error)
-		//  会话创建
+		// 会话创建
 		CreateChatSession(ctx context.Context, in *ChatSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error)
-		//  会话关闭
+		// 会话关闭
 		CloseChatSession(ctx context.Context, in *CloseSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error)
 		// 创建会话并且保存信息
 		SaveAutoReplyMsg(ctx context.Context, in *SaveAutoReplyReq, opts ...grpc.CallOption) (*MessageResp, error)
 		// 根据消息修改已读状态
 		UpdateReadById(ctx context.Context, in *ReadStateReq, opts ...grpc.CallOption) (*CurrencyResp, error)
+		// 群组列表查询
+		ChatGroupList(ctx context.Context, in *ChatGroupListReq, opts ...grpc.CallOption) (*ChatGroupListResp, error)
+		// 群组新增
+		ChatGroupAdd(ctx context.Context, in *ChatGroupAddReq, opts ...grpc.CallOption) (*CommonReq, error)
+		// 群组成员查询
+		ChatGroupPerson(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*ChatGroupPersonResp, error)
+		// 加入群组
+		ChatGroupJoin(ctx context.Context, in *ChatGroupJoinReq, opts ...grpc.CallOption) (*CommonReq, error)
+		// 群组名称修改
+		GroupNameUpdate(ctx context.Context, in *GroupNameUpdateReq, opts ...grpc.CallOption) (*CommonReq, error)
+		// 群任务新增
+		GroupNoticeAdd(ctx context.Context, in *GroupNoticeAddReq, opts ...grpc.CallOption) (*CommonReq, error)
+		// 群任务编辑
+		GroupNoticeUpdate(ctx context.Context, in *GroupNoticeUpdateReq, opts ...grpc.CallOption) (*CommonReq, error)
+		// 群任务详情
+		GroupNoticeGet(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*GroupNoticeGetResp, error)
 	}
 
 	defaultMessageCenter struct {
@@ -41,37 +57,37 @@ func NewMessageCenter(cli zrpc.Client) MessageCenter {
 	}
 }
 
-//  查询数量
+// 查询数量
 func (m *defaultMessageCenter) Count(ctx context.Context, in *CountReq, opts ...grpc.CallOption) (*CountResp, error) {
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.Count(ctx, in, opts...)
 }
 
-//  用户列表查询
+// 用户列表查询
 func (m *defaultMessageCenter) UserList(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResp, error) {
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.UserList(ctx, in, opts...)
 }
 
-//  聊天内容查询
+// 聊天内容查询
 func (m *defaultMessageCenter) FindMessage(ctx context.Context, in *MessageReq, opts ...grpc.CallOption) (*MessageResp, error) {
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.FindMessage(ctx, in, opts...)
 }
 
-//  聊天保存
+// 聊天保存
 func (m *defaultMessageCenter) SaveMessage(ctx context.Context, in *MessageEntity, opts ...grpc.CallOption) (*SaveMessageResp, error) {
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.SaveMessage(ctx, in, opts...)
 }
 
-//  会话创建
+// 会话创建
 func (m *defaultMessageCenter) CreateChatSession(ctx context.Context, in *ChatSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error) {
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.CreateChatSession(ctx, in, opts...)
 }
 
-//  会话关闭
+// 会话关闭
 func (m *defaultMessageCenter) CloseChatSession(ctx context.Context, in *CloseSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error) {
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.CloseChatSession(ctx, in, opts...)
@@ -88,3 +104,51 @@ func (m *defaultMessageCenter) UpdateReadById(ctx context.Context, in *ReadState
 	client := NewMessageCenterClient(m.cli.Conn())
 	return client.UpdateReadById(ctx, in, opts...)
 }
+
+// 群组列表查询
+func (m *defaultMessageCenter) ChatGroupList(ctx context.Context, in *ChatGroupListReq, opts ...grpc.CallOption) (*ChatGroupListResp, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.ChatGroupList(ctx, in, opts...)
+}
+
+// 群组新增
+func (m *defaultMessageCenter) ChatGroupAdd(ctx context.Context, in *ChatGroupAddReq, opts ...grpc.CallOption) (*CommonReq, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.ChatGroupAdd(ctx, in, opts...)
+}
+
+// 群组成员查询
+func (m *defaultMessageCenter) ChatGroupPerson(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*ChatGroupPersonResp, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.ChatGroupPerson(ctx, in, opts...)
+}
+
+// 加入群组
+func (m *defaultMessageCenter) ChatGroupJoin(ctx context.Context, in *ChatGroupJoinReq, opts ...grpc.CallOption) (*CommonReq, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.ChatGroupJoin(ctx, in, opts...)
+}
+
+// 群组名称修改
+func (m *defaultMessageCenter) GroupNameUpdate(ctx context.Context, in *GroupNameUpdateReq, opts ...grpc.CallOption) (*CommonReq, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.GroupNameUpdate(ctx, in, opts...)
+}
+
+// 群任务新增
+func (m *defaultMessageCenter) GroupNoticeAdd(ctx context.Context, in *GroupNoticeAddReq, opts ...grpc.CallOption) (*CommonReq, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.GroupNoticeAdd(ctx, in, opts...)
+}
+
+// 群任务编辑
+func (m *defaultMessageCenter) GroupNoticeUpdate(ctx context.Context, in *GroupNoticeUpdateReq, opts ...grpc.CallOption) (*CommonReq, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.GroupNoticeUpdate(ctx, in, opts...)
+}
+
+// 群任务详情
+func (m *defaultMessageCenter) GroupNoticeGet(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*GroupNoticeGetResp, error) {
+	client := NewMessageCenterClient(m.cli.Conn())
+	return client.GroupNoticeGet(ctx, in, opts...)
+}

rpc/messagecenter/messagecenterclient/messagecenter.go

@@ -1,187 +0,0 @@
-// Code generated by goctl. DO NOT EDIT.
-// Source: messagecenter.proto
-
-package messagecenterclient
-
-import (
-	"context"
-
-	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/messagecenter"
-
-	"github.com/zeromicro/go-zero/zrpc"
-	"google.golang.org/grpc"
-)
-
-type (
-	ChatGroupAddReq      = messagecenter.ChatGroupAddReq
-	ChatGroupJoinReq     = messagecenter.ChatGroupJoinReq
-	ChatGroupList        = messagecenter.ChatGroupList
-	ChatGroupListReq     = messagecenter.ChatGroupListReq
-	ChatGroupListResp    = messagecenter.ChatGroupListResp
-	ChatGroupPerson      = messagecenter.ChatGroupPerson
-	ChatGroupPersonList  = messagecenter.ChatGroupPersonList
-	ChatGroupPersonReq   = messagecenter.ChatGroupPersonReq
-	ChatGroupPersonResp  = messagecenter.ChatGroupPersonResp
-	ChatSessionReq       = messagecenter.ChatSessionReq
-	ChatSessionResp      = messagecenter.ChatSessionResp
-	CloseSessionReq      = messagecenter.CloseSessionReq
-	CommonReq            = messagecenter.CommonReq
-	CountReq             = messagecenter.CountReq
-	CountResp            = messagecenter.CountResp
-	CurrencyResp         = messagecenter.CurrencyResp
-	GroupNameUpdateReq   = messagecenter.GroupNameUpdateReq
-	GroupNotice          = messagecenter.GroupNotice
-	GroupNoticeAddReq    = messagecenter.GroupNoticeAddReq
-	GroupNoticeGetResp   = messagecenter.GroupNoticeGetResp
-	GroupNoticeUpdateReq = messagecenter.GroupNoticeUpdateReq
-	MessageEntity        = messagecenter.MessageEntity
-	MessageReq           = messagecenter.MessageReq
-	MessageResp          = messagecenter.MessageResp
-	ReadStateReq         = messagecenter.ReadStateReq
-	SaveAutoReplyReq     = messagecenter.SaveAutoReplyReq
-	SaveMessageResp      = messagecenter.SaveMessageResp
-	UserEntity           = messagecenter.UserEntity
-	UserReq              = messagecenter.UserReq
-	UserResp             = messagecenter.UserResp
-
-	MessageCenter interface {
-		// 查询数量
-		Count(ctx context.Context, in *CountReq, opts ...grpc.CallOption) (*CountResp, error)
-		// 用户列表查询
-		UserList(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResp, error)
-		// 聊天内容查询
-		FindMessage(ctx context.Context, in *MessageReq, opts ...grpc.CallOption) (*MessageResp, error)
-		// 聊天保存
-		SaveMessage(ctx context.Context, in *MessageEntity, opts ...grpc.CallOption) (*SaveMessageResp, error)
-		// 会话创建
-		CreateChatSession(ctx context.Context, in *ChatSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error)
-		// 会话关闭
-		CloseChatSession(ctx context.Context, in *CloseSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error)
-		// 创建会话并且保存信息
-		SaveAutoReplyMsg(ctx context.Context, in *SaveAutoReplyReq, opts ...grpc.CallOption) (*MessageResp, error)
-		// 根据消息修改已读状态
-		UpdateReadById(ctx context.Context, in *ReadStateReq, opts ...grpc.CallOption) (*CurrencyResp, error)
-		// 群组列表查询
-		ChatGroupList(ctx context.Context, in *ChatGroupListReq, opts ...grpc.CallOption) (*ChatGroupListResp, error)
-		// 群组新增
-		ChatGroupAdd(ctx context.Context, in *ChatGroupAddReq, opts ...grpc.CallOption) (*CommonReq, error)
-		// 群组成员查询
-		ChatGroupPerson(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*ChatGroupPersonResp, error)
-		// 加入群组
-		ChatGroupJoin(ctx context.Context, in *ChatGroupJoinReq, opts ...grpc.CallOption) (*CommonReq, error)
-		// 群组名称修改
-		GroupNameUpdate(ctx context.Context, in *GroupNameUpdateReq, opts ...grpc.CallOption) (*CommonReq, error)
-		// 群任务新增
-		GroupNoticeAdd(ctx context.Context, in *GroupNoticeAddReq, opts ...grpc.CallOption) (*CommonReq, error)
-		// 群任务编辑
-		GroupNoticeUpdate(ctx context.Context, in *GroupNoticeUpdateReq, opts ...grpc.CallOption) (*CommonReq, error)
-		// 群任务详情
-		GroupNoticeGet(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*GroupNoticeGetResp, error)
-	}
-
-	defaultMessageCenter struct {
-		cli zrpc.Client
-	}
-)
-
-func NewMessageCenter(cli zrpc.Client) MessageCenter {
-	return &defaultMessageCenter{
-		cli: cli,
-	}
-}
-
-// 查询数量
-func (m *defaultMessageCenter) Count(ctx context.Context, in *CountReq, opts ...grpc.CallOption) (*CountResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.Count(ctx, in, opts...)
-}
-
-// 用户列表查询
-func (m *defaultMessageCenter) UserList(ctx context.Context, in *UserReq, opts ...grpc.CallOption) (*UserResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.UserList(ctx, in, opts...)
-}
-
-// 聊天内容查询
-func (m *defaultMessageCenter) FindMessage(ctx context.Context, in *MessageReq, opts ...grpc.CallOption) (*MessageResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.FindMessage(ctx, in, opts...)
-}
-
-// 聊天保存
-func (m *defaultMessageCenter) SaveMessage(ctx context.Context, in *MessageEntity, opts ...grpc.CallOption) (*SaveMessageResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.SaveMessage(ctx, in, opts...)
-}
-
-// 会话创建
-func (m *defaultMessageCenter) CreateChatSession(ctx context.Context, in *ChatSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.CreateChatSession(ctx, in, opts...)
-}
-
-// 会话关闭
-func (m *defaultMessageCenter) CloseChatSession(ctx context.Context, in *CloseSessionReq, opts ...grpc.CallOption) (*ChatSessionResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.CloseChatSession(ctx, in, opts...)
-}
-
-// 创建会话并且保存信息
-func (m *defaultMessageCenter) SaveAutoReplyMsg(ctx context.Context, in *SaveAutoReplyReq, opts ...grpc.CallOption) (*MessageResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.SaveAutoReplyMsg(ctx, in, opts...)
-}
-
-// 根据消息修改已读状态
-func (m *defaultMessageCenter) UpdateReadById(ctx context.Context, in *ReadStateReq, opts ...grpc.CallOption) (*CurrencyResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.UpdateReadById(ctx, in, opts...)
-}
-
-// 群组列表查询
-func (m *defaultMessageCenter) ChatGroupList(ctx context.Context, in *ChatGroupListReq, opts ...grpc.CallOption) (*ChatGroupListResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.ChatGroupList(ctx, in, opts...)
-}
-
-// 群组新增
-func (m *defaultMessageCenter) ChatGroupAdd(ctx context.Context, in *ChatGroupAddReq, opts ...grpc.CallOption) (*CommonReq, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.ChatGroupAdd(ctx, in, opts...)
-}
-
-// 群组成员查询
-func (m *defaultMessageCenter) ChatGroupPerson(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*ChatGroupPersonResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.ChatGroupPerson(ctx, in, opts...)
-}
-
-// 加入群组
-func (m *defaultMessageCenter) ChatGroupJoin(ctx context.Context, in *ChatGroupJoinReq, opts ...grpc.CallOption) (*CommonReq, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.ChatGroupJoin(ctx, in, opts...)
-}
-
-// 群组名称修改
-func (m *defaultMessageCenter) GroupNameUpdate(ctx context.Context, in *GroupNameUpdateReq, opts ...grpc.CallOption) (*CommonReq, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.GroupNameUpdate(ctx, in, opts...)
-}
-
-// 群任务新增
-func (m *defaultMessageCenter) GroupNoticeAdd(ctx context.Context, in *GroupNoticeAddReq, opts ...grpc.CallOption) (*CommonReq, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.GroupNoticeAdd(ctx, in, opts...)
-}
-
-// 群任务编辑
-func (m *defaultMessageCenter) GroupNoticeUpdate(ctx context.Context, in *GroupNoticeUpdateReq, opts ...grpc.CallOption) (*CommonReq, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.GroupNoticeUpdate(ctx, in, opts...)
-}
-
-// 群任务详情
-func (m *defaultMessageCenter) GroupNoticeGet(ctx context.Context, in *ChatGroupPersonReq, opts ...grpc.CallOption) (*GroupNoticeGetResp, error) {
-	client := messagecenter.NewMessageCenterClient(m.cli.Conn())
-	return client.GroupNoticeGet(ctx, in, opts...)
-}

service/chat_group.go

@@ -102,7 +102,7 @@ func (b ChatGroupService) ChatGroupJoin(chatGroupId, positionId int64, userIdArr
 		//30条历史记录添加
 		messageList := IC.BaseMysql.SelectBySqlByTx(tx,
 			fmt.Sprintf("SELECT  messag_id,  MAX( appid ) AS appid,MAX( type ) AS type,MAX( send_user_id ) AS send_user_id,MAX( send_user_type ) AS send_user_type,MAX( read_time ) AS read_time,MAX( create_time ) AS create_time,MAX( chat_group_id ) AS chat_group_id  "+
-				"FROM  %s   WHERE  (type = 3 or type=6)   AND iswithdraw = 0   AND chat_group_id = ?   GROUP BY  messag_id", util.SOCIALIZE_MESSAGE_MAILBOX), chatGroupId)
+				"FROM  %s   WHERE   chat_group_id = ?  and  type in (3,6)   AND iswithdraw = 0     GROUP BY  messag_id", util.SOCIALIZE_MESSAGE_MAILBOX), chatGroupId)
 		if len(*messageList) > 0 && messageList != nil {
 			messageKey := []string{
 				"appid", "messag_id", "type", "send_user_id", "send_user_type", "receive_user_id", "receive_user_type", "iswithdraw", "own_type", "own_id", "read_time", "create_time", "isread", "chat_group_id"}