Merge branch 'tuoyun' into superGroup

# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto

pkg/base_info/group_api_struct.go

@@ -232,3 +232,17 @@ type SetGroupMemberNicknameReq struct {
 type SetGroupMemberNicknameResp struct {
 	CommResp
 }
+
+type SetGroupMemberInfoReq struct {
+	OperationID string  `json:"operationID" binding:"required"`
+	GroupID     string  `json:"groupID" binding:"required"`
+	UserID      string  `json:"userID" binding:"required"`
+	Nickname    *string `json:"nickname"`
+	FaceURL     *string `json:"userGroupFaceUrl"`
+	RoleLevel   *int32  `json:"roleLevel" validate:"gte=1,lte=3"`
+	Ex          *string `json:"ex"`
+}
+
+type SetGroupMemberInfoResp struct {
+	CommResp
+}

pkg/base_info/third_api_struct.go

@@ -57,3 +57,33 @@ type GetDownloadURLResp struct {
 		UpdateLog     string `json:"update_log"`
 	} `json:"data"`
 }
+
+type GetRTCInvitationInfoReq struct {
+	OperationID string `json:"operationID" binding:"required"`
+	ClientMsgID string `json:"clientMsgID" binding:"required"`
+}
+
+type GetRTCInvitationInfoResp struct {
+	CommResp
+	Data struct {
+		OpUserID   string `json:"opUserID"`
+		Invitation struct {
+			InviterUserID     string   `json:"inviterUserID"`
+			InviteeUserIDList []string `json:"inviteeUserIDList"`
+			GroupID           string   `json:"groupID"`
+			RoomID            string   `json:"roomID"`
+			Timeout           int32    `json:"timeout"`
+			MediaType         string   `json:"mediaType"`
+			SessionType       int32    `json:"sessionType"`
+		} `json:"invitation"`
+		OfflinePushInfo struct{} `json:"offlinePushInfo"`
+	} `json:"data"`
+}
+
+type GetRTCInvitationInfoStartAppReq struct {
+	OperationID string `json:"operationID" binding:"required"`
+}
+
+type GetRTCInvitationInfoStartAppResp struct {
+	GetRTCInvitationInfoResp
+}

pkg/call_back_struct/msg_gateway.go

@@ -3,6 +3,7 @@ package call_back_struct
 type CallbackUserOnlineReq struct {
 	UserStatusCallbackReq
 	Token string `json:"token"`
+	Seq   int    `json:"seq"`
 }
 
 type CallbackUserOnlineResp struct {
@@ -11,6 +12,7 @@ type CallbackUserOnlineResp struct {
 
 type CallbackUserOfflineReq struct {
 	UserStatusCallbackReq
+	Seq int `json:"seq"`
 }
 
 type CallbackUserOfflineResp struct {

pkg/call_back_struct/push.go

@@ -5,6 +5,13 @@ import commonPb "Open_IM/pkg/proto/sdk_ws"
 type CallbackOfflinePushReq struct {
 	UserStatusCallbackReq
 	*commonPb.OfflinePushInfo
+	CommonCallbackReq
+	SendID       string   `json:"sendID"`
+	GroupID      string   `json:"groupID"`
+	ContentType  int32    `json:"contentType"`
+	SessionType  int32    `json:"sessionType"`
+	AtUserIDList []string `json:"atUserIDList"`
+	Content      string   `json`
 }
 
 type CallbackOfflinePushResp struct {

pkg/common/config/config.go

@@ -419,6 +419,11 @@ type config struct {
 			OfflinePush  POfflinePush  `yaml:"offlinePush"`
 			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
 		} `yaml:"joinDepartmentNotification"`
+		Signal struct {
+			OfflinePush struct {
+				Title string `yaml:"title"`
+			} `yaml:"offlinePush"`
+		} `yaml:"signal"`
 	}
 	Demo struct {
 		Port         []int  `yaml:"openImDemoPort"`
@@ -442,8 +447,7 @@ type config struct {
 		ImAPIURL         string `yaml:"imAPIURL"`
 	}
 	Rtc struct {
-		Port    int    `yaml:"port"`
-		Address string `yaml:"address"`
+		SignalTimeout string `yaml:"signalTimeout"`
 	} `yaml:"rtc"`
 }
 type PConversation struct {

pkg/common/constant/constant.go

@@ -44,6 +44,7 @@ const (
 	Quote          = 114
 	Common         = 200
 	GroupMsg       = 201
+	SignalMsg      = 202
 
 	//SysRelated
 	NotificationBegin                     = 1000
@@ -218,14 +219,15 @@ const (
 )
 
 var ContentType2PushContent = map[int64]string{
-	Picture:  "[图片]",
-	Voice:    "[语音]",
-	Video:    "[视频]",
-	File:     "[文件]",
-	Text:     "你收到了一条文本消息",
-	AtText:   "[有人@你]",
-	GroupMsg: "你收到一条群聊消息",
-	Common:   "你收到一条新消息",
+	Picture:   "[图片]",
+	Voice:     "[语音]",
+	Video:     "[视频]",
+	File:      "[文件]",
+	Text:      "你收到了一条文本消息",
+	AtText:    "[有人@你]",
+	GroupMsg:  "你收到一条群聊消息",
+	Common:    "你收到一条新消息",
+	SignalMsg: "音視頻通話邀請",
 }
 
 const (

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -142,6 +142,18 @@ func UpdateGroupMemberInfo(groupMemberInfo db.GroupMember) error {
 	return nil
 }
 
+func UpdateGroupMemberInfoByMap(groupMemberInfo db.GroupMember, m map[string]interface{}) error {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err
+	}
+	err = dbConn.Table("group_members").Where("group_id=? and user_id=?", groupMemberInfo.GroupID, groupMemberInfo.UserID).Updates(m).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func GetOwnerManagerByGroupID(groupID string) ([]db.GroupMember, error) {
 	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
 	if err != nil {

pkg/common/db/mysql_model/im_mysql_model/organization_model.go

@@ -249,26 +249,27 @@ func GetDepartmentRelatedGroupIDList(departmentIDList []string) ([]string, error
 
 func getDepartmentParent(departmentID string, dbConn *gorm.DB) (*db.Department, error) {
 	var department db.Department
-	var parentID string
+	//var parentID string
 	dbConn.LogMode(true)
 	// select * from departments where department_id = (select parent_id from departments where department_id= zx234fd);
-	err := dbConn.Table("departments").Where("department_id=?", dbConn.Table("departments").Where("department_id=?", departmentID).Pluck("parent_id", parentID)).Find(&department).Error
+	//dbConn.Table("departments").Where("department_id=?", departmentID).Pluck("parent_id", parentID).Error
+	err := dbConn.Table("departments").Where("department_id=?").Find(&department).Error
 	return &department, err
 }
 
-func GetDepartmentParent(departmentID string, dbConn *gorm.DB, parentIDList []string) (*db.Department, error) {
+func GetDepartmentParent(departmentID string, dbConn *gorm.DB, parentIDList *[]string) error {
 	department, err := getDepartmentParent(departmentID, dbConn)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	if department.ParentID != "" {
-		parentIDList = append(parentIDList, department.ParentID)
-		_, err = GetDepartmentParent(departmentID, dbConn, parentIDList)
+		*parentIDList = append(*parentIDList, department.ParentID)
+		err = GetDepartmentParent(departmentID, dbConn, parentIDList)
 		if err != nil {
-			return nil, nil
+			return err
 		}
 	}
-	return nil, nil
+	return nil
 }
 
 func GetDepartmentParentIDList(departmentID string) ([]string, error) {
@@ -277,6 +278,6 @@ func GetDepartmentParentIDList(departmentID string) ([]string, error) {
 		return nil, err
 	}
 	var parentIDList []string
-	_, err = GetDepartmentParent(departmentID, dbConn, parentIDList)
+	err = GetDepartmentParent(departmentID, dbConn, &parentIDList)
 	return parentIDList, err
 }

pkg/common/db/newRedisModel.go

@@ -4,15 +4,21 @@ import (
 	"Open_IM/pkg/common/config"
 	log2 "Open_IM/pkg/common/log"
 	pbChat "Open_IM/pkg/proto/chat"
+	pbRtc "Open_IM/pkg/proto/rtc"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/garyburd/redigo/redis"
-	"github.com/mitchellh/mapstructure"
+
+	//goRedis "github.com/go-redis/redis/v8"
 	"strconv"
 	"time"
+
+	"github.com/golang/protobuf/proto"
+	"github.com/mitchellh/mapstructure"
 )
 
 //func  (d *  DataBases)pubMessage(channel, msg string) {
@@ -101,3 +107,91 @@ func (d *DataBases) CleanUpOneUserAllMsgFromRedis(userID string, operationID str
 	}
 	return nil
 }
+
+func (d *DataBases) NewCacheSignalInfo(msg *pbCommon.MsgData) error {
+	req := &pbRtc.SignalReq{}
+	if err := proto.Unmarshal(msg.Content, req); err != nil {
+		return err
+	}
+	//log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "SignalReq: ", req.String())
+	var inviteeUserIDList []string
+	switch invitationInfo := req.Payload.(type) {
+	case *pbRtc.SignalReq_Invite:
+		inviteeUserIDList = invitationInfo.Invite.Invitation.InviteeUserIDList
+	case *pbRtc.SignalReq_InviteInGroup:
+		inviteeUserIDList = invitationInfo.InviteInGroup.Invitation.InviteeUserIDList
+	default:
+		log2.NewDebug("", utils.GetSelfFuncName(), "req type not invite", string(msg.Content))
+		return nil
+	}
+	for _, userID := range inviteeUserIDList {
+		timeout, err := strconv.Atoi(config.Config.Rtc.SignalTimeout)
+		if err != nil {
+			return err
+		}
+		keyList := SignalListCache + userID
+		err = d.rdb.LPush(context.Background(), keyList, msg.ClientMsgID).Err()
+		if err != nil {
+			return err
+		}
+		err = d.rdb.Expire(context.Background(), keyList, time.Duration(timeout)*time.Second).Err()
+		if err != nil {
+			return err
+		}
+		key := SignalCache + msg.ClientMsgID
+		err = d.rdb.Set(context.Background(), key, msg.Content, time.Duration(timeout)*time.Second).Err()
+		if err != nil {
+			return err
+		}
+		return err
+	}
+	return nil
+}
+
+func (d *DataBases) GetSignalInfoFromCacheByClientMsgID(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) {
+	key := SignalCache + clientMsgID
+	invitationInfo = &pbRtc.SignalInviteReq{}
+	bytes, err := d.rdb.Get(context.Background(), key).Bytes()
+	if err != nil {
+		return nil, err
+	}
+	req := &pbRtc.SignalReq{}
+	if err = proto.Unmarshal(bytes, req); err != nil {
+		return nil, err
+	}
+	switch req2 := req.Payload.(type) {
+	case *pbRtc.SignalReq_Invite:
+		invitationInfo.Invitation = req2.Invite.Invitation
+	case *pbRtc.SignalReq_InviteInGroup:
+		invitationInfo.Invitation = req2.InviteInGroup.Invitation
+	}
+	return invitationInfo, err
+}
+
+func (d *DataBases) GetAvailableSignalInvitationInfo(userID string) (invitationInfo *pbRtc.SignalInviteReq, err error) {
+	keyList := SignalListCache + userID
+	result := d.rdb.RPop(context.Background(), keyList)
+	if err = result.Err(); err != nil {
+		return nil, utils.Wrap(err, "GetAvailableSignalInvitationInfo failed")
+	}
+	key, err := result.Result()
+	if err != nil {
+		return nil, utils.Wrap(err, "GetAvailableSignalInvitationInfo failed")
+	}
+	log2.NewDebug("", utils.GetSelfFuncName(), result, result.String())
+	invitationInfo, err = d.GetSignalInfoFromCacheByClientMsgID(key)
+	if err != nil {
+		return nil, utils.Wrap(err, "GetSignalInfoFromCacheByClientMsgID")
+	}
+	err = d.delUserSingalList(userID)
+	if err != nil {
+		return nil, utils.Wrap(err, "GetSignalInfoFromCacheByClientMsgID")
+	}
+	return invitationInfo, nil
+}
+
+func (d *DataBases) delUserSingalList(userID string) error {
+	keyList := SignalListCache + userID
+	err := d.rdb.Del(context.Background(), keyList).Err()
+	return err
+}

pkg/common/db/redisModel.go

@@ -5,13 +5,18 @@ import (
 	"Open_IM/pkg/common/constant"
 	log2 "Open_IM/pkg/common/log"
 	pbChat "Open_IM/pkg/proto/chat"
+	pbRtc "Open_IM/pkg/proto/rtc"
 	pbCommon "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	"github.com/garyburd/redigo/redis"
 	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
+
+	//osconfig "google.golang.org/genproto/googleapis/cloud/osconfig/v1alpha"
 	"strconv"
 )
 
@@ -29,6 +34,8 @@ const (
 	blackListCache                = "BLACK_LIST_CACHE:"
 	groupCache                    = "GROUP_CACHE:"
 	messageCache                  = "MESSAGE_CACHE:"
+	SignalCache                   = "SIGNAL_CACHE:"
+	SignalListCache               = "SIGNAL_LIST_CACHE:"
 )
 
 func (d *DataBases) Exec(cmd string, key interface{}, args ...interface{}) (interface{}, error) {
@@ -342,3 +349,25 @@ func (d *DataBases) DelMsgFromCache(uid string, seqList []uint32, operationID st
 		}
 	}
 }
+
+func (d *DataBases) CacheSignalInfo(msg *pbCommon.MsgData) error {
+	key := SignalCache + msg.ClientMsgID
+	_, err := d.Exec("SET", key, msg.Content, "ex", config.Config.Rtc.SignalTimeout)
+	return err
+}
+
+func (d *DataBases) GetSignalInfoFromCache(clientMsgID string) (invitationInfo *pbRtc.SignalInviteReq, err error) {
+	key := SignalCache + clientMsgID
+	result, err := redis.Bytes(d.Exec("GET", key))
+	log2.NewDebug("", utils.GetSelfFuncName(), clientMsgID, result, string(result))
+	if err != nil {
+		return nil, err
+	}
+	req := &pbRtc.SignalReq{}
+	if err = proto.Unmarshal(result, req); err != nil {
+		return nil, err
+	}
+	req2 := req.Payload.(*pbRtc.SignalReq_Invite)
+	invitationInfo = req2.Invite
+	return invitationInfo, err
+}

pkg/proto/group/group.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 import "Open_IM/pkg/proto/sdk_ws/ws.proto";
+import "Open_IM/pkg/proto/sdk_ws/wrappers.proto";
 option go_package = "./group;group";
 package group;
 
@@ -412,6 +413,21 @@ message GetSuperGroupsInfoResp {
   repeated server_api_params.GroupInfo GroupInfoList = 3;
 }
 
+message SetGroupMemberInfoReq{
+  string groupID = 1;
+  string userID = 2;
+  string opUserID = 3;
+  string operationID = 4;
+  google.protobuf.StringValue nickname = 5;
+  google.protobuf.StringValue faceURL = 6;
+  google.protobuf.Int32Value roleLevel = 7;
+  google.protobuf.StringValue ex = 8;
+}
+
+message SetGroupMemberInfoResp{
+  CommonResp CommonResp = 1;
+}
+
 service group{
   rpc createGroup(CreateGroupReq) returns(CreateGroupResp);
   rpc joinGroup(JoinGroupReq) returns(JoinGroupResp);
@@ -449,6 +465,8 @@ service group{
 
   rpc GetJoinedSuperGroupList(GetJoinedSuperGroupListReq) returns (GetJoinedSuperGroupListResp);
   rpc GetSuperGroupsInfo(GetSuperGroupsInfoReq) returns (GetSuperGroupsInfoResp);
+  rpc SetGroupMemberInfo(SetGroupMemberInfoReq) returns (SetGroupMemberInfoResp);
+
 }
 
 

pkg/proto/sdk_ws/wrappers.proto

@@ -0,0 +1,123 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Wrappers for primitive (non-message) types. These types are useful
+// for embedding primitives in the `google.protobuf.Any` type and for places
+// where we need to distinguish between the absence of a primitive
+// typed field and its default value.
+//
+// These wrappers have no meaningful use within repeated fields as they lack
+// the ability to detect presence on individual elements.
+// These wrappers have no meaningful use within a map or a oneof since
+// individual entries of a map or fields of a oneof can already detect presence.
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+option cc_enable_arenas = true;
+option go_package = "google.golang.org/protobuf/types/known/wrapperspb";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "WrappersProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+
+// Wrapper message for `double`.
+//
+// The JSON representation for `DoubleValue` is JSON number.
+message DoubleValue {
+  // The double value.
+  double value = 1;
+}
+
+// Wrapper message for `float`.
+//
+// The JSON representation for `FloatValue` is JSON number.
+message FloatValue {
+  // The float value.
+  float value = 1;
+}
+
+// Wrapper message for `int64`.
+//
+// The JSON representation for `Int64Value` is JSON string.
+message Int64Value {
+  // The int64 value.
+  int64 value = 1;
+}
+
+// Wrapper message for `uint64`.
+//
+// The JSON representation for `UInt64Value` is JSON string.
+message UInt64Value {
+  // The uint64 value.
+  uint64 value = 1;
+}
+
+// Wrapper message for `int32`.
+//
+// The JSON representation for `Int32Value` is JSON number.
+message Int32Value {
+  // The int32 value.
+  int32 value = 1;
+}
+
+// Wrapper message for `uint32`.
+//
+// The JSON representation for `UInt32Value` is JSON number.
+message UInt32Value {
+  // The uint32 value.
+  uint32 value = 1;
+}
+
+// Wrapper message for `bool`.
+//
+// The JSON representation for `BoolValue` is JSON `true` and `false`.
+message BoolValue {
+  // The bool value.
+  bool value = 1;
+}
+
+// Wrapper message for `string`.
+//
+// The JSON representation for `StringValue` is JSON string.
+message StringValue {
+  // The string value.
+  string value = 1;
+}
+
+// Wrapper message for `bytes`.
+//
+// The JSON representation for `BytesValue` is JSON string.
+message BytesValue {
+  // The bytes value.
+  bytes value = 1;
+}