Merge remote-tracking branch 'origin/main'

2025-05-24 13:59:17 +08:00 · 2021-05-26 19:57:17 +08:00 · 2021-05-26 19:57:17 +08:00 · 9bea8eac77
commit 9bea8eac77
parent c13cf968ef 8ccc3ed967
11 changed files with 2947 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@
 Open-IM-Server is open source instant messaging Server.Backend in Go.
 ![avatar](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/docs/Open-IM.png)

-[![LICENSE](https://img.shields.io/github/license/pingcap/tidb.svg)](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE)
+[![LICENSE](https://img.shields.io/badge/license-Apache--2.0-green)](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/LICENSE)
 [![Language](https://img.shields.io/badge/Language-Go-blue.svg)](https://golang.org/)

 ## Open-IM-Server: Open source  Instant Messaging Server
--- a/src/proto/friend/friend.pb.go
+++ b/src/proto/friend/friend.pb.go
--- a/src/proto/friend/friend.proto
+++ b/src/proto/friend/friend.proto
@ -0,0 +1,159 @@
+syntax = "proto3";
+option go_package = "friend;friend";
+package friend;
+
+message CommonResp{
+  int32   errorCode = 1;
+  string  errorMsg = 2;
+}
+
+message SearchFriendReq{
+  string uid = 1;
+  string OperationID = 2;
+  string Token = 3;
+}
+message SearchFriendResp{
+  int32  errorCode = 1;
+  string errorMsg = 2;
+  SearchFriendData Data = 3;
+}
+
+message SearchFriendData{
+  string uid = 1;
+  string icon = 2;
+  string name = 3;
+  int32 gender = 4;
+  string mobile = 5;
+  string birth = 6;
+  string email = 7;
+  string ex = 8;
+  string comment = 9;
+  int32  isFriend = 10;
+  int32 isInBlackList = 11;
+}
+
+message AddFriendReq{
+  string   uid = 1;
+  string  OperationID = 2;
+  string  Token = 3;
+  string  ReqMessage = 4;
+}
+
+
+message GetFriendApplyReq{
+  string OperationID = 1;
+  string Token = 2;
+}
+message GetFriendApplyResp{
+  int32   errorCode = 1;
+  string  errorMsg = 2;
+  repeated ApplyUserInfo data = 4;
+}
+
+message ApplyUserInfo{
+  string   uid = 1;
+  string   name = 2;
+  string   icon = 3;
+  int32    gender = 4;
+  string   mobile = 5;
+  string   birth = 6;
+  string   email = 7;
+  string   ex = 8;
+  int32    flag = 9;
+  string   applyTime = 10;
+  string   reqMessage = 11;
+}
+
+
+message getFriendListReq{
+  string OperationID = 1;
+  string Token = 2;
+}
+message getFriendListResp{
+  int32   errorCode = 1;
+  string  errorMsg = 2;
+  repeated UserInfo data = 3;
+}
+message UserInfo{
+  string  uid = 1;
+  string  name = 3;
+  string  icon = 2;
+  int32   gender = 4;
+  string mobile = 5;
+  string birth = 6;
+  string email = 7;
+  string ex = 8;
+  string  comment = 9;
+  int32 isInBlackList = 10;
+}
+
+message AddBlacklistReq{
+  string uid = 1;
+  string OperationID = 2;
+  string Token = 3;
+}
+
+
+message RemoveBlacklistReq{
+  string uid = 1;
+  string OperationID = 2;
+  string Token = 3;
+}
+
+
+message GetBlacklistReq{
+  string OperationID = 1;
+  string token = 2;
+}
+message GetBlacklistResp{
+  int32   errorCode = 1;
+  string  errorMsg = 2;
+  repeated UserInfo data = 3;
+}
+
+
+message IsInBlackListReq{
+  string sendUid = 1;
+  string receiveUid = 2;
+  string OperationID = 3;
+}
+message IsInBlackListResp{
+  int32   errorCode = 1;
+  string  errorMsg = 2;
+  bool    response = 3;
+}
+
+message DeleteFriendReq{
+  string uid = 1;
+  string OperationID = 2;
+  string Token = 3;
+}
+
+
+message AddedFriendReq{
+  string uid = 1;
+  int32  flag = 2;
+  string OperationID = 3;
+  string Token = 4;
+}
+
+message SetFriendCommentReq{
+  string uid = 1;
+  string operationID = 2;
+  string comment = 3;
+  string token = 4;
+}
+
+service friend{
+  rpc searchFriend(SearchFriendReq) returns(SearchFriendResp);
+  rpc addFriend(AddFriendReq) returns(CommonResp);
+  rpc getFriendApplyList(GetFriendApplyReq) returns(GetFriendApplyResp);
+  rpc getFriendList(getFriendListReq) returns(getFriendListResp);
+  rpc addBlacklist(AddBlacklistReq) returns(CommonResp);
+  rpc removeBlacklist(RemoveBlacklistReq) returns(CommonResp);
+  rpc isInBlackList(IsInBlackListReq) returns(IsInBlackListResp);
+  rpc getBlacklist(GetBlacklistReq) returns(GetBlacklistResp);
+  rpc deleteFriend(DeleteFriendReq) returns(CommonResp);
+  rpc addedFriend(AddedFriendReq) returns(CommonResp);
+  rpc setFriendComment(SetFriendCommentReq) returns(CommonResp);
+}
--- a/src/proto/user/user.pb.go
+++ b/src/proto/user/user.pb.go
@ -0,0 +1,584 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: user/user.proto
+
+package user
+
+import (
+	context "context"
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type CommonResp struct {
+	ErrorCode            int32    `protobuf:"varint,1,opt,name=errorCode,proto3" json:"errorCode,omitempty"`
+	ErrorMsg             string   `protobuf:"bytes,2,opt,name=errorMsg,proto3" json:"errorMsg,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CommonResp) Reset()         { *m = CommonResp{} }
+func (m *CommonResp) String() string { return proto.CompactTextString(m) }
+func (*CommonResp) ProtoMessage()    {}
+func (*CommonResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ed89022014131a74, []int{0}
+}
+
+func (m *CommonResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CommonResp.Unmarshal(m, b)
+}
+func (m *CommonResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CommonResp.Marshal(b, m, deterministic)
+}
+func (m *CommonResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CommonResp.Merge(m, src)
+}
+func (m *CommonResp) XXX_Size() int {
+	return xxx_messageInfo_CommonResp.Size(m)
+}
+func (m *CommonResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_CommonResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CommonResp proto.InternalMessageInfo
+
+func (m *CommonResp) GetErrorCode() int32 {
+	if m != nil {
+		return m.ErrorCode
+	}
+	return 0
+}
+
+func (m *CommonResp) GetErrorMsg() string {
+	if m != nil {
+		return m.ErrorMsg
+	}
+	return ""
+}
+
+type GetUserInfoReq struct {
+	UserIDList           []string `protobuf:"bytes,1,rep,name=userIDList,proto3" json:"userIDList,omitempty"`
+	Token                string   `protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"`
+	OperationID          string   `protobuf:"bytes,3,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *GetUserInfoReq) Reset()         { *m = GetUserInfoReq{} }
+func (m *GetUserInfoReq) String() string { return proto.CompactTextString(m) }
+func (*GetUserInfoReq) ProtoMessage()    {}
+func (*GetUserInfoReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ed89022014131a74, []int{1}
+}
+
+func (m *GetUserInfoReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetUserInfoReq.Unmarshal(m, b)
+}
+func (m *GetUserInfoReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetUserInfoReq.Marshal(b, m, deterministic)
+}
+func (m *GetUserInfoReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUserInfoReq.Merge(m, src)
+}
+func (m *GetUserInfoReq) XXX_Size() int {
+	return xxx_messageInfo_GetUserInfoReq.Size(m)
+}
+func (m *GetUserInfoReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetUserInfoReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetUserInfoReq proto.InternalMessageInfo
+
+func (m *GetUserInfoReq) GetUserIDList() []string {
+	if m != nil {
+		return m.UserIDList
+	}
+	return nil
+}
+
+func (m *GetUserInfoReq) GetToken() string {
+	if m != nil {
+		return m.Token
+	}
+	return ""
+}
+
+func (m *GetUserInfoReq) GetOperationID() string {
+	if m != nil {
+		return m.OperationID
+	}
+	return ""
+}
+
+type GetUserInfoResp struct {
+	ErrorCode            int32       `protobuf:"varint,1,opt,name=errorCode,proto3" json:"errorCode,omitempty"`
+	ErrorMsg             string      `protobuf:"bytes,2,opt,name=errorMsg,proto3" json:"errorMsg,omitempty"`
+	Data                 []*UserInfo `protobuf:"bytes,3,rep,name=Data,proto3" json:"Data,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
+	XXX_unrecognized     []byte      `json:"-"`
+	XXX_sizecache        int32       `json:"-"`
+}
+
+func (m *GetUserInfoResp) Reset()         { *m = GetUserInfoResp{} }
+func (m *GetUserInfoResp) String() string { return proto.CompactTextString(m) }
+func (*GetUserInfoResp) ProtoMessage()    {}
+func (*GetUserInfoResp) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ed89022014131a74, []int{2}
+}
+
+func (m *GetUserInfoResp) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GetUserInfoResp.Unmarshal(m, b)
+}
+func (m *GetUserInfoResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GetUserInfoResp.Marshal(b, m, deterministic)
+}
+func (m *GetUserInfoResp) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GetUserInfoResp.Merge(m, src)
+}
+func (m *GetUserInfoResp) XXX_Size() int {
+	return xxx_messageInfo_GetUserInfoResp.Size(m)
+}
+func (m *GetUserInfoResp) XXX_DiscardUnknown() {
+	xxx_messageInfo_GetUserInfoResp.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GetUserInfoResp proto.InternalMessageInfo
+
+func (m *GetUserInfoResp) GetErrorCode() int32 {
+	if m != nil {
+		return m.ErrorCode
+	}
+	return 0
+}
+
+func (m *GetUserInfoResp) GetErrorMsg() string {
+	if m != nil {
+		return m.ErrorMsg
+	}
+	return ""
+}
+
+func (m *GetUserInfoResp) GetData() []*UserInfo {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+type UserInfo struct {
+	Uid                  string   `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Icon                 string   `protobuf:"bytes,3,opt,name=icon,proto3" json:"icon,omitempty"`
+	Gender               int32    `protobuf:"varint,4,opt,name=gender,proto3" json:"gender,omitempty"`
+	Mobile               string   `protobuf:"bytes,5,opt,name=mobile,proto3" json:"mobile,omitempty"`
+	Birth                string   `protobuf:"bytes,6,opt,name=birth,proto3" json:"birth,omitempty"`
+	Email                string   `protobuf:"bytes,7,opt,name=email,proto3" json:"email,omitempty"`
+	Ex                   string   `protobuf:"bytes,8,opt,name=ex,proto3" json:"ex,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UserInfo) Reset()         { *m = UserInfo{} }
+func (m *UserInfo) String() string { return proto.CompactTextString(m) }
+func (*UserInfo) ProtoMessage()    {}
+func (*UserInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ed89022014131a74, []int{3}
+}
+
+func (m *UserInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UserInfo.Unmarshal(m, b)
+}
+func (m *UserInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UserInfo.Marshal(b, m, deterministic)
+}
+func (m *UserInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UserInfo.Merge(m, src)
+}
+func (m *UserInfo) XXX_Size() int {
+	return xxx_messageInfo_UserInfo.Size(m)
+}
+func (m *UserInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_UserInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UserInfo proto.InternalMessageInfo
+
+func (m *UserInfo) GetUid() string {
+	if m != nil {
+		return m.Uid
+	}
+	return ""
+}
+
+func (m *UserInfo) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *UserInfo) GetIcon() string {
+	if m != nil {
+		return m.Icon
+	}
+	return ""
+}
+
+func (m *UserInfo) GetGender() int32 {
+	if m != nil {
+		return m.Gender
+	}
+	return 0
+}
+
+func (m *UserInfo) GetMobile() string {
+	if m != nil {
+		return m.Mobile
+	}
+	return ""
+}
+
+func (m *UserInfo) GetBirth() string {
+	if m != nil {
+		return m.Birth
+	}
+	return ""
+}
+
+func (m *UserInfo) GetEmail() string {
+	if m != nil {
+		return m.Email
+	}
+	return ""
+}
+
+func (m *UserInfo) GetEx() string {
+	if m != nil {
+		return m.Ex
+	}
+	return ""
+}
+
+type LogoutReq struct {
+	OperationID          string   `protobuf:"bytes,1,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
+	Token                string   `protobuf:"bytes,2,opt,name=token,proto3" json:"token,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *LogoutReq) Reset()         { *m = LogoutReq{} }
+func (m *LogoutReq) String() string { return proto.CompactTextString(m) }
+func (*LogoutReq) ProtoMessage()    {}
+func (*LogoutReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ed89022014131a74, []int{4}
+}
+
+func (m *LogoutReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_LogoutReq.Unmarshal(m, b)
+}
+func (m *LogoutReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_LogoutReq.Marshal(b, m, deterministic)
+}
+func (m *LogoutReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_LogoutReq.Merge(m, src)
+}
+func (m *LogoutReq) XXX_Size() int {
+	return xxx_messageInfo_LogoutReq.Size(m)
+}
+func (m *LogoutReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_LogoutReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_LogoutReq proto.InternalMessageInfo
+
+func (m *LogoutReq) GetOperationID() string {
+	if m != nil {
+		return m.OperationID
+	}
+	return ""
+}
+
+func (m *LogoutReq) GetToken() string {
+	if m != nil {
+		return m.Token
+	}
+	return ""
+}
+
+type UpdateUserInfoReq struct {
+	Icon                 string   `protobuf:"bytes,1,opt,name=icon,proto3" json:"icon,omitempty"`
+	Name                 string   `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Gender               int32    `protobuf:"varint,3,opt,name=gender,proto3" json:"gender,omitempty"`
+	Mobile               string   `protobuf:"bytes,4,opt,name=mobile,proto3" json:"mobile,omitempty"`
+	Birth                string   `protobuf:"bytes,5,opt,name=birth,proto3" json:"birth,omitempty"`
+	Email                string   `protobuf:"bytes,6,opt,name=email,proto3" json:"email,omitempty"`
+	Ex                   string   `protobuf:"bytes,7,opt,name=ex,proto3" json:"ex,omitempty"`
+	Token                string   `protobuf:"bytes,8,opt,name=token,proto3" json:"token,omitempty"`
+	OperationID          string   `protobuf:"bytes,9,opt,name=OperationID,proto3" json:"OperationID,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *UpdateUserInfoReq) Reset()         { *m = UpdateUserInfoReq{} }
+func (m *UpdateUserInfoReq) String() string { return proto.CompactTextString(m) }
+func (*UpdateUserInfoReq) ProtoMessage()    {}
+func (*UpdateUserInfoReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ed89022014131a74, []int{5}
+}
+
+func (m *UpdateUserInfoReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UpdateUserInfoReq.Unmarshal(m, b)
+}
+func (m *UpdateUserInfoReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_UpdateUserInfoReq.Marshal(b, m, deterministic)
+}
+func (m *UpdateUserInfoReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UpdateUserInfoReq.Merge(m, src)
+}
+func (m *UpdateUserInfoReq) XXX_Size() int {
+	return xxx_messageInfo_UpdateUserInfoReq.Size(m)
+}
+func (m *UpdateUserInfoReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_UpdateUserInfoReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UpdateUserInfoReq proto.InternalMessageInfo
+
+func (m *UpdateUserInfoReq) GetIcon() string {
+	if m != nil {
+		return m.Icon
+	}
+	return ""
+}
+
+func (m *UpdateUserInfoReq) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *UpdateUserInfoReq) GetGender() int32 {
+	if m != nil {
+		return m.Gender
+	}
+	return 0
+}
+
+func (m *UpdateUserInfoReq) GetMobile() string {
+	if m != nil {
+		return m.Mobile
+	}
+	return ""
+}
+
+func (m *UpdateUserInfoReq) GetBirth() string {
+	if m != nil {
+		return m.Birth
+	}
+	return ""
+}
+
+func (m *UpdateUserInfoReq) GetEmail() string {
+	if m != nil {
+		return m.Email
+	}
+	return ""
+}
+
+func (m *UpdateUserInfoReq) GetEx() string {
+	if m != nil {
+		return m.Ex
+	}
+	return ""
+}
+
+func (m *UpdateUserInfoReq) GetToken() string {
+	if m != nil {
+		return m.Token
+	}
+	return ""
+}
+
+func (m *UpdateUserInfoReq) GetOperationID() string {
+	if m != nil {
+		return m.OperationID
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*CommonResp)(nil), "user.CommonResp")
+	proto.RegisterType((*GetUserInfoReq)(nil), "user.GetUserInfoReq")
+	proto.RegisterType((*GetUserInfoResp)(nil), "user.GetUserInfoResp")
+	proto.RegisterType((*UserInfo)(nil), "user.UserInfo")
+	proto.RegisterType((*LogoutReq)(nil), "user.LogoutReq")
+	proto.RegisterType((*UpdateUserInfoReq)(nil), "user.UpdateUserInfoReq")
+}
+
+func init() { proto.RegisterFile("user/user.proto", fileDescriptor_ed89022014131a74) }
+
+var fileDescriptor_ed89022014131a74 = []byte{
+	// 416 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x8b, 0xd4, 0x40,
+	0x10, 0xa5, 0x27, 0x1f, 0x9b, 0x54, 0x20, 0xbb, 0x16, 0xab, 0x36, 0x83, 0x48, 0xc8, 0x29, 0xa7,
+	0x15, 0xd6, 0x9b, 0x7b, 0x73, 0x06, 0x65, 0x60, 0x45, 0x08, 0xec, 0xc5, 0x5b, 0xc6, 0x94, 0x99,
+	0xe0, 0x24, 0x1d, 0x3b, 0x3d, 0x30, 0x37, 0xff, 0x92, 0xff, 0xc8, 0xbf, 0x22, 0xdd, 0xc9, 0x4c,
+	0x32, 0x33, 0xd1, 0x8b, 0x97, 0x50, 0xef, 0x75, 0xa8, 0xaa, 0xf7, 0xaa, 0x0a, 0xae, 0x77, 0x2d,
+	0xc9, 0x37, 0xfa, 0x73, 0xd7, 0x48, 0xa1, 0x04, 0xda, 0x3a, 0x8e, 0x3f, 0x00, 0x2c, 0x44, 0x55,
+	0x89, 0x3a, 0xa5, 0xb6, 0xc1, 0x57, 0xe0, 0x93, 0x94, 0x42, 0x2e, 0x44, 0x4e, 0x9c, 0x45, 0x2c,
+	0x71, 0xd2, 0x81, 0xc0, 0x39, 0x78, 0x06, 0x7c, 0x6a, 0x0b, 0x3e, 0x8b, 0x58, 0xe2, 0xa7, 0x47,
+	0x1c, 0x6f, 0x20, 0xfc, 0x48, 0xea, 0xa9, 0x25, 0xb9, 0xaa, 0xbf, 0x89, 0x94, 0x7e, 0xe0, 0x6b,
+	0x00, 0x5d, 0x61, 0xb5, 0x7c, 0x2c, 0x5b, 0xc5, 0x59, 0x64, 0x25, 0x7e, 0x3a, 0x62, 0xf0, 0x16,
+	0x1c, 0x25, 0xbe, 0x53, 0xdd, 0xa7, 0xea, 0x00, 0x46, 0x10, 0x7c, 0x6e, 0x48, 0x66, 0xaa, 0x14,
+	0xf5, 0x6a, 0xc9, 0x2d, 0xf3, 0x36, 0xa6, 0x62, 0x01, 0xd7, 0x27, 0x95, 0xfe, 0xa7, 0x6d, 0x8c,
+	0xc1, 0x5e, 0x66, 0x2a, 0xe3, 0x56, 0x64, 0x25, 0xc1, 0x7d, 0x78, 0x67, 0xfc, 0x39, 0xe6, 0x36,
+	0x6f, 0xf1, 0x2f, 0x06, 0xde, 0x81, 0xc2, 0x1b, 0xb0, 0x76, 0x65, 0x6e, 0x8a, 0xf8, 0xa9, 0x0e,
+	0x11, 0xc1, 0xae, 0xb3, 0x8a, 0xfa, 0xd4, 0x26, 0xd6, 0x5c, 0xf9, 0x55, 0xd4, 0x7d, 0xfb, 0x26,
+	0xc6, 0x17, 0xe0, 0x16, 0x54, 0xe7, 0x24, 0xb9, 0x6d, 0x3a, 0xec, 0x91, 0xe6, 0x2b, 0xb1, 0x2e,
+	0xb7, 0xc4, 0x1d, 0xf3, 0x77, 0x8f, 0xb4, 0x3f, 0xeb, 0x52, 0xaa, 0x0d, 0x77, 0x3b, 0x7f, 0x0c,
+	0xd0, 0x2c, 0x55, 0x59, 0xb9, 0xe5, 0x57, 0x1d, 0x6b, 0x00, 0x86, 0x30, 0xa3, 0x3d, 0xf7, 0x0c,
+	0x35, 0xa3, 0x7d, 0xbc, 0x00, 0xff, 0x51, 0x14, 0x62, 0xa7, 0xf4, 0x20, 0xce, 0x2c, 0x65, 0x17,
+	0x96, 0x4e, 0x8f, 0x22, 0xfe, 0xcd, 0xe0, 0xd9, 0x53, 0x93, 0x67, 0x8a, 0xc6, 0x63, 0x3d, 0x48,
+	0x63, 0x23, 0x69, 0x53, 0x16, 0x0c, 0x72, 0xad, 0xbf, 0xc8, 0xb5, 0xa7, 0xe5, 0x3a, 0x93, 0x72,
+	0xdd, 0x4b, 0xb9, 0x57, 0x07, 0xb9, 0x43, 0xff, 0xde, 0x3f, 0x56, 0xc9, 0xbf, 0xd0, 0x7d, 0xff,
+	0x13, 0xcc, 0x11, 0xe0, 0x3b, 0x08, 0x8a, 0x61, 0xa5, 0xf0, 0xb6, 0x5b, 0x83, 0xd3, 0x7d, 0x9e,
+	0x3f, 0x9f, 0x60, 0xdb, 0x06, 0x1f, 0x20, 0x3c, 0x35, 0x09, 0x5f, 0xf6, 0x5b, 0x74, 0x6e, 0xdd,
+	0xfc, 0xa6, 0x7b, 0x18, 0xee, 0xed, 0x7d, 0xf0, 0xc5, 0xd7, 0xd4, 0x83, 0xfe, 0xac, 0x5d, 0x73,
+	0x97, 0x6f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf8, 0x6d, 0x34, 0xa2, 0xaa, 0x03, 0x00, 0x00,
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// UserClient is the client API for User service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type UserClient interface {
+	GetUserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResp, error)
+	UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq, opts ...grpc.CallOption) (*CommonResp, error)
+}
+
+type userClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewUserClient(cc *grpc.ClientConn) UserClient {
+	return &userClient{cc}
+}
+
+func (c *userClient) GetUserInfo(ctx context.Context, in *GetUserInfoReq, opts ...grpc.CallOption) (*GetUserInfoResp, error) {
+	out := new(GetUserInfoResp)
+	err := c.cc.Invoke(ctx, "/user.user/getUserInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *userClient) UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq, opts ...grpc.CallOption) (*CommonResp, error) {
+	out := new(CommonResp)
+	err := c.cc.Invoke(ctx, "/user.user/UpdateUserInfo", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// UserServer is the server API for User service.
+type UserServer interface {
+	GetUserInfo(context.Context, *GetUserInfoReq) (*GetUserInfoResp, error)
+	UpdateUserInfo(context.Context, *UpdateUserInfoReq) (*CommonResp, error)
+}
+
+// UnimplementedUserServer can be embedded to have forward compatible implementations.
+type UnimplementedUserServer struct {
+}
+
+func (*UnimplementedUserServer) GetUserInfo(ctx context.Context, req *GetUserInfoReq) (*GetUserInfoResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetUserInfo not implemented")
+}
+func (*UnimplementedUserServer) UpdateUserInfo(ctx context.Context, req *UpdateUserInfoReq) (*CommonResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UpdateUserInfo not implemented")
+}
+
+func RegisterUserServer(s *grpc.Server, srv UserServer) {
+	s.RegisterService(&_User_serviceDesc, srv)
+}
+
+func _User_GetUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetUserInfoReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).GetUserInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/user.user/GetUserInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).GetUserInfo(ctx, req.(*GetUserInfoReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _User_UpdateUserInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UpdateUserInfoReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UserServer).UpdateUserInfo(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/user.user/UpdateUserInfo",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UserServer).UpdateUserInfo(ctx, req.(*UpdateUserInfoReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _User_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "user.user",
+	HandlerType: (*UserServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "getUserInfo",
+			Handler:    _User_GetUserInfo_Handler,
+		},
+		{
+			MethodName: "UpdateUserInfo",
+			Handler:    _User_UpdateUserInfo_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "user/user.proto",
+}
--- a/src/proto/user/user.proto
+++ b/src/proto/user/user.proto
@ -0,0 +1,52 @@
+syntax = "proto3";
+option go_package = "user;user";
+package user;
+
+message CommonResp{
+  int32  errorCode = 1;
+  string errorMsg = 2;
+}
+
+message GetUserInfoReq{
+  repeated string userIDList = 1;
+  string token = 2;
+  string OperationID = 3;
+}
+message GetUserInfoResp{
+  int32  errorCode = 1;
+  string errorMsg = 2;
+  repeated UserInfo Data = 3;
+}
+message UserInfo{
+  string uid = 1;
+  string name = 2;
+  string icon = 3;
+  int32 gender = 4;
+  string mobile = 5;
+  string birth = 6;
+  string email = 7;
+  string ex = 8;
+}
+
+
+message LogoutReq{
+  string  OperationID = 1;
+  string  token = 2;
+}
+
+message UpdateUserInfoReq{
+  string icon = 1;
+  string name = 2;
+  int32  gender = 3;
+  string mobile = 4;
+  string birth = 5;
+  string email = 6;
+  string ex = 7;
+  string token = 8;
+  string  OperationID = 9;
+}
+
+service user {
+  rpc getUserInfo(GetUserInfoReq) returns(GetUserInfoResp);
+  rpc UpdateUserInfo(UpdateUserInfoReq) returns(CommonResp);
+}
--- a/src/rpc/auth/open_im_auth.go
+++ b/src/rpc/auth/open_im_auth.go
@ -0,0 +1,13 @@
+package main
+
+import (
+	rpcAuth "Open_IM/src/rpc/auth/auth"
+	"flag"
+)
+
+func main() {
+	rpcPort := flag.Int("port", 10600, "RpcToken default listen port 10800")
+	flag.Parse()
+	rpcServer := rpcAuth.NewRpcAuthServer(*rpcPort)
+	rpcServer.Run()
+}
--- a/src/rpc/chat/Makefile
+++ b/src/rpc/chat/Makefile
@ -0,0 +1,25 @@
+.PHONY: all build run gotool install clean help
+
+BINARY_NAME=open_im_msg
+BIN_DIR=../../../bin/
+LAN_FILE=.go
+GO_FILE:=${BINARY_NAME}${LAN_FILE}
+
+all: gotool build
+
+build:
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o  ${BINARY_NAME}  ${GO_FILE}
+
+run:
+	@go run ./
+
+gotool:
+	go fmt ./
+	go vet ./
+
+install:
+	make build
+	mv ${BINARY_NAME} ${BIN_DIR}
+
+clean:
+	@if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi
--- a/src/rpc/chat/chat/pull_message.go
+++ b/src/rpc/chat/chat/pull_message.go
@ -0,0 +1,159 @@
+//实现pb定义的rpc服务
+package rpcChat
+
+import (
+	"context"
+
+	commonDB "Open_IM/src/common/db"
+	"Open_IM/src/common/log"
+
+	"sort"
+	"strings"
+
+	pbMsg "Open_IM/src/proto/chat"
+)
+
+func (rpc *rpcChat) GetNewSeq(_ context.Context, in *pbMsg.GetNewSeqReq) (*pbMsg.GetNewSeqResp, error) {
+	log.InfoByKv("rpc getNewSeq is arriving", in.OperationID, in.String())
+	//seq, err := model.GetBiggestSeqFromReceive(in.UserID)
+	seq, err := commonDB.DB.GetUserSeq(in.UserID)
+	resp := new(pbMsg.GetNewSeqResp)
+	if err == nil {
+		resp.Seq = seq
+		resp.ErrCode = 0
+		resp.ErrMsg = ""
+		return resp, err
+	} else {
+		log.ErrorByKv("getSeq from redis error", in.OperationID, "args", in.String(), "err", err.Error())
+		resp.Seq = 0
+		resp.ErrCode = 0
+		resp.ErrMsg = ""
+		return resp, nil
+	}
+
+}
+
+//func (s *MsgServer) PullMessage(_ context.Context, in *pbMsg.PullMessageReq) (*pbMsg.PullMessageResp, error) {
+//	log.InfoByArgs(fmt.Sprintf("rpc pullMessage is arriving,args=%s", in.String()))
+//	resp := new(pbMsg.PullMessageResp)
+//	var respMsgFormat []*pbMsg.MsgFormat
+//	var respUserMsgFormat []*pbMsg.UserMsgFormat
+//	conn := db.NewDbConnection()
+//	rows, err := conn.Table("receive r").Select("c.sender_id,c.receiver_id,"+
+//		"c.msg_type,c.push_msg_type,c.chat_type,c.msg_id,c.send_content,r.seq,c.send_time,c.sender_nickname,c.receiver_nickname,c.sender_head_url,c.receiver_head_url").
+//		Joins("INNER JOIN chat_log c ON r.msg_id = c.msg_id AND r.user_id = ? AND seq BETWEEN ? AND ?",
+//			in.UserID, in.SeqBegin, in.SeqEnd).Rows()
+//	if err != nil {
+//		fmt.Printf("pullMsg data error: %v\n", err)
+//		resp.ErrCode = 1
+//		resp.ErrMsg = err.Error()
+//		return resp, nil
+//	}
+//	defer rows.Close()
+//	for rows.Next() {
+//		tempResp := new(pbMsg.MsgFormat)
+//		rows.Scan(&tempResp.SendID, &tempResp.RecvID, &tempResp.MsgType, &tempResp.PushMsgType, &tempResp.ChatType,
+//			&tempResp.MsgID, &tempResp.Msg, &tempResp.Seq, &tempResp.Time, &tempResp.SendNickName, &tempResp.RecvNickName,
+//			&tempResp.SendHeadUrl, &tempResp.RecvHeadUrl)
+//		respMsgFormat = append(respMsgFormat, tempResp)
+//	}
+//	respUserMsgFormat = msgHandleByUser(respMsgFormat, in.UserID)
+//	return &pbMsg.PullMessageResp{
+//		ErrCode: 0,
+//		ErrMsg:  "",
+//		UserMsg: respUserMsgFormat,
+//	}, nil
+//}
+func (rpc *rpcChat) PullMessage(_ context.Context, in *pbMsg.PullMessageReq) (*pbMsg.PullMessageResp, error) {
+	log.InfoByKv("rpc pullMessage is arriving", in.OperationID, "args", in.String())
+	resp := new(pbMsg.PullMessageResp)
+	var respSingleMsgFormat []*pbMsg.GatherFormat
+	var respGroupMsgFormat []*pbMsg.GatherFormat
+	SingleMsgFormat, GroupMsgFormat, MaxSeq, MinSeq, err := commonDB.DB.GetUserChat(in.UserID, in.SeqBegin, in.SeqEnd)
+	if err != nil {
+		log.ErrorByKv("pullMsg data error", in.OperationID, in.String())
+		resp.ErrCode = 1
+		resp.ErrMsg = err.Error()
+		return resp, nil
+	}
+	respSingleMsgFormat = singleMsgHandleByUser(SingleMsgFormat, in.UserID)
+	respGroupMsgFormat = groupMsgHandleByUser(GroupMsgFormat)
+	return &pbMsg.PullMessageResp{
+		ErrCode:       0,
+		ErrMsg:        "",
+		MaxSeq:        MaxSeq,
+		MinSeq:        MinSeq,
+		SingleUserMsg: respSingleMsgFormat,
+		GroupUserMsg:  respGroupMsgFormat,
+	}, nil
+}
+func singleMsgHandleByUser(allMsg []*pbMsg.MsgFormat, ownerId string) []*pbMsg.GatherFormat {
+	var userid string
+	var respMsgFormat []*pbMsg.GatherFormat
+	m := make(map[string]MsgFormats)
+	//将消息以用户为维度聚集
+	for _, v := range allMsg {
+		if v.RecvID != ownerId {
+			userid = v.RecvID
+		} else {
+			userid = v.SendID
+		}
+		if value, ok := m[userid]; !ok {
+			var t MsgFormats
+			m[userid] = append(t, v)
+		} else {
+			m[userid] = append(value, v)
+		}
+	}
+	//形成pb格式返回
+	for user, msg := range m {
+		tempUserMsg := new(pbMsg.GatherFormat)
+		tempUserMsg.ID = user
+		tempUserMsg.List = msg
+		sort.Sort(msg)
+		respMsgFormat = append(respMsgFormat, tempUserMsg)
+	}
+	return respMsgFormat
+}
+func groupMsgHandleByUser(allMsg []*pbMsg.MsgFormat) []*pbMsg.GatherFormat {
+	var respMsgFormat []*pbMsg.GatherFormat
+	m := make(map[string]MsgFormats)
+	//将消息以用户为维度聚集
+	for _, v := range allMsg {
+		//获得群ID
+		groupID := strings.Split(v.RecvID, " ")[1]
+		if value, ok := m[groupID]; !ok {
+			var t MsgFormats
+			m[groupID] = append(t, v)
+		} else {
+			m[groupID] = append(value, v)
+		}
+
+	}
+	//形成pb格式返回
+	for groupID, msg := range m {
+		tempUserMsg := new(pbMsg.GatherFormat)
+		tempUserMsg.ID = groupID
+		tempUserMsg.List = msg
+		sort.Sort(msg)
+		respMsgFormat = append(respMsgFormat, tempUserMsg)
+	}
+	return respMsgFormat
+}
+
+type MsgFormats []*pbMsg.MsgFormat
+
+// 实现sort.Interface接口取元素数量方法
+func (s MsgFormats) Len() int {
+	return len(s)
+}
+
+// 实现sort.Interface接口比较元素方法
+func (s MsgFormats) Less(i, j int) bool {
+	return s[i].SendTime < s[j].SendTime
+}
+
+// 实现sort.Interface接口交换元素方法
+func (s MsgFormats) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
--- a/src/rpc/chat/chat/rpcChat.go
+++ b/src/rpc/chat/chat/rpcChat.go
@ -0,0 +1,65 @@
+package rpcChat
+
+import (
+	"Open_IM/src/common/config"
+	"Open_IM/src/common/kafka"
+	log2 "Open_IM/src/common/log"
+	pbChat "Open_IM/src/proto/chat"
+	"Open_IM/src/utils"
+	"github.com/skiffer-git/grpc-etcdv3/getcdv3"
+	"google.golang.org/grpc"
+	"net"
+	"strconv"
+	"strings"
+)
+
+type rpcChat struct {
+	rpcPort         int
+	rpcRegisterName string
+	etcdSchema      string
+	etcdAddr        []string
+	producer        *kafka.Producer
+}
+
+func NewRpcChatServer(port int) *rpcChat {
+	rc := rpcChat{
+		rpcPort:         port,
+		rpcRegisterName: config.Config.RpcRegisterName.OpenImOfflineMessageName,
+		etcdSchema:      config.Config.Etcd.EtcdSchema,
+		etcdAddr:        config.Config.Etcd.EtcdAddr,
+	}
+	rc.producer = kafka.NewKafkaProducer(config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.Ws2mschat.Topic)
+	return &rc
+}
+
+func (rpc *rpcChat) Run() {
+	log2.Info("", "", "rpc get_token init...")
+
+	address := utils.ServerIP + ":" + strconv.Itoa(rpc.rpcPort)
+	listener, err := net.Listen("tcp", address)
+	if err != nil {
+		log2.Error("", "", "listen network failed, err = %s, address = %s", err.Error(), address)
+		return
+	}
+	log2.Info("", "", "listen network success, address = %s", address)
+
+	//grpc server
+	srv := grpc.NewServer()
+	defer srv.GracefulStop()
+
+	//service registers with etcd
+
+	pbChat.RegisterChatServer(srv, rpc)
+	err = getcdv3.RegisterEtcd(rpc.etcdSchema, strings.Join(rpc.etcdAddr, ","), utils.ServerIP, rpc.rpcPort, rpc.rpcRegisterName, 10)
+	if err != nil {
+		log2.Error("", "", "register rpc get_token to etcd failed, err = %s", err.Error())
+		return
+	}
+
+	err = srv.Serve(listener)
+	if err != nil {
+		log2.Info("", "", "rpc get_token fail, err = %s", err.Error())
+		return
+	}
+	log2.Info("", "", "rpc get_token init success")
+}
--- a/src/rpc/chat/chat/send_msg.go
+++ b/src/rpc/chat/chat/send_msg.go
@ -0,0 +1,50 @@
+package rpcChat
+
+import (
+	"Open_IM/src/common/log"
+	pbChat "Open_IM/src/proto/chat"
+	"Open_IM/src/utils"
+	"context"
+	"math/rand"
+	"strconv"
+	"time"
+)
+
+func (rpc *rpcChat) UserSendMsg(_ context.Context, pb *pbChat.UserSendMsgReq) (*pbChat.UserSendMsgResp, error) {
+
+	serverMsgID := GetMsgID(pb.SendID)
+	pbData := pbChat.WSToMsgSvrChatMsg{}
+	pbData.MsgFrom = pb.MsgFrom
+	pbData.SessionType = pb.SessionType
+	pbData.ContentType = pb.ContentType
+	pbData.Content = pb.Content
+	pbData.RecvID = pb.RecvID
+	pbData.ForceList = pb.ForceList
+	pbData.OfflineInfo = pb.OffLineInfo
+	pbData.Options = pb.Options
+	pbData.PlatformID = pb.PlatformID
+	pbData.SendID = pb.SendID
+	pbData.MsgID = serverMsgID
+	pbData.OperationID = pb.OperationID
+	pbData.Token = pb.Token
+	pbData.SendTime = utils.GetCurrentTimestampBySecond()
+	rpc.sendMsgToKafka(&pbData, pbData.RecvID)
+	rpc.sendMsgToKafka(&pbData, pbData.SendID)
+	replay := pbChat.UserSendMsgResp{}
+	replay.ReqIdentifier = pb.ReqIdentifier
+	replay.MsgIncr = pb.MsgIncr
+	replay.ClientMsgID = pb.ClientMsgID
+	replay.ServerMsgID = serverMsgID
+
+	return &replay, nil
+}
+func (rpc *rpcChat) sendMsgToKafka(m *pbChat.WSToMsgSvrChatMsg, key string) {
+	pid, offset, err := rpc.producer.SendMessage(m, key)
+	if err != nil {
+		log.ErrorByKv("kafka send failed", m.OperationID, "send data", m.String(), "pid", pid, "offset", offset, "err", err.Error())
+	}
+}
+func GetMsgID(sendID string) string {
+	t := time.Now().Format("2006-01-02 15:04:05")
+	return t + "-" + sendID + "-" + strconv.Itoa(rand.Int())
+}
--- a/src/rpc/chat/open_im_msg.go
+++ b/src/rpc/chat/open_im_msg.go
@ -0,0 +1,14 @@
+package main
+
+import (
+	rpcChat "Open_IM/src/rpc/chat/chat"
+	"Open_IM/src/utils"
+	"flag"
+)
+
+func main() {
+	rpcPort := flag.String("port", "", "rpc listening port")
+	flag.Parse()
+	rpcServer := rpcChat.NewRpcChatServer(utils.StringToInt(*rpcPort))
+	rpcServer.Run()
+}