From ace77e6fd01498dd7183ef375cc05b49856b4772 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 11 Nov 2021 20:13:45 +0800 Subject: [PATCH 01/34] new server version --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index 9f7969466..e65f23926 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,7 +1,7 @@ # The class cannot be named by Pascal or camel case. # If it is not used, the corresponding structure will not be set, # and it will not be read naturally. -serverversion: 1.0.2 +serverversion: 1.0.3 #---------------Infrastructure configuration---------------------# etcd: etcdSchema: openIM From 95ac2c62e88d90db7764b3c463e7e9be5b12f02d Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 12 Nov 2021 18:54:51 +0800 Subject: [PATCH 02/34] config modify --- config/config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/config.yaml b/config/config.yaml index e65f23926..c4b0e49fc 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -123,6 +123,7 @@ push: appKey: cf47465a368f24c659608e7e masterSecret: 02204efe3f3832947a236ee5 pushUrl: "https://api.jpush.cn/v3/push" + pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end" manager: appManagerUid: ["openIM123456","openIM654321"] secrets: ["openIM1","openIM2"] From 72b09864ce048666fc3b2be9e990e18ac13430c5 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 26 Nov 2021 14:20:50 +0800 Subject: [PATCH 03/34] panic output detail info --- pkg/common/config/config.go | 4 ++-- pkg/common/db/model.go | 4 ++-- pkg/common/db/mysql.go | 24 ++++++++++++------------ pkg/common/kafka/consumer.go | 4 ++-- pkg/common/kafka/consumer_group.go | 6 +++--- pkg/common/kafka/producer.go | 2 +- pkg/common/log/logrus.go | 4 ++-- pkg/utils/get_server_ip.go | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index f32ca8da1..e0c25f2c7 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -164,10 +164,10 @@ func init() { // it will panic cannot find config/config.yaml bytes, err := ioutil.ReadFile(Root + "/config/config.yaml") if err != nil { - panic(err) + panic(err.Error()) } if err = yaml.Unmarshal(bytes, &Config); err != nil { - panic(err) + panic(err.Error()) } } diff --git a/pkg/common/db/model.go b/pkg/common/db/model.go index 494f8ffaf..becdd71b6 100644 --- a/pkg/common/db/model.go +++ b/pkg/common/db/model.go @@ -35,14 +35,14 @@ func init() { } mgoSession, err := mgo.DialWithInfo(mgoDailInfo) if err != nil { - panic(err) + panic(err.Error()) } DB.mgoSession = mgoSession DB.mgoSession.SetMode(mgo.Monotonic, true) c := DB.mgoSession.DB(config.Config.Mongo.DBDatabase).C(cChat) err = c.EnsureIndexKey("uid") if err != nil { - panic(err) + panic(err.Error()) } // redis pool init diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 17370e15f..865571b7f 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -23,14 +23,14 @@ func initMysqlDB() { db, err := gorm.Open("mysql", dsn) if err != nil { log.Error("", "", dsn) - panic(err) + panic(err.Error()) } //Check the database and table during initialization sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s ;", config.Config.Mysql.DBDatabaseName) err = db.Exec(sql).Error if err != nil { - panic(err) + panic(err.Error()) } db.Close() @@ -38,7 +38,7 @@ func initMysqlDB() { config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName) db, err = gorm.Open("mysql", dsn) if err != nil { - panic(err) + panic(err.Error()) } sqlTable := "CREATE TABLE IF NOT EXISTS `user` (" + @@ -56,7 +56,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `friend` (" + @@ -69,7 +69,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `friend_request` (" + @@ -82,7 +82,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `black_list` (" + @@ -94,7 +94,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `user_black_list` (" + @@ -105,7 +105,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `group` (" + @@ -120,7 +120,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `group_member` (" + @@ -134,7 +134,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `group_request` (" + @@ -155,7 +155,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8mb4;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } sqlTable = "CREATE TABLE IF NOT EXISTS `chat_log` (" + @@ -173,7 +173,7 @@ func initMysqlDB() { " ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;" err = db.Exec(sqlTable).Error if err != nil { - panic(err) + panic(err.Error()) } } diff --git a/pkg/common/kafka/consumer.go b/pkg/common/kafka/consumer.go index eed6ef142..771145906 100644 --- a/pkg/common/kafka/consumer.go +++ b/pkg/common/kafka/consumer.go @@ -20,14 +20,14 @@ func NewKafkaConsumer(addr []string, topic string) *Consumer { consumer, err := sarama.NewConsumer(p.addr, nil) if err != nil { - panic(err) + panic(err.Error()) return nil } p.Consumer = consumer partitionList, err := consumer.Partitions(p.Topic) if err != nil { - panic(err) + panic(err.Error()) return nil } p.PartitionList = partitionList diff --git a/pkg/common/kafka/consumer_group.go b/pkg/common/kafka/consumer_group.go index 4c4af5033..3af714373 100644 --- a/pkg/common/kafka/consumer_group.go +++ b/pkg/common/kafka/consumer_group.go @@ -30,11 +30,11 @@ func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addr []stri config.Consumer.Return.Errors = consumerConfig.IsReturnErr client, err := sarama.NewClient(addr, config) if err != nil { - panic(err) + panic(err.Error()) } consumerGroup, err := sarama.NewConsumerGroupFromClient(groupID, client) if err != nil { - panic(err) + panic(err.Error()) } return &MConsumerGroup{ consumerGroup, @@ -47,7 +47,7 @@ func (mc *MConsumerGroup) RegisterHandleAndConsumer(handler sarama.ConsumerGroup for { err := mc.ConsumerGroup.Consume(ctx, mc.topics, handler) if err != nil { - panic(err) + panic(err.Error()) } } } diff --git a/pkg/common/kafka/producer.go b/pkg/common/kafka/producer.go index c82df975f..98ad92209 100644 --- a/pkg/common/kafka/producer.go +++ b/pkg/common/kafka/producer.go @@ -25,7 +25,7 @@ func NewKafkaProducer(addr []string, topic string) *Producer { producer, err := sarama.NewSyncProducer(p.addr, p.config) //Initialize the client if err != nil { - panic(err) + panic(err.Error()) return nil } p.producer = producer diff --git a/pkg/common/log/logrus.go b/pkg/common/log/logrus.go index b88a6f6d3..03b768eca 100644 --- a/pkg/common/log/logrus.go +++ b/pkg/common/log/logrus.go @@ -34,7 +34,7 @@ func loggerInit(moduleName string) *Logger { //Close std console output src, err := os.OpenFile(os.DevNull, os.O_APPEND|os.O_WRONLY, os.ModeAppend) if err != nil { - panic(err) + panic(err.Error()) } writer := bufio.NewWriter(src) logger.SetOutput(writer) @@ -82,7 +82,7 @@ func initRotateLogs(rotationTime time.Duration, maxRemainNum uint, level string, rotatelogs.WithRotationCount(maxRemainNum), ) if err != nil { - panic(err) + panic(err.Error()) } else { return writer } diff --git a/pkg/utils/get_server_ip.go b/pkg/utils/get_server_ip.go index b7f6076c2..239c75a19 100644 --- a/pkg/utils/get_server_ip.go +++ b/pkg/utils/get_server_ip.go @@ -17,7 +17,7 @@ func init() { // see https://gist.github.com/jniltinho/9787946#gistcomment-3019898 conn, err := net.Dial("udp", "8.8.8.8:80") if err != nil { - panic(err) + panic(err.Error()) } defer conn.Close() From 0ea48af89227bc4ca8f5782644ec09401aa7e251 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 26 Nov 2021 14:34:00 +0800 Subject: [PATCH 04/34] panic output detail info --- pkg/common/db/model.go | 12 +++++++++++- pkg/common/db/mysql.go | 12 +++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkg/common/db/model.go b/pkg/common/db/model.go index becdd71b6..e2a1fb511 100644 --- a/pkg/common/db/model.go +++ b/pkg/common/db/model.go @@ -2,6 +2,7 @@ package db import ( "Open_IM/pkg/common/config" + "Open_IM/pkg/common/log" "github.com/garyburd/redigo/redis" "gopkg.in/mgo.v2" "time" @@ -20,6 +21,8 @@ func key(dbAddress, dbName string) string { } func init() { + var mgoSession *mgo.Session + var err1 error //mysql init initMysqlDB() // mongo init @@ -35,7 +38,14 @@ func init() { } mgoSession, err := mgo.DialWithInfo(mgoDailInfo) if err != nil { - panic(err.Error()) + log.NewError("mgo init err", err.Error(), mgoDailInfo) + } + if err != nil { + time.Sleep(time.Duration(30) * time.Second) + mgoSession, err1 = mgo.DialWithInfo(mgoDailInfo) + if err1 != nil { + panic(err1.Error()) + } } DB.mgoSession = mgoSession DB.mgoSession.SetMode(mgo.Monotonic, true) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 865571b7f..0740518ac 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -19,13 +19,19 @@ func initMysqlDB() { //When there is no open IM database, connect to the mysql built-in database to create openIM database dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local", config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], "mysql") - + var db *gorm.DB + var err1 error db, err := gorm.Open("mysql", dsn) if err != nil { log.Error("", "", dsn) - panic(err.Error()) } - + if err != nil { + time.Sleep(time.Duration(30) * time.Second) + db, err1 = gorm.Open("mysql", dsn) + if err1 != nil { + panic(err1.Error()) + } + } //Check the database and table during initialization sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s ;", config.Config.Mysql.DBDatabaseName) err = db.Exec(sql).Error From 7cb42c49de2ea01433b185c257c83f2a135b1142 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 11:19:24 +0800 Subject: [PATCH 05/34] pb file --- pkg/proto/user/user.proto | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkg/proto/user/user.proto b/pkg/proto/user/user.proto index e1d38fec6..6793dee78 100644 --- a/pkg/proto/user/user.proto +++ b/pkg/proto/user/user.proto @@ -64,10 +64,35 @@ message UpdateUserInfoReq{ string OperationID = 9; string Uid = 10; } +message GetUsersOnlineStatusReq{ + repeated string userIDList = 1; + string operationID = 2; +} +message GetUsersOnlineStatusResp{ + CommonResp commonResp = 1; + repeated SuccessResult successResult = 2; + repeated FailedDetail failedResult = 3; + message SuccessDetail{ + string platform = 1; + string status = 2; + } + message FailedDetail{ + string userID = 1; + CommonResp commonResp = 2; + } + message SuccessResult{ + string userID = 1; + string status = 2; + repeated SuccessDetail detailPlatformStatus = 3; + + } +} + service user { rpc getUserInfo(GetUserInfoReq) returns(GetUserInfoResp); rpc UpdateUserInfo(UpdateUserInfoReq) returns(CommonResp); rpc DeleteUsers(DeleteUsersReq)returns(DeleteUsersResp); rpc GetAllUsersUid(GetAllUsersUidReq)returns(GetAllUsersUidResp); + rpc GetUsersOnlineStatus(GetUsersOnlineStatusReq)returns(GetUsersOnlineStatusResp); } From b3dec3653acd761a96f9d74444bff53ce3806e3d Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 11:22:49 +0800 Subject: [PATCH 06/34] pb file --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index 72d21055f..f467159c9 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -6,7 +6,7 @@ serverversion: 1.0.3 etcd: etcdSchema: openIM etcdAddr: [ 127.0.0.1:2379 ] - +11 mysql: dbMysqlAddress: [ 127.0.0.1:13306 ] dbMysqlUserName: root From c7590c120d17bcc413b0dab6fb083539e62ea219 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 11:25:57 +0800 Subject: [PATCH 07/34] pb file --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index f467159c9..72d21055f 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -6,7 +6,7 @@ serverversion: 1.0.3 etcd: etcdSchema: openIM etcdAddr: [ 127.0.0.1:2379 ] -11 + mysql: dbMysqlAddress: [ 127.0.0.1:13306 ] dbMysqlUserName: root From 6c7483733f46e80d767b24f5f2c827acc78e6fcf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 29 Nov 2021 11:44:51 +0800 Subject: [PATCH 08/34] pbfile --- pkg/proto/user/user.pb.go | 397 +++++++++++++++++++++++++++++++++----- 1 file changed, 348 insertions(+), 49 deletions(-) diff --git a/pkg/proto/user/user.pb.go b/pkg/proto/user/user.pb.go index 32771e8e3..62afb489f 100644 --- a/pkg/proto/user/user.pb.go +++ b/pkg/proto/user/user.pb.go @@ -35,7 +35,7 @@ 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_user_9e1dacb346b997d7, []int{0} + return fileDescriptor_user_60873bcb313a530f, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -81,7 +81,7 @@ func (m *DeleteUsersResp) Reset() { *m = DeleteUsersResp{} } func (m *DeleteUsersResp) String() string { return proto.CompactTextString(m) } func (*DeleteUsersResp) ProtoMessage() {} func (*DeleteUsersResp) Descriptor() ([]byte, []int) { - return fileDescriptor_user_9e1dacb346b997d7, []int{1} + return fileDescriptor_user_60873bcb313a530f, []int{1} } func (m *DeleteUsersResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUsersResp.Unmarshal(m, b) @@ -128,7 +128,7 @@ func (m *DeleteUsersReq) Reset() { *m = DeleteUsersReq{} } func (m *DeleteUsersReq) String() string { return proto.CompactTextString(m) } func (*DeleteUsersReq) ProtoMessage() {} func (*DeleteUsersReq) Descriptor() ([]byte, []int) { - return fileDescriptor_user_9e1dacb346b997d7, []int{2} + return fileDescriptor_user_60873bcb313a530f, []int{2} } func (m *DeleteUsersReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUsersReq.Unmarshal(m, b) @@ -181,7 +181,7 @@ func (m *GetAllUsersUidReq) Reset() { *m = GetAllUsersUidReq{} } func (m *GetAllUsersUidReq) String() string { return proto.CompactTextString(m) } func (*GetAllUsersUidReq) ProtoMessage() {} func (*GetAllUsersUidReq) Descriptor() ([]byte, []int) { - return fileDescriptor_user_9e1dacb346b997d7, []int{3} + return fileDescriptor_user_60873bcb313a530f, []int{3} } func (m *GetAllUsersUidReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetAllUsersUidReq.Unmarshal(m, b) @@ -227,7 +227,7 @@ func (m *GetAllUsersUidResp) Reset() { *m = GetAllUsersUidResp{} } func (m *GetAllUsersUidResp) String() string { return proto.CompactTextString(m) } func (*GetAllUsersUidResp) ProtoMessage() {} func (*GetAllUsersUidResp) Descriptor() ([]byte, []int) { - return fileDescriptor_user_9e1dacb346b997d7, []int{4} + return fileDescriptor_user_60873bcb313a530f, []int{4} } func (m *GetAllUsersUidResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetAllUsersUidResp.Unmarshal(m, b) @@ -274,7 +274,7 @@ 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_user_9e1dacb346b997d7, []int{5} + return fileDescriptor_user_60873bcb313a530f, []int{5} } func (m *GetUserInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInfoReq.Unmarshal(m, b) @@ -328,7 +328,7 @@ 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_user_9e1dacb346b997d7, []int{6} + return fileDescriptor_user_60873bcb313a530f, []int{6} } func (m *GetUserInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInfoResp.Unmarshal(m, b) @@ -387,7 +387,7 @@ 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_user_9e1dacb346b997d7, []int{7} + return fileDescriptor_user_60873bcb313a530f, []int{7} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -475,7 +475,7 @@ 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_user_9e1dacb346b997d7, []int{8} + return fileDescriptor_user_60873bcb313a530f, []int{8} } func (m *LogoutReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LogoutReq.Unmarshal(m, b) @@ -529,7 +529,7 @@ 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_user_9e1dacb346b997d7, []int{9} + return fileDescriptor_user_60873bcb313a530f, []int{9} } func (m *UpdateUserInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUserInfoReq.Unmarshal(m, b) @@ -619,6 +619,256 @@ func (m *UpdateUserInfoReq) GetUid() string { return "" } +type GetUsersOnlineStatusReq struct { + UserIDList []string `protobuf:"bytes,1,rep,name=userIDList" json:"userIDList,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusReq) Reset() { *m = GetUsersOnlineStatusReq{} } +func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusReq) ProtoMessage() {} +func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) { + return fileDescriptor_user_60873bcb313a530f, []int{10} +} +func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusReq.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusReq.Merge(dst, src) +} +func (m *GetUsersOnlineStatusReq) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusReq.Size(m) +} +func (m *GetUsersOnlineStatusReq) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusReq.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusReq proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusReq) GetUserIDList() []string { + if m != nil { + return m.UserIDList + } + return nil +} + +func (m *GetUsersOnlineStatusReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +type GetUsersOnlineStatusResp struct { + CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"` + SuccessResult []*GetUsersOnlineStatusResp_SuccessResult `protobuf:"bytes,2,rep,name=successResult" json:"successResult,omitempty"` + FailedResult []*GetUsersOnlineStatusResp_FailedDetail `protobuf:"bytes,3,rep,name=failedResult" json:"failedResult,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp) Reset() { *m = GetUsersOnlineStatusResp{} } +func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp) ProtoMessage() {} +func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) { + return fileDescriptor_user_60873bcb313a530f, []int{11} +} +func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp.Size(m) +} +func (m *GetUsersOnlineStatusResp) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp) GetCommonResp() *CommonResp { + if m != nil { + return m.CommonResp + } + return nil +} + +func (m *GetUsersOnlineStatusResp) GetSuccessResult() []*GetUsersOnlineStatusResp_SuccessResult { + if m != nil { + return m.SuccessResult + } + return nil +} + +func (m *GetUsersOnlineStatusResp) GetFailedResult() []*GetUsersOnlineStatusResp_FailedDetail { + if m != nil { + return m.FailedResult + } + return nil +} + +type GetUsersOnlineStatusResp_SuccessDetail struct { + Platform string `protobuf:"bytes,1,opt,name=platform" json:"platform,omitempty"` + Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() { + *m = GetUsersOnlineStatusResp_SuccessDetail{} +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage() {} +func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) { + return fileDescriptor_user_60873bcb313a530f, []int{11, 0} +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp_SuccessDetail) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Size(m) +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp_SuccessDetail) GetPlatform() string { + if m != nil { + return m.Platform + } + return "" +} + +func (m *GetUsersOnlineStatusResp_SuccessDetail) GetStatus() string { + if m != nil { + return m.Status + } + return "" +} + +type GetUsersOnlineStatusResp_FailedDetail struct { + UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` + CommonResp *CommonResp `protobuf:"bytes,2,opt,name=commonResp" json:"commonResp,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp_FailedDetail) Reset() { *m = GetUsersOnlineStatusResp_FailedDetail{} } +func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage() {} +func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) { + return fileDescriptor_user_60873bcb313a530f, []int{11, 1} +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp_FailedDetail) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Size(m) +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp_FailedDetail) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *GetUsersOnlineStatusResp_FailedDetail) GetCommonResp() *CommonResp { + if m != nil { + return m.CommonResp + } + return nil +} + +type GetUsersOnlineStatusResp_SuccessResult struct { + UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` + Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` + DetailPlatformStatus []*GetUsersOnlineStatusResp_SuccessDetail `protobuf:"bytes,3,rep,name=detailPlatformStatus" json:"detailPlatformStatus,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() { + *m = GetUsersOnlineStatusResp_SuccessResult{} +} +func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage() {} +func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) { + return fileDescriptor_user_60873bcb313a530f, []int{11, 2} +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp_SuccessResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Size(m) +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp_SuccessResult) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *GetUsersOnlineStatusResp_SuccessResult) GetStatus() string { + if m != nil { + return m.Status + } + return "" +} + +func (m *GetUsersOnlineStatusResp_SuccessResult) GetDetailPlatformStatus() []*GetUsersOnlineStatusResp_SuccessDetail { + if m != nil { + return m.DetailPlatformStatus + } + return nil +} + func init() { proto.RegisterType((*CommonResp)(nil), "user.CommonResp") proto.RegisterType((*DeleteUsersResp)(nil), "user.DeleteUsersResp") @@ -630,6 +880,11 @@ func init() { proto.RegisterType((*UserInfo)(nil), "user.UserInfo") proto.RegisterType((*LogoutReq)(nil), "user.LogoutReq") proto.RegisterType((*UpdateUserInfoReq)(nil), "user.UpdateUserInfoReq") + proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "user.GetUsersOnlineStatusReq") + proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "user.GetUsersOnlineStatusResp") + proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "user.GetUsersOnlineStatusResp.SuccessDetail") + proto.RegisterType((*GetUsersOnlineStatusResp_FailedDetail)(nil), "user.GetUsersOnlineStatusResp.FailedDetail") + proto.RegisterType((*GetUsersOnlineStatusResp_SuccessResult)(nil), "user.GetUsersOnlineStatusResp.SuccessResult") } // Reference imports to suppress errors if they are not otherwise used. @@ -647,6 +902,7 @@ type UserClient interface { UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq, opts ...grpc.CallOption) (*CommonResp, error) DeleteUsers(ctx context.Context, in *DeleteUsersReq, opts ...grpc.CallOption) (*DeleteUsersResp, error) GetAllUsersUid(ctx context.Context, in *GetAllUsersUidReq, opts ...grpc.CallOption) (*GetAllUsersUidResp, error) + GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) } type userClient struct { @@ -693,6 +949,15 @@ func (c *userClient) GetAllUsersUid(ctx context.Context, in *GetAllUsersUidReq, return out, nil } +func (c *userClient) GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) { + out := new(GetUsersOnlineStatusResp) + err := grpc.Invoke(ctx, "/user.user/GetUsersOnlineStatus", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for User service type UserServer interface { @@ -700,6 +965,7 @@ type UserServer interface { UpdateUserInfo(context.Context, *UpdateUserInfoReq) (*CommonResp, error) DeleteUsers(context.Context, *DeleteUsersReq) (*DeleteUsersResp, error) GetAllUsersUid(context.Context, *GetAllUsersUidReq) (*GetAllUsersUidResp, error) + GetUsersOnlineStatus(context.Context, *GetUsersOnlineStatusReq) (*GetUsersOnlineStatusResp, error) } func RegisterUserServer(s *grpc.Server, srv UserServer) { @@ -778,6 +1044,24 @@ func _User_GetAllUsersUid_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } +func _User_GetUsersOnlineStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetUsersOnlineStatusReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UserServer).GetUsersOnlineStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/user.user/GetUsersOnlineStatus", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UserServer).GetUsersOnlineStatus(ctx, req.(*GetUsersOnlineStatusReq)) + } + return interceptor(ctx, in, info, handler) +} + var _User_serviceDesc = grpc.ServiceDesc{ ServiceName: "user.user", HandlerType: (*UserServer)(nil), @@ -798,49 +1082,64 @@ var _User_serviceDesc = grpc.ServiceDesc{ MethodName: "GetAllUsersUid", Handler: _User_GetAllUsersUid_Handler, }, + { + MethodName: "GetUsersOnlineStatus", + Handler: _User_GetUsersOnlineStatus_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "user/user.proto", } -func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_9e1dacb346b997d7) } +func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_60873bcb313a530f) } -var fileDescriptor_user_9e1dacb346b997d7 = []byte{ - // 562 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x95, 0xed, 0x24, 0x8d, 0x27, 0x6a, 0x92, 0xae, 0x0a, 0xac, 0x22, 0x84, 0x22, 0x8b, 0x43, - 0x4e, 0x01, 0x85, 0x1b, 0x3d, 0x41, 0x22, 0xaa, 0x88, 0xa2, 0x4a, 0x96, 0x7c, 0xe1, 0x84, 0xd3, - 0x9d, 0xa6, 0x2b, 0x1c, 0xaf, 0xb1, 0x37, 0x52, 0x8f, 0xfc, 0x24, 0xfe, 0x1a, 0xff, 0x00, 0xed, - 0x38, 0x4e, 0xfc, 0x55, 0x0e, 0x70, 0xb1, 0x76, 0xde, 0xae, 0xdf, 0xdb, 0x37, 0x33, 0x3b, 0x30, - 0xda, 0x67, 0x98, 0xbe, 0x31, 0x9f, 0x79, 0x92, 0x2a, 0xad, 0x58, 0xc7, 0xac, 0xbd, 0x4f, 0x00, - 0x4b, 0xb5, 0xdb, 0xa9, 0xd8, 0xc7, 0x2c, 0x61, 0x2f, 0xc1, 0xc5, 0x34, 0x55, 0xe9, 0x52, 0x09, - 0xe4, 0xd6, 0xd4, 0x9a, 0x75, 0xfd, 0x13, 0xc0, 0x26, 0xd0, 0xa7, 0xe0, 0x4b, 0xb6, 0xe5, 0xf6, - 0xd4, 0x9a, 0xb9, 0xfe, 0x31, 0xf6, 0x24, 0x8c, 0x56, 0x18, 0xa1, 0xc6, 0x20, 0xc3, 0x34, 0x23, - 0xb2, 0xb7, 0x00, 0x77, 0x47, 0x6a, 0x62, 0x1b, 0x2c, 0xc6, 0x73, 0xba, 0xc1, 0x49, 0xd2, 0x2f, - 0x9d, 0x61, 0xaf, 0xe1, 0xfc, 0x3e, 0x94, 0x11, 0x8a, 0x40, 0x8a, 0x1b, 0x99, 0x69, 0x6e, 0x4f, - 0x9d, 0x99, 0xeb, 0x57, 0x41, 0x2f, 0x86, 0x61, 0x45, 0xea, 0x87, 0xf9, 0x4f, 0xe4, 0x48, 0xf5, - 0xbf, 0x0a, 0xc8, 0x2e, 0xa1, 0xab, 0xd5, 0x77, 0x8c, 0xb9, 0x43, 0x77, 0xcf, 0x03, 0x36, 0x85, - 0xc1, 0x6d, 0x82, 0x69, 0xa8, 0xa5, 0x8a, 0xd7, 0x2b, 0xde, 0xa1, 0xbd, 0x32, 0xe4, 0x7d, 0x86, - 0x8b, 0x6b, 0xd4, 0x1f, 0xa2, 0x88, 0xf4, 0x02, 0x29, 0x8c, 0xe4, 0x91, 0xcc, 0xae, 0x91, 0xa9, - 0x12, 0x59, 0x2e, 0x54, 0x86, 0xbc, 0x6f, 0xc0, 0xea, 0x64, 0xff, 0x94, 0x2a, 0x0e, 0x67, 0xfb, - 0x8a, 0xd9, 0x22, 0xf4, 0x1e, 0x60, 0x78, 0x8d, 0xda, 0xd0, 0xaf, 0xe3, 0x7b, 0x65, 0xee, 0xfa, - 0x0a, 0xc0, 0x50, 0xad, 0x57, 0x74, 0xdc, 0xa2, 0xe3, 0x25, 0xe4, 0x69, 0x2f, 0xb7, 0x4d, 0x2f, - 0xe5, 0xc4, 0x28, 0x18, 0x55, 0x94, 0xfe, 0xa7, 0x81, 0x98, 0x07, 0x9d, 0x55, 0xa8, 0x43, 0xee, - 0x4c, 0x9d, 0xd9, 0x60, 0x31, 0xcc, 0xcd, 0x1f, 0xb9, 0x69, 0xcf, 0xfb, 0x65, 0x41, 0xbf, 0x80, - 0xd8, 0x18, 0x9c, 0xbd, 0x14, 0x24, 0xe2, 0xfa, 0x66, 0xc9, 0x18, 0x74, 0xe2, 0x70, 0x87, 0x07, - 0x6a, 0x5a, 0x1b, 0x4c, 0xde, 0xa9, 0xa2, 0xe6, 0xb4, 0x66, 0xcf, 0xa1, 0xb7, 0xc5, 0x58, 0x60, - 0x4a, 0xd5, 0xee, 0xfa, 0x87, 0xc8, 0xe0, 0x3b, 0xb5, 0x91, 0x11, 0xf2, 0x2e, 0x9d, 0x3e, 0x44, - 0x26, 0x3f, 0x1b, 0x99, 0xea, 0x07, 0xde, 0xcb, 0xf3, 0x43, 0x81, 0x41, 0x71, 0x17, 0xca, 0x88, - 0x9f, 0xe5, 0x28, 0x05, 0x6c, 0x08, 0x36, 0x3e, 0xf2, 0x3e, 0x41, 0x36, 0x3e, 0x7a, 0x4b, 0x70, - 0x6f, 0xd4, 0x56, 0xed, 0xb5, 0x29, 0x44, 0x2d, 0xa5, 0x56, 0x23, 0xa5, 0xed, 0xa5, 0xf0, 0x7e, - 0x5b, 0x70, 0x11, 0x24, 0x22, 0xcc, 0x5b, 0xbe, 0x28, 0x6b, 0x61, 0xcd, 0x2a, 0x59, 0x6b, 0x4b, - 0xc1, 0xc9, 0xae, 0xf3, 0x84, 0xdd, 0x4e, 0xbb, 0xdd, 0x6e, 0xab, 0xdd, 0x5e, 0xd3, 0xee, 0x59, - 0x61, 0xf7, 0x74, 0xff, 0xfe, 0x5f, 0x5a, 0xc9, 0x6d, 0xfa, 0x1e, 0x83, 0x13, 0x48, 0xc1, 0x21, - 0x2f, 0x66, 0x20, 0xc5, 0xe2, 0xa7, 0x0d, 0x34, 0xa1, 0xd8, 0x7b, 0x18, 0x6c, 0x4f, 0x5d, 0xc6, - 0x2e, 0xf3, 0xce, 0xa8, 0xb6, 0xf8, 0xe4, 0x59, 0x0b, 0x9a, 0x25, 0xec, 0x0a, 0x86, 0xd5, 0xbc, - 0xb1, 0x17, 0x87, 0xc6, 0xaa, 0x67, 0x73, 0xd2, 0x78, 0x6e, 0x46, 0xb8, 0x34, 0x67, 0x0a, 0xe1, - 0xea, 0xe8, 0x29, 0x84, 0xeb, 0xb3, 0x6f, 0x49, 0x8f, 0xb0, 0xf4, 0xcc, 0x0b, 0xe1, 0xc6, 0x24, - 0x99, 0xf0, 0xf6, 0x8d, 0x2c, 0xf9, 0x78, 0xfe, 0x75, 0x30, 0xa7, 0x89, 0x7d, 0x65, 0x3e, 0x9b, - 0x1e, 0xcd, 0xed, 0x77, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x30, 0xbd, 0x59, 0x5b, 0xca, 0x05, - 0x00, 0x00, +var fileDescriptor_user_60873bcb313a530f = []byte{ + // 746 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6a, 0xdb, 0x4c, + 0x14, 0x45, 0xf2, 0x4f, 0xec, 0xeb, 0xd8, 0x49, 0x06, 0x7f, 0x5f, 0x06, 0xd1, 0x06, 0x23, 0xba, + 0x30, 0xb4, 0xb8, 0xc5, 0xdd, 0x35, 0xab, 0xd6, 0x26, 0x21, 0x34, 0xc5, 0x45, 0xc1, 0x50, 0xda, + 0x4d, 0x14, 0x6b, 0xe2, 0x0c, 0x95, 0x35, 0x8a, 0x34, 0x82, 0xbc, 0x4e, 0xdf, 0xa0, 0x8b, 0xbe, + 0x4b, 0x9f, 0xa3, 0x6f, 0x50, 0xe6, 0x47, 0xb6, 0xfe, 0x9c, 0x84, 0x74, 0x63, 0xe6, 0xde, 0x99, + 0x39, 0x67, 0xce, 0x99, 0xb9, 0xba, 0x86, 0xbd, 0x24, 0x26, 0xd1, 0x6b, 0xf1, 0x33, 0x0a, 0x23, + 0xc6, 0x19, 0xaa, 0x8b, 0xb1, 0x7d, 0x02, 0x30, 0x61, 0xab, 0x15, 0x0b, 0x1c, 0x12, 0x87, 0xe8, + 0x19, 0xb4, 0x49, 0x14, 0xb1, 0x68, 0xc2, 0x3c, 0x82, 0x8d, 0x81, 0x31, 0x6c, 0x38, 0x9b, 0x04, + 0xb2, 0xa0, 0x25, 0x83, 0x4f, 0xf1, 0x12, 0x9b, 0x03, 0x63, 0xd8, 0x76, 0xd6, 0xb1, 0x4d, 0x61, + 0x6f, 0x4a, 0x7c, 0xc2, 0xc9, 0x3c, 0x26, 0x51, 0x2c, 0xc1, 0xde, 0x00, 0x2c, 0xd6, 0xd0, 0x12, + 0xad, 0x33, 0xde, 0x1f, 0xc9, 0x13, 0x6c, 0x28, 0x9d, 0xcc, 0x1a, 0xf4, 0x02, 0xba, 0xd7, 0x2e, + 0xf5, 0x89, 0x37, 0xa7, 0xde, 0x39, 0x8d, 0x39, 0x36, 0x07, 0xb5, 0x61, 0xdb, 0xc9, 0x27, 0xed, + 0x00, 0x7a, 0x39, 0xaa, 0x5b, 0xb1, 0xcf, 0x53, 0x99, 0xfc, 0xbe, 0x5c, 0x12, 0xf5, 0xa1, 0xc1, + 0xd9, 0x77, 0x12, 0xe0, 0x9a, 0x3c, 0xbb, 0x0a, 0xd0, 0x00, 0x3a, 0xb3, 0x90, 0x44, 0x2e, 0xa7, + 0x2c, 0x38, 0x9b, 0xe2, 0xba, 0x9c, 0xcb, 0xa6, 0xec, 0x8f, 0x70, 0x70, 0x4a, 0xf8, 0x7b, 0xdf, + 0x97, 0x7c, 0x73, 0xea, 0x09, 0xca, 0x35, 0x98, 0x59, 0x00, 0x63, 0x19, 0x30, 0x45, 0x94, 0x4d, + 0xd9, 0x97, 0x80, 0x8a, 0x60, 0x4f, 0xb2, 0x0a, 0xc3, 0x4e, 0x92, 0x13, 0x9b, 0x86, 0xf6, 0x0d, + 0xf4, 0x4e, 0x09, 0x17, 0xf0, 0x67, 0xc1, 0x35, 0x13, 0x67, 0x3d, 0x02, 0x10, 0x50, 0x67, 0x53, + 0xb9, 0xdc, 0x90, 0xcb, 0x33, 0x99, 0xed, 0x5a, 0x66, 0x65, 0x2d, 0x59, 0x63, 0x18, 0xec, 0xe5, + 0x98, 0xfe, 0xe5, 0x01, 0x21, 0x1b, 0xea, 0x53, 0x97, 0xbb, 0xb8, 0x36, 0xa8, 0x0d, 0x3b, 0xe3, + 0x9e, 0x12, 0xbf, 0xc6, 0x96, 0x73, 0xf6, 0x4f, 0x03, 0x5a, 0x69, 0x0a, 0xed, 0x43, 0x2d, 0xa1, + 0x9e, 0x24, 0x69, 0x3b, 0x62, 0x88, 0x10, 0xd4, 0x03, 0x77, 0x45, 0x34, 0xb4, 0x1c, 0x8b, 0x1c, + 0x5d, 0xb0, 0xf4, 0xce, 0xe5, 0x18, 0xfd, 0x0f, 0xcd, 0x25, 0x09, 0x3c, 0x12, 0xc9, 0xdb, 0x6e, + 0x38, 0x3a, 0x12, 0xf9, 0x15, 0xbb, 0xa2, 0x3e, 0xc1, 0x0d, 0xb9, 0x5a, 0x47, 0xc2, 0x9f, 0x2b, + 0x1a, 0xf1, 0x1b, 0xdc, 0x54, 0xfe, 0xc8, 0x40, 0x64, 0xc9, 0xca, 0xa5, 0x3e, 0xde, 0x51, 0x59, + 0x19, 0xa0, 0x1e, 0x98, 0xe4, 0x0e, 0xb7, 0x64, 0xca, 0x24, 0x77, 0xf6, 0x04, 0xda, 0xe7, 0x6c, + 0xc9, 0x12, 0x2e, 0x2e, 0xa2, 0x60, 0xa9, 0x51, 0xb2, 0xb4, 0xfa, 0x2a, 0xec, 0x3f, 0x06, 0x1c, + 0xcc, 0x43, 0xcf, 0x55, 0x4f, 0x3e, 0xbd, 0xd6, 0x54, 0x9a, 0x91, 0x91, 0x56, 0x65, 0xc1, 0x46, + 0x6e, 0x6d, 0x8b, 0xdc, 0x7a, 0xb5, 0xdc, 0x46, 0xa5, 0xdc, 0x66, 0x59, 0xee, 0x4e, 0x2a, 0x77, + 0x73, 0xfe, 0xd6, 0x3d, 0x4f, 0xa9, 0x5d, 0xd6, 0xbd, 0x0f, 0xb5, 0x39, 0xf5, 0x30, 0xa8, 0xcb, + 0x9c, 0x53, 0xcf, 0xfe, 0x06, 0x87, 0xfa, 0x71, 0xc5, 0xb3, 0xc0, 0xa7, 0x01, 0xb9, 0xe0, 0x2e, + 0x4f, 0xe2, 0xc7, 0xbc, 0xe7, 0x42, 0x15, 0x9a, 0xe5, 0x2a, 0xfc, 0x55, 0x07, 0x5c, 0x8d, 0xfe, + 0xa4, 0x62, 0x74, 0xa0, 0x1b, 0x27, 0x8b, 0x05, 0x89, 0x05, 0x40, 0xe2, 0xab, 0x92, 0xec, 0x8c, + 0x5f, 0xa9, 0x4d, 0xdb, 0x88, 0x46, 0x17, 0xd9, 0x3d, 0x4e, 0x1e, 0x02, 0xcd, 0x60, 0x57, 0x7d, + 0xf6, 0x34, 0xa4, 0xaa, 0x8b, 0x97, 0x0f, 0x40, 0x9e, 0xc8, 0x2d, 0x53, 0xc2, 0x5d, 0xea, 0x3b, + 0x39, 0x00, 0x6b, 0x02, 0x5d, 0x4d, 0xa8, 0xa6, 0x45, 0x35, 0x86, 0xbe, 0xcb, 0xaf, 0x59, 0xb4, + 0xd2, 0x6f, 0x68, 0x1d, 0x8b, 0xb7, 0x11, 0x4b, 0x54, 0xed, 0x9e, 0x8e, 0xac, 0x2f, 0xb0, 0x9b, + 0xa5, 0x10, 0xeb, 0x94, 0xf1, 0x1a, 0x41, 0x47, 0x05, 0x0f, 0xcd, 0x87, 0x3d, 0xb4, 0x7e, 0x18, + 0xeb, 0xf3, 0x69, 0x07, 0xb6, 0x61, 0x6f, 0x39, 0x1b, 0xba, 0x84, 0xbe, 0x27, 0x4f, 0xf5, 0x59, + 0xab, 0x50, 0xbe, 0x68, 0xe7, 0x1e, 0x79, 0x19, 0xda, 0xba, 0x4a, 0xa4, 0xf1, 0x6f, 0x13, 0x64, + 0xd7, 0x44, 0xef, 0xa0, 0xb3, 0xdc, 0x7c, 0xf9, 0x50, 0x3f, 0x87, 0xad, 0xeb, 0xd3, 0xfa, 0xaf, + 0x22, 0x1b, 0x87, 0xe8, 0x18, 0x7a, 0xf9, 0x5a, 0x46, 0x87, 0xfa, 0x63, 0x57, 0xac, 0x70, 0xab, + 0xe4, 0x98, 0x20, 0xce, 0xf4, 0xbe, 0x94, 0x38, 0xdf, 0x0e, 0x53, 0xe2, 0x62, 0x3f, 0x9e, 0xc8, + 0xc6, 0x90, 0x69, 0x3d, 0x29, 0x71, 0xa9, 0xbb, 0x59, 0xb8, 0x7a, 0x22, 0x0e, 0xd1, 0x1c, 0xfa, + 0x55, 0x16, 0xa2, 0xe7, 0xf7, 0xd9, 0x7b, 0x6b, 0x1d, 0xdd, 0xef, 0xfe, 0x87, 0xee, 0xd7, 0xce, + 0x48, 0xfe, 0x39, 0x39, 0x16, 0x3f, 0x57, 0x4d, 0xf9, 0x17, 0xe5, 0xed, 0xdf, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xae, 0xca, 0xfa, 0xdd, 0xb5, 0x08, 0x00, 0x00, } From d55eda0bb3c3de960833fc4e898706857193c40d Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 12:00:52 +0800 Subject: [PATCH 09/34] pb file --- pkg/proto/relay/relay.proto | 26 ++++++++++++++++++++++++++ pkg/proto/user/user.proto | 25 +------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/pkg/proto/relay/relay.proto b/pkg/proto/relay/relay.proto index 56b876c67..a3464e077 100644 --- a/pkg/proto/relay/relay.proto +++ b/pkg/proto/relay/relay.proto @@ -37,8 +37,34 @@ message SingleMsgToUser{ string RecvID = 2; int32 RecvPlatFormID = 3; } +message GetUsersOnlineStatusReq{ + repeated string userIDList = 1; + string operationID = 2; +} +message GetUsersOnlineStatusResp{ + int32 errCode = 1; + string errMsg = 2; + repeated SuccessResult successResult = 3; + repeated FailedDetail failedResult = 4; + message SuccessDetail{ + string platform = 1; + string status = 2; + } + message FailedDetail{ + string userID = 3; + int32 errCode = 1; + string errMsg = 2; + } + message SuccessResult{ + string userID = 1; + string status = 2; + repeated SuccessDetail detailPlatformStatus = 3; + + } +} service OnlineMessageRelayService { rpc MsgToUser(MsgToUserReq) returns(MsgToUserResp); + rpc GetUsersOnlineStatus(GetUsersOnlineStatusReq)returns(GetUsersOnlineStatusResp); // rpc SendMsgByWS(SendMsgByWSReq) returns(MsgToUserResp); } diff --git a/pkg/proto/user/user.proto b/pkg/proto/user/user.proto index 6793dee78..883ab5d73 100644 --- a/pkg/proto/user/user.proto +++ b/pkg/proto/user/user.proto @@ -64,29 +64,6 @@ message UpdateUserInfoReq{ string OperationID = 9; string Uid = 10; } -message GetUsersOnlineStatusReq{ - repeated string userIDList = 1; - string operationID = 2; -} -message GetUsersOnlineStatusResp{ - CommonResp commonResp = 1; - repeated SuccessResult successResult = 2; - repeated FailedDetail failedResult = 3; - message SuccessDetail{ - string platform = 1; - string status = 2; - } - message FailedDetail{ - string userID = 1; - CommonResp commonResp = 2; - } - message SuccessResult{ - string userID = 1; - string status = 2; - repeated SuccessDetail detailPlatformStatus = 3; - - } -} service user { @@ -94,5 +71,5 @@ service user { rpc UpdateUserInfo(UpdateUserInfoReq) returns(CommonResp); rpc DeleteUsers(DeleteUsersReq)returns(DeleteUsersResp); rpc GetAllUsersUid(GetAllUsersUidReq)returns(GetAllUsersUidResp); - rpc GetUsersOnlineStatus(GetUsersOnlineStatusReq)returns(GetUsersOnlineStatusResp); + } From 8a8e33763c72b72c37d9581cf679ac1060ec61ed Mon Sep 17 00:00:00 2001 From: root Date: Mon, 29 Nov 2021 12:01:53 +0800 Subject: [PATCH 10/34] pbfile --- pkg/proto/relay/relay.pb.go | 382 +++++++++++++++++++++++++++++++--- pkg/proto/user/user.pb.go | 397 +++++------------------------------- 2 files changed, 399 insertions(+), 380 deletions(-) diff --git a/pkg/proto/relay/relay.pb.go b/pkg/proto/relay/relay.pb.go index 32fcc227c..d56aae9e0 100644 --- a/pkg/proto/relay/relay.pb.go +++ b/pkg/proto/relay/relay.pb.go @@ -47,7 +47,7 @@ func (m *MsgToUserReq) Reset() { *m = MsgToUserReq{} } func (m *MsgToUserReq) String() string { return proto.CompactTextString(m) } func (*MsgToUserReq) ProtoMessage() {} func (*MsgToUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_ff2396ffa84abfa7, []int{0} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{0} } func (m *MsgToUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgToUserReq.Unmarshal(m, b) @@ -176,7 +176,7 @@ func (m *MsgToUserResp) Reset() { *m = MsgToUserResp{} } func (m *MsgToUserResp) String() string { return proto.CompactTextString(m) } func (*MsgToUserResp) ProtoMessage() {} func (*MsgToUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_ff2396ffa84abfa7, []int{1} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{1} } func (m *MsgToUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgToUserResp.Unmarshal(m, b) @@ -227,7 +227,7 @@ func (m *SingleMsgToUser) Reset() { *m = SingleMsgToUser{} } func (m *SingleMsgToUser) String() string { return proto.CompactTextString(m) } func (*SingleMsgToUser) ProtoMessage() {} func (*SingleMsgToUser) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_ff2396ffa84abfa7, []int{2} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{2} } func (m *SingleMsgToUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SingleMsgToUser.Unmarshal(m, b) @@ -268,10 +268,281 @@ func (m *SingleMsgToUser) GetRecvPlatFormID() int32 { return 0 } +type GetUsersOnlineStatusReq struct { + UserIDList []string `protobuf:"bytes,1,rep,name=userIDList" json:"userIDList,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusReq) Reset() { *m = GetUsersOnlineStatusReq{} } +func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusReq) ProtoMessage() {} +func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) { + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{3} +} +func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusReq.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusReq.Merge(dst, src) +} +func (m *GetUsersOnlineStatusReq) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusReq.Size(m) +} +func (m *GetUsersOnlineStatusReq) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusReq.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusReq proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusReq) GetUserIDList() []string { + if m != nil { + return m.UserIDList + } + return nil +} + +func (m *GetUsersOnlineStatusReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +type GetUsersOnlineStatusResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + SuccessResult []*GetUsersOnlineStatusResp_SuccessResult `protobuf:"bytes,3,rep,name=successResult" json:"successResult,omitempty"` + FailedResult []*GetUsersOnlineStatusResp_FailedDetail `protobuf:"bytes,4,rep,name=failedResult" json:"failedResult,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp) Reset() { *m = GetUsersOnlineStatusResp{} } +func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp) ProtoMessage() {} +func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) { + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4} +} +func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp.Size(m) +} +func (m *GetUsersOnlineStatusResp) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *GetUsersOnlineStatusResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +func (m *GetUsersOnlineStatusResp) GetSuccessResult() []*GetUsersOnlineStatusResp_SuccessResult { + if m != nil { + return m.SuccessResult + } + return nil +} + +func (m *GetUsersOnlineStatusResp) GetFailedResult() []*GetUsersOnlineStatusResp_FailedDetail { + if m != nil { + return m.FailedResult + } + return nil +} + +type GetUsersOnlineStatusResp_SuccessDetail struct { + Platform string `protobuf:"bytes,1,opt,name=platform" json:"platform,omitempty"` + Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() { + *m = GetUsersOnlineStatusResp_SuccessDetail{} +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage() {} +func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) { + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 0} +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp_SuccessDetail) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Size(m) +} +func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp_SuccessDetail) GetPlatform() string { + if m != nil { + return m.Platform + } + return "" +} + +func (m *GetUsersOnlineStatusResp_SuccessDetail) GetStatus() string { + if m != nil { + return m.Status + } + return "" +} + +type GetUsersOnlineStatusResp_FailedDetail struct { + UserID string `protobuf:"bytes,3,opt,name=userID" json:"userID,omitempty"` + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp_FailedDetail) Reset() { *m = GetUsersOnlineStatusResp_FailedDetail{} } +func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage() {} +func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) { + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 1} +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp_FailedDetail) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Size(m) +} +func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp_FailedDetail) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *GetUsersOnlineStatusResp_FailedDetail) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *GetUsersOnlineStatusResp_FailedDetail) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type GetUsersOnlineStatusResp_SuccessResult struct { + UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` + Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` + DetailPlatformStatus []*GetUsersOnlineStatusResp_SuccessDetail `protobuf:"bytes,3,rep,name=detailPlatformStatus" json:"detailPlatformStatus,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() { + *m = GetUsersOnlineStatusResp_SuccessResult{} +} +func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) } +func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage() {} +func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) { + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 2} +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b) +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Marshal(b, m, deterministic) +} +func (dst *GetUsersOnlineStatusResp_SuccessResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Merge(dst, src) +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Size() int { + return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Size(m) +} +func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_DiscardUnknown() { + xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult proto.InternalMessageInfo + +func (m *GetUsersOnlineStatusResp_SuccessResult) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *GetUsersOnlineStatusResp_SuccessResult) GetStatus() string { + if m != nil { + return m.Status + } + return "" +} + +func (m *GetUsersOnlineStatusResp_SuccessResult) GetDetailPlatformStatus() []*GetUsersOnlineStatusResp_SuccessDetail { + if m != nil { + return m.DetailPlatformStatus + } + return nil +} + func init() { proto.RegisterType((*MsgToUserReq)(nil), "relay.MsgToUserReq") proto.RegisterType((*MsgToUserResp)(nil), "relay.MsgToUserResp") proto.RegisterType((*SingleMsgToUser)(nil), "relay.SingleMsgToUser") + proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "relay.GetUsersOnlineStatusReq") + proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "relay.GetUsersOnlineStatusResp") + proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "relay.GetUsersOnlineStatusResp.SuccessDetail") + proto.RegisterType((*GetUsersOnlineStatusResp_FailedDetail)(nil), "relay.GetUsersOnlineStatusResp.FailedDetail") + proto.RegisterType((*GetUsersOnlineStatusResp_SuccessResult)(nil), "relay.GetUsersOnlineStatusResp.SuccessResult") } // Reference imports to suppress errors if they are not otherwise used. @@ -286,6 +557,7 @@ const _ = grpc.SupportPackageIsVersion4 type OnlineMessageRelayServiceClient interface { MsgToUser(ctx context.Context, in *MsgToUserReq, opts ...grpc.CallOption) (*MsgToUserResp, error) + GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) } type onlineMessageRelayServiceClient struct { @@ -305,10 +577,20 @@ func (c *onlineMessageRelayServiceClient) MsgToUser(ctx context.Context, in *Msg return out, nil } +func (c *onlineMessageRelayServiceClient) GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) { + out := new(GetUsersOnlineStatusResp) + err := grpc.Invoke(ctx, "/relay.OnlineMessageRelayService/GetUsersOnlineStatus", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for OnlineMessageRelayService service type OnlineMessageRelayServiceServer interface { MsgToUser(context.Context, *MsgToUserReq) (*MsgToUserResp, error) + GetUsersOnlineStatus(context.Context, *GetUsersOnlineStatusReq) (*GetUsersOnlineStatusResp, error) } func RegisterOnlineMessageRelayServiceServer(s *grpc.Server, srv OnlineMessageRelayServiceServer) { @@ -333,6 +615,24 @@ func _OnlineMessageRelayService_MsgToUser_Handler(srv interface{}, ctx context.C return interceptor(ctx, in, info, handler) } +func _OnlineMessageRelayService_GetUsersOnlineStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetUsersOnlineStatusReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OnlineMessageRelayServiceServer).GetUsersOnlineStatus(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/relay.OnlineMessageRelayService/GetUsersOnlineStatus", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OnlineMessageRelayServiceServer).GetUsersOnlineStatus(ctx, req.(*GetUsersOnlineStatusReq)) + } + return interceptor(ctx, in, info, handler) +} + var _OnlineMessageRelayService_serviceDesc = grpc.ServiceDesc{ ServiceName: "relay.OnlineMessageRelayService", HandlerType: (*OnlineMessageRelayServiceServer)(nil), @@ -341,39 +641,57 @@ var _OnlineMessageRelayService_serviceDesc = grpc.ServiceDesc{ MethodName: "MsgToUser", Handler: _OnlineMessageRelayService_MsgToUser_Handler, }, + { + MethodName: "GetUsersOnlineStatus", + Handler: _OnlineMessageRelayService_GetUsersOnlineStatus_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "relay/relay.proto", } -func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_ff2396ffa84abfa7) } +func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_709d2b3cc3a7ad83) } -var fileDescriptor_relay_ff2396ffa84abfa7 = []byte{ - // 414 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xc1, 0x6b, 0xdb, 0x30, - 0x14, 0xc6, 0xf1, 0xbc, 0xa4, 0xcd, 0x4b, 0x93, 0xac, 0xda, 0x28, 0x5a, 0x0f, 0xc3, 0x84, 0x51, - 0xc2, 0x0e, 0x19, 0x74, 0xb0, 0x4b, 0x6f, 0xab, 0x09, 0x18, 0xe6, 0x76, 0xc8, 0xe9, 0x65, 0x37, - 0xd7, 0x7d, 0x33, 0x62, 0xb6, 0xe4, 0x48, 0x5e, 0xa1, 0xff, 0xdd, 0xfe, 0xb4, 0xa1, 0xa7, 0x64, - 0xd1, 0x32, 0x7a, 0x31, 0xfe, 0x7e, 0xef, 0xf3, 0xf3, 0xa7, 0xa7, 0x07, 0xa7, 0x06, 0x9b, 0xf2, - 0xe9, 0x23, 0x3d, 0x97, 0x9d, 0xd1, 0xbd, 0x66, 0x03, 0x12, 0xf3, 0xdf, 0x31, 0x9c, 0xe4, 0xb6, - 0x5e, 0xeb, 0x3b, 0x8b, 0x46, 0xe0, 0x86, 0x9d, 0xc1, 0xb0, 0x40, 0xf5, 0x90, 0xa5, 0x3c, 0x4a, - 0xa2, 0xc5, 0x48, 0x6c, 0x95, 0xe3, 0x02, 0xab, 0xc7, 0x2c, 0xe5, 0x2f, 0x3c, 0xf7, 0x8a, 0x71, - 0x38, 0xba, 0xd6, 0xaa, 0x47, 0xd5, 0xf3, 0x01, 0x15, 0x76, 0xd2, 0x55, 0x9c, 0xa7, 0xc0, 0x0d, - 0x1f, 0x26, 0xd1, 0x22, 0x16, 0x3b, 0xc9, 0xce, 0xe1, 0xd8, 0x75, 0x5d, 0xcb, 0x16, 0xf9, 0x11, - 0x95, 0xfe, 0x6a, 0xf7, 0x55, 0x6e, 0xeb, 0x95, 0xd1, 0x2d, 0x3f, 0x4e, 0xa2, 0xc5, 0x40, 0xec, - 0x24, 0x4b, 0x60, 0xbc, 0x6d, 0xbd, 0x7e, 0xea, 0x90, 0x8f, 0xa8, 0x1a, 0x22, 0xe7, 0x28, 0xd0, - 0x5a, 0xa9, 0x15, 0x39, 0xc0, 0x3b, 0x02, 0xe4, 0x1c, 0xb7, 0x1d, 0x9a, 0xb2, 0x97, 0x5a, 0x65, - 0x29, 0x1f, 0x53, 0xe2, 0x10, 0xf9, 0x1e, 0xe6, 0x11, 0x4d, 0x6e, 0xeb, 0x2c, 0xe5, 0x27, 0xde, - 0x11, 0x20, 0xf6, 0x0e, 0xe0, 0x5b, 0x53, 0xf6, 0x3f, 0xb4, 0x69, 0xb3, 0x94, 0x4f, 0xe8, 0x27, - 0x01, 0x61, 0x17, 0x30, 0x75, 0xa7, 0x41, 0x73, 0x23, 0xab, 0x9f, 0x37, 0x65, 0x8b, 0x7c, 0x4a, - 0x4d, 0x0e, 0x28, 0x7b, 0x0f, 0x13, 0x4f, 0x56, 0x65, 0x85, 0x77, 0xe2, 0x2b, 0x9f, 0x91, 0xed, - 0x5f, 0x48, 0xa7, 0x6e, 0x24, 0xaa, 0xde, 0xe7, 0x79, 0xe5, 0xf3, 0x04, 0x68, 0x7e, 0x05, 0x93, - 0xe0, 0x06, 0x6d, 0xc7, 0x3e, 0xc0, 0x4b, 0x83, 0xb6, 0xe3, 0x51, 0x12, 0x2f, 0xc6, 0x97, 0x67, - 0x4b, 0x7f, 0xed, 0x85, 0x54, 0x75, 0x83, 0x7b, 0x27, 0x79, 0xe6, 0x1b, 0x98, 0x1d, 0x14, 0xdc, - 0xf9, 0x04, 0xda, 0x5f, 0x4d, 0x7f, 0xad, 0x1f, 0x90, 0xb6, 0x20, 0x16, 0x01, 0x79, 0x76, 0x13, - 0x2e, 0x60, 0xea, 0xde, 0xdc, 0x24, 0x56, 0x7e, 0x36, 0x31, 0xcd, 0xe6, 0x80, 0x5e, 0x16, 0xf0, - 0xf6, 0x56, 0x35, 0x52, 0x61, 0x8e, 0xd6, 0x96, 0x35, 0x0a, 0x17, 0xcf, 0x0d, 0x58, 0x56, 0xc8, - 0x3e, 0xc3, 0x68, 0x9f, 0xe4, 0xf5, 0x36, 0x7a, 0xb8, 0xa0, 0xe7, 0x6f, 0xfe, 0x87, 0xb6, 0xfb, - 0x72, 0xfa, 0x7d, 0xb6, 0xf4, 0xfb, 0x7d, 0xd5, 0xdd, 0x53, 0xc7, 0xfb, 0x21, 0x2d, 0xfa, 0xa7, - 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x9b, 0x83, 0x12, 0xfd, 0x02, 0x00, 0x00, +var fileDescriptor_relay_709d2b3cc3a7ad83 = []byte{ + // 628 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6b, 0xdb, 0x4c, + 0x10, 0x45, 0x9f, 0xe2, 0x24, 0x9e, 0xd8, 0xc9, 0x97, 0x6d, 0x48, 0xb7, 0x3a, 0xa4, 0xc6, 0x94, + 0x60, 0x4a, 0xeb, 0x42, 0x0a, 0xbd, 0xe4, 0x56, 0x0b, 0x17, 0x41, 0x9c, 0x84, 0x95, 0x43, 0x4b, + 0x7b, 0x52, 0xe4, 0x89, 0x11, 0x95, 0x25, 0x79, 0x77, 0x1d, 0xc8, 0xdf, 0xe9, 0xb9, 0xf7, 0x5e, + 0xfb, 0xd3, 0xca, 0xee, 0x4a, 0xf6, 0xda, 0xb5, 0x1b, 0x72, 0x31, 0x7e, 0x6f, 0x66, 0xdf, 0xcc, + 0xbc, 0xd9, 0x15, 0x1c, 0x72, 0x4c, 0xa3, 0x87, 0x77, 0xfa, 0xb7, 0x5b, 0xf0, 0x5c, 0xe6, 0xa4, + 0xa6, 0x41, 0xfb, 0xb7, 0x0b, 0x8d, 0x81, 0x18, 0x0f, 0xf3, 0x1b, 0x81, 0x9c, 0xe1, 0x94, 0x1c, + 0xc3, 0x76, 0x88, 0xd9, 0x28, 0xf0, 0xa9, 0xd3, 0x72, 0x3a, 0x75, 0x56, 0x22, 0xc5, 0x33, 0x8c, + 0xef, 0x03, 0x9f, 0xfe, 0x67, 0x78, 0x83, 0x08, 0x85, 0x9d, 0x5e, 0x9e, 0x49, 0xcc, 0x24, 0xad, + 0xe9, 0x40, 0x05, 0x55, 0x44, 0xe5, 0x84, 0x38, 0xa5, 0xdb, 0x2d, 0xa7, 0xe3, 0xb2, 0x0a, 0x12, + 0x0f, 0x76, 0x95, 0xea, 0x30, 0x99, 0x20, 0xdd, 0xd1, 0xa1, 0x39, 0x56, 0xa7, 0x06, 0x62, 0xdc, + 0xe7, 0xf9, 0x84, 0xee, 0xb6, 0x9c, 0x4e, 0x8d, 0x55, 0x90, 0xb4, 0x60, 0xaf, 0x94, 0x1e, 0x3e, + 0x14, 0x48, 0xeb, 0x3a, 0x6a, 0x53, 0x2a, 0x23, 0x44, 0x21, 0x92, 0x3c, 0xd3, 0x19, 0x60, 0x32, + 0x2c, 0x4a, 0x65, 0x5c, 0x15, 0xc8, 0x23, 0x99, 0xe4, 0x59, 0xe0, 0xd3, 0x3d, 0xdd, 0xb1, 0x4d, + 0x19, 0x0d, 0x7e, 0x8f, 0x7c, 0x20, 0xc6, 0x81, 0x4f, 0x1b, 0x26, 0xc3, 0xa2, 0xc8, 0x09, 0xc0, + 0x75, 0x1a, 0xc9, 0xbb, 0x9c, 0x4f, 0x02, 0x9f, 0x36, 0x75, 0x11, 0x8b, 0x21, 0xa7, 0xb0, 0xaf, + 0xa6, 0x41, 0x7e, 0x99, 0xc4, 0xdf, 0x2f, 0xa3, 0x09, 0xd2, 0x7d, 0x2d, 0xb2, 0xc2, 0x92, 0x57, + 0xd0, 0x34, 0x4c, 0x3f, 0x8a, 0xf1, 0x86, 0x5d, 0xd0, 0x03, 0x9d, 0xb6, 0x4c, 0xea, 0xa9, 0xd3, + 0x04, 0x33, 0x69, 0xfa, 0xf9, 0xdf, 0xf4, 0x63, 0x51, 0xed, 0x73, 0x68, 0x5a, 0x1b, 0x14, 0x05, + 0x79, 0x0d, 0x5b, 0x1c, 0x45, 0x41, 0x9d, 0x96, 0xdb, 0xd9, 0x3b, 0x3b, 0xee, 0x9a, 0xb5, 0x87, + 0x49, 0x36, 0x4e, 0x71, 0x91, 0xa9, 0x73, 0xda, 0x53, 0x38, 0x58, 0x09, 0xa8, 0xf9, 0x18, 0x8a, + 0x59, 0x2a, 0x7b, 0xf9, 0x08, 0xf5, 0x2d, 0x70, 0x99, 0xc5, 0x6c, 0xbc, 0x09, 0xa7, 0xb0, 0xaf, + 0xfe, 0x29, 0x27, 0xfa, 0xc6, 0x1b, 0x57, 0x7b, 0xb3, 0xc2, 0xb6, 0xbf, 0xc1, 0xf3, 0x4f, 0x28, + 0x55, 0x29, 0x71, 0x95, 0xa5, 0x49, 0x86, 0xa1, 0x8c, 0xe4, 0x4c, 0xa8, 0xcb, 0x77, 0x02, 0x30, + 0x13, 0xc8, 0x03, 0xff, 0x22, 0x11, 0x52, 0xf7, 0x5f, 0x67, 0x16, 0xa3, 0xcc, 0xc8, 0xad, 0xf5, + 0x99, 0xfa, 0x36, 0xd5, 0xfe, 0xb5, 0x05, 0x74, 0xbd, 0xba, 0x28, 0xd4, 0xdd, 0x42, 0xce, 0xe7, + 0x63, 0xd5, 0x58, 0x05, 0xd5, 0x4c, 0xc8, 0xd5, 0x7e, 0xab, 0x99, 0x0c, 0x22, 0x21, 0x34, 0xc5, + 0x2c, 0x8e, 0x51, 0x08, 0x63, 0x00, 0x75, 0xb5, 0xa7, 0x6f, 0x4b, 0x4f, 0x37, 0x55, 0xea, 0x86, + 0xf6, 0x21, 0xb6, 0xac, 0x41, 0xae, 0xa1, 0x71, 0x17, 0x25, 0x29, 0x8e, 0x4a, 0xcd, 0x2d, 0xad, + 0xf9, 0xe6, 0x31, 0xcd, 0xbe, 0x3e, 0xe3, 0xa3, 0x8c, 0x92, 0x94, 0x2d, 0x29, 0x78, 0x3d, 0x68, + 0x96, 0x15, 0x4d, 0x58, 0xbd, 0xb0, 0xa2, 0xbc, 0x91, 0xe5, 0x3b, 0x9e, 0x63, 0x35, 0xab, 0xd0, + 0xaa, 0xd5, 0xac, 0x06, 0x79, 0x5f, 0xa0, 0x61, 0x97, 0x50, 0x79, 0xc6, 0x7a, 0xbd, 0xc7, 0x3a, + 0x2b, 0xd1, 0xd3, 0x5d, 0xf4, 0x7e, 0x38, 0xf3, 0xfe, 0x4a, 0x0b, 0x16, 0xda, 0xce, 0x92, 0xf6, + 0x86, 0xde, 0x48, 0x04, 0x47, 0x23, 0xdd, 0x55, 0xf5, 0xce, 0x8c, 0x2f, 0x4f, 0x5c, 0x47, 0xe9, + 0xdd, 0x5a, 0xa9, 0xb3, 0x9f, 0x0e, 0xbc, 0x30, 0x07, 0x07, 0x28, 0x44, 0x34, 0x46, 0xa6, 0x34, + 0xd5, 0xc3, 0x4f, 0x62, 0x24, 0x1f, 0xa0, 0xbe, 0x78, 0x21, 0xcf, 0xca, 0x7a, 0xf6, 0x87, 0xd3, + 0x3b, 0xfa, 0x9b, 0x14, 0x05, 0xf9, 0x0c, 0x47, 0xeb, 0xba, 0x22, 0x27, 0xff, 0x6c, 0x79, 0xea, + 0xbd, 0x7c, 0x64, 0xa4, 0x8f, 0x87, 0x5f, 0x0f, 0xba, 0xe6, 0x83, 0x7e, 0x5e, 0xdc, 0xea, 0x56, + 0x6f, 0xb7, 0xf5, 0x97, 0xfd, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xe4, 0x7c, 0xdc, + 0xee, 0x05, 0x00, 0x00, } diff --git a/pkg/proto/user/user.pb.go b/pkg/proto/user/user.pb.go index 62afb489f..298512e1b 100644 --- a/pkg/proto/user/user.pb.go +++ b/pkg/proto/user/user.pb.go @@ -35,7 +35,7 @@ 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_user_60873bcb313a530f, []int{0} + return fileDescriptor_user_23985c8245c722d0, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -81,7 +81,7 @@ func (m *DeleteUsersResp) Reset() { *m = DeleteUsersResp{} } func (m *DeleteUsersResp) String() string { return proto.CompactTextString(m) } func (*DeleteUsersResp) ProtoMessage() {} func (*DeleteUsersResp) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{1} + return fileDescriptor_user_23985c8245c722d0, []int{1} } func (m *DeleteUsersResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUsersResp.Unmarshal(m, b) @@ -128,7 +128,7 @@ func (m *DeleteUsersReq) Reset() { *m = DeleteUsersReq{} } func (m *DeleteUsersReq) String() string { return proto.CompactTextString(m) } func (*DeleteUsersReq) ProtoMessage() {} func (*DeleteUsersReq) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{2} + return fileDescriptor_user_23985c8245c722d0, []int{2} } func (m *DeleteUsersReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUsersReq.Unmarshal(m, b) @@ -181,7 +181,7 @@ func (m *GetAllUsersUidReq) Reset() { *m = GetAllUsersUidReq{} } func (m *GetAllUsersUidReq) String() string { return proto.CompactTextString(m) } func (*GetAllUsersUidReq) ProtoMessage() {} func (*GetAllUsersUidReq) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{3} + return fileDescriptor_user_23985c8245c722d0, []int{3} } func (m *GetAllUsersUidReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetAllUsersUidReq.Unmarshal(m, b) @@ -227,7 +227,7 @@ func (m *GetAllUsersUidResp) Reset() { *m = GetAllUsersUidResp{} } func (m *GetAllUsersUidResp) String() string { return proto.CompactTextString(m) } func (*GetAllUsersUidResp) ProtoMessage() {} func (*GetAllUsersUidResp) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{4} + return fileDescriptor_user_23985c8245c722d0, []int{4} } func (m *GetAllUsersUidResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetAllUsersUidResp.Unmarshal(m, b) @@ -274,7 +274,7 @@ 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_user_60873bcb313a530f, []int{5} + return fileDescriptor_user_23985c8245c722d0, []int{5} } func (m *GetUserInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInfoReq.Unmarshal(m, b) @@ -328,7 +328,7 @@ 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_user_60873bcb313a530f, []int{6} + return fileDescriptor_user_23985c8245c722d0, []int{6} } func (m *GetUserInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInfoResp.Unmarshal(m, b) @@ -387,7 +387,7 @@ 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_user_60873bcb313a530f, []int{7} + return fileDescriptor_user_23985c8245c722d0, []int{7} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -475,7 +475,7 @@ 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_user_60873bcb313a530f, []int{8} + return fileDescriptor_user_23985c8245c722d0, []int{8} } func (m *LogoutReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LogoutReq.Unmarshal(m, b) @@ -529,7 +529,7 @@ 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_user_60873bcb313a530f, []int{9} + return fileDescriptor_user_23985c8245c722d0, []int{9} } func (m *UpdateUserInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUserInfoReq.Unmarshal(m, b) @@ -619,256 +619,6 @@ func (m *UpdateUserInfoReq) GetUid() string { return "" } -type GetUsersOnlineStatusReq struct { - UserIDList []string `protobuf:"bytes,1,rep,name=userIDList" json:"userIDList,omitempty"` - OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetUsersOnlineStatusReq) Reset() { *m = GetUsersOnlineStatusReq{} } -func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) } -func (*GetUsersOnlineStatusReq) ProtoMessage() {} -func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{10} -} -func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b) -} -func (m *GetUsersOnlineStatusReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetUsersOnlineStatusReq.Marshal(b, m, deterministic) -} -func (dst *GetUsersOnlineStatusReq) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUsersOnlineStatusReq.Merge(dst, src) -} -func (m *GetUsersOnlineStatusReq) XXX_Size() int { - return xxx_messageInfo_GetUsersOnlineStatusReq.Size(m) -} -func (m *GetUsersOnlineStatusReq) XXX_DiscardUnknown() { - xxx_messageInfo_GetUsersOnlineStatusReq.DiscardUnknown(m) -} - -var xxx_messageInfo_GetUsersOnlineStatusReq proto.InternalMessageInfo - -func (m *GetUsersOnlineStatusReq) GetUserIDList() []string { - if m != nil { - return m.UserIDList - } - return nil -} - -func (m *GetUsersOnlineStatusReq) GetOperationID() string { - if m != nil { - return m.OperationID - } - return "" -} - -type GetUsersOnlineStatusResp struct { - CommonResp *CommonResp `protobuf:"bytes,1,opt,name=commonResp" json:"commonResp,omitempty"` - SuccessResult []*GetUsersOnlineStatusResp_SuccessResult `protobuf:"bytes,2,rep,name=successResult" json:"successResult,omitempty"` - FailedResult []*GetUsersOnlineStatusResp_FailedDetail `protobuf:"bytes,3,rep,name=failedResult" json:"failedResult,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetUsersOnlineStatusResp) Reset() { *m = GetUsersOnlineStatusResp{} } -func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) } -func (*GetUsersOnlineStatusResp) ProtoMessage() {} -func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{11} -} -func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b) -} -func (m *GetUsersOnlineStatusResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetUsersOnlineStatusResp.Marshal(b, m, deterministic) -} -func (dst *GetUsersOnlineStatusResp) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUsersOnlineStatusResp.Merge(dst, src) -} -func (m *GetUsersOnlineStatusResp) XXX_Size() int { - return xxx_messageInfo_GetUsersOnlineStatusResp.Size(m) -} -func (m *GetUsersOnlineStatusResp) XXX_DiscardUnknown() { - xxx_messageInfo_GetUsersOnlineStatusResp.DiscardUnknown(m) -} - -var xxx_messageInfo_GetUsersOnlineStatusResp proto.InternalMessageInfo - -func (m *GetUsersOnlineStatusResp) GetCommonResp() *CommonResp { - if m != nil { - return m.CommonResp - } - return nil -} - -func (m *GetUsersOnlineStatusResp) GetSuccessResult() []*GetUsersOnlineStatusResp_SuccessResult { - if m != nil { - return m.SuccessResult - } - return nil -} - -func (m *GetUsersOnlineStatusResp) GetFailedResult() []*GetUsersOnlineStatusResp_FailedDetail { - if m != nil { - return m.FailedResult - } - return nil -} - -type GetUsersOnlineStatusResp_SuccessDetail struct { - Platform string `protobuf:"bytes,1,opt,name=platform" json:"platform,omitempty"` - Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() { - *m = GetUsersOnlineStatusResp_SuccessDetail{} -} -func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) } -func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage() {} -func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{11, 0} -} -func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b) -} -func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Marshal(b, m, deterministic) -} -func (dst *GetUsersOnlineStatusResp_SuccessDetail) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Merge(dst, src) -} -func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Size() int { - return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Size(m) -} -func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_DiscardUnknown() { - xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.DiscardUnknown(m) -} - -var xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail proto.InternalMessageInfo - -func (m *GetUsersOnlineStatusResp_SuccessDetail) GetPlatform() string { - if m != nil { - return m.Platform - } - return "" -} - -func (m *GetUsersOnlineStatusResp_SuccessDetail) GetStatus() string { - if m != nil { - return m.Status - } - return "" -} - -type GetUsersOnlineStatusResp_FailedDetail struct { - UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` - CommonResp *CommonResp `protobuf:"bytes,2,opt,name=commonResp" json:"commonResp,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetUsersOnlineStatusResp_FailedDetail) Reset() { *m = GetUsersOnlineStatusResp_FailedDetail{} } -func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) } -func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage() {} -func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{11, 1} -} -func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b) -} -func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Marshal(b, m, deterministic) -} -func (dst *GetUsersOnlineStatusResp_FailedDetail) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Merge(dst, src) -} -func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Size() int { - return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Size(m) -} -func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_DiscardUnknown() { - xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.DiscardUnknown(m) -} - -var xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail proto.InternalMessageInfo - -func (m *GetUsersOnlineStatusResp_FailedDetail) GetUserID() string { - if m != nil { - return m.UserID - } - return "" -} - -func (m *GetUsersOnlineStatusResp_FailedDetail) GetCommonResp() *CommonResp { - if m != nil { - return m.CommonResp - } - return nil -} - -type GetUsersOnlineStatusResp_SuccessResult struct { - UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` - Status string `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"` - DetailPlatformStatus []*GetUsersOnlineStatusResp_SuccessDetail `protobuf:"bytes,3,rep,name=detailPlatformStatus" json:"detailPlatformStatus,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() { - *m = GetUsersOnlineStatusResp_SuccessResult{} -} -func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) } -func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage() {} -func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) { - return fileDescriptor_user_60873bcb313a530f, []int{11, 2} -} -func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b) -} -func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Marshal(b, m, deterministic) -} -func (dst *GetUsersOnlineStatusResp_SuccessResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Merge(dst, src) -} -func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Size() int { - return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Size(m) -} -func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_DiscardUnknown() { - xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.DiscardUnknown(m) -} - -var xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult proto.InternalMessageInfo - -func (m *GetUsersOnlineStatusResp_SuccessResult) GetUserID() string { - if m != nil { - return m.UserID - } - return "" -} - -func (m *GetUsersOnlineStatusResp_SuccessResult) GetStatus() string { - if m != nil { - return m.Status - } - return "" -} - -func (m *GetUsersOnlineStatusResp_SuccessResult) GetDetailPlatformStatus() []*GetUsersOnlineStatusResp_SuccessDetail { - if m != nil { - return m.DetailPlatformStatus - } - return nil -} - func init() { proto.RegisterType((*CommonResp)(nil), "user.CommonResp") proto.RegisterType((*DeleteUsersResp)(nil), "user.DeleteUsersResp") @@ -880,11 +630,6 @@ func init() { proto.RegisterType((*UserInfo)(nil), "user.UserInfo") proto.RegisterType((*LogoutReq)(nil), "user.LogoutReq") proto.RegisterType((*UpdateUserInfoReq)(nil), "user.UpdateUserInfoReq") - proto.RegisterType((*GetUsersOnlineStatusReq)(nil), "user.GetUsersOnlineStatusReq") - proto.RegisterType((*GetUsersOnlineStatusResp)(nil), "user.GetUsersOnlineStatusResp") - proto.RegisterType((*GetUsersOnlineStatusResp_SuccessDetail)(nil), "user.GetUsersOnlineStatusResp.SuccessDetail") - proto.RegisterType((*GetUsersOnlineStatusResp_FailedDetail)(nil), "user.GetUsersOnlineStatusResp.FailedDetail") - proto.RegisterType((*GetUsersOnlineStatusResp_SuccessResult)(nil), "user.GetUsersOnlineStatusResp.SuccessResult") } // Reference imports to suppress errors if they are not otherwise used. @@ -902,7 +647,6 @@ type UserClient interface { UpdateUserInfo(ctx context.Context, in *UpdateUserInfoReq, opts ...grpc.CallOption) (*CommonResp, error) DeleteUsers(ctx context.Context, in *DeleteUsersReq, opts ...grpc.CallOption) (*DeleteUsersResp, error) GetAllUsersUid(ctx context.Context, in *GetAllUsersUidReq, opts ...grpc.CallOption) (*GetAllUsersUidResp, error) - GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) } type userClient struct { @@ -949,15 +693,6 @@ func (c *userClient) GetAllUsersUid(ctx context.Context, in *GetAllUsersUidReq, return out, nil } -func (c *userClient) GetUsersOnlineStatus(ctx context.Context, in *GetUsersOnlineStatusReq, opts ...grpc.CallOption) (*GetUsersOnlineStatusResp, error) { - out := new(GetUsersOnlineStatusResp) - err := grpc.Invoke(ctx, "/user.user/GetUsersOnlineStatus", in, out, c.cc, opts...) - if err != nil { - return nil, err - } - return out, nil -} - // Server API for User service type UserServer interface { @@ -965,7 +700,6 @@ type UserServer interface { UpdateUserInfo(context.Context, *UpdateUserInfoReq) (*CommonResp, error) DeleteUsers(context.Context, *DeleteUsersReq) (*DeleteUsersResp, error) GetAllUsersUid(context.Context, *GetAllUsersUidReq) (*GetAllUsersUidResp, error) - GetUsersOnlineStatus(context.Context, *GetUsersOnlineStatusReq) (*GetUsersOnlineStatusResp, error) } func RegisterUserServer(s *grpc.Server, srv UserServer) { @@ -1044,24 +778,6 @@ func _User_GetAllUsersUid_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } -func _User_GetUsersOnlineStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetUsersOnlineStatusReq) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(UserServer).GetUsersOnlineStatus(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/user.user/GetUsersOnlineStatus", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(UserServer).GetUsersOnlineStatus(ctx, req.(*GetUsersOnlineStatusReq)) - } - return interceptor(ctx, in, info, handler) -} - var _User_serviceDesc = grpc.ServiceDesc{ ServiceName: "user.user", HandlerType: (*UserServer)(nil), @@ -1082,64 +798,49 @@ var _User_serviceDesc = grpc.ServiceDesc{ MethodName: "GetAllUsersUid", Handler: _User_GetAllUsersUid_Handler, }, - { - MethodName: "GetUsersOnlineStatus", - Handler: _User_GetUsersOnlineStatus_Handler, - }, }, Streams: []grpc.StreamDesc{}, Metadata: "user/user.proto", } -func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_60873bcb313a530f) } +func init() { proto.RegisterFile("user/user.proto", fileDescriptor_user_23985c8245c722d0) } -var fileDescriptor_user_60873bcb313a530f = []byte{ - // 746 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcd, 0x6a, 0xdb, 0x4c, - 0x14, 0x45, 0xf2, 0x4f, 0xec, 0xeb, 0xd8, 0x49, 0x06, 0x7f, 0x5f, 0x06, 0xd1, 0x06, 0x23, 0xba, - 0x30, 0xb4, 0xb8, 0xc5, 0xdd, 0x35, 0xab, 0xd6, 0x26, 0x21, 0x34, 0xc5, 0x45, 0xc1, 0x50, 0xda, - 0x4d, 0x14, 0x6b, 0xe2, 0x0c, 0x95, 0x35, 0x8a, 0x34, 0x82, 0xbc, 0x4e, 0xdf, 0xa0, 0x8b, 0xbe, - 0x4b, 0x9f, 0xa3, 0x6f, 0x50, 0xe6, 0x47, 0xb6, 0xfe, 0x9c, 0x84, 0x74, 0x63, 0xe6, 0xde, 0x99, - 0x39, 0x67, 0xce, 0x99, 0xb9, 0xba, 0x86, 0xbd, 0x24, 0x26, 0xd1, 0x6b, 0xf1, 0x33, 0x0a, 0x23, - 0xc6, 0x19, 0xaa, 0x8b, 0xb1, 0x7d, 0x02, 0x30, 0x61, 0xab, 0x15, 0x0b, 0x1c, 0x12, 0x87, 0xe8, - 0x19, 0xb4, 0x49, 0x14, 0xb1, 0x68, 0xc2, 0x3c, 0x82, 0x8d, 0x81, 0x31, 0x6c, 0x38, 0x9b, 0x04, - 0xb2, 0xa0, 0x25, 0x83, 0x4f, 0xf1, 0x12, 0x9b, 0x03, 0x63, 0xd8, 0x76, 0xd6, 0xb1, 0x4d, 0x61, - 0x6f, 0x4a, 0x7c, 0xc2, 0xc9, 0x3c, 0x26, 0x51, 0x2c, 0xc1, 0xde, 0x00, 0x2c, 0xd6, 0xd0, 0x12, - 0xad, 0x33, 0xde, 0x1f, 0xc9, 0x13, 0x6c, 0x28, 0x9d, 0xcc, 0x1a, 0xf4, 0x02, 0xba, 0xd7, 0x2e, - 0xf5, 0x89, 0x37, 0xa7, 0xde, 0x39, 0x8d, 0x39, 0x36, 0x07, 0xb5, 0x61, 0xdb, 0xc9, 0x27, 0xed, - 0x00, 0x7a, 0x39, 0xaa, 0x5b, 0xb1, 0xcf, 0x53, 0x99, 0xfc, 0xbe, 0x5c, 0x12, 0xf5, 0xa1, 0xc1, - 0xd9, 0x77, 0x12, 0xe0, 0x9a, 0x3c, 0xbb, 0x0a, 0xd0, 0x00, 0x3a, 0xb3, 0x90, 0x44, 0x2e, 0xa7, - 0x2c, 0x38, 0x9b, 0xe2, 0xba, 0x9c, 0xcb, 0xa6, 0xec, 0x8f, 0x70, 0x70, 0x4a, 0xf8, 0x7b, 0xdf, - 0x97, 0x7c, 0x73, 0xea, 0x09, 0xca, 0x35, 0x98, 0x59, 0x00, 0x63, 0x19, 0x30, 0x45, 0x94, 0x4d, - 0xd9, 0x97, 0x80, 0x8a, 0x60, 0x4f, 0xb2, 0x0a, 0xc3, 0x4e, 0x92, 0x13, 0x9b, 0x86, 0xf6, 0x0d, - 0xf4, 0x4e, 0x09, 0x17, 0xf0, 0x67, 0xc1, 0x35, 0x13, 0x67, 0x3d, 0x02, 0x10, 0x50, 0x67, 0x53, - 0xb9, 0xdc, 0x90, 0xcb, 0x33, 0x99, 0xed, 0x5a, 0x66, 0x65, 0x2d, 0x59, 0x63, 0x18, 0xec, 0xe5, - 0x98, 0xfe, 0xe5, 0x01, 0x21, 0x1b, 0xea, 0x53, 0x97, 0xbb, 0xb8, 0x36, 0xa8, 0x0d, 0x3b, 0xe3, - 0x9e, 0x12, 0xbf, 0xc6, 0x96, 0x73, 0xf6, 0x4f, 0x03, 0x5a, 0x69, 0x0a, 0xed, 0x43, 0x2d, 0xa1, - 0x9e, 0x24, 0x69, 0x3b, 0x62, 0x88, 0x10, 0xd4, 0x03, 0x77, 0x45, 0x34, 0xb4, 0x1c, 0x8b, 0x1c, - 0x5d, 0xb0, 0xf4, 0xce, 0xe5, 0x18, 0xfd, 0x0f, 0xcd, 0x25, 0x09, 0x3c, 0x12, 0xc9, 0xdb, 0x6e, - 0x38, 0x3a, 0x12, 0xf9, 0x15, 0xbb, 0xa2, 0x3e, 0xc1, 0x0d, 0xb9, 0x5a, 0x47, 0xc2, 0x9f, 0x2b, - 0x1a, 0xf1, 0x1b, 0xdc, 0x54, 0xfe, 0xc8, 0x40, 0x64, 0xc9, 0xca, 0xa5, 0x3e, 0xde, 0x51, 0x59, - 0x19, 0xa0, 0x1e, 0x98, 0xe4, 0x0e, 0xb7, 0x64, 0xca, 0x24, 0x77, 0xf6, 0x04, 0xda, 0xe7, 0x6c, - 0xc9, 0x12, 0x2e, 0x2e, 0xa2, 0x60, 0xa9, 0x51, 0xb2, 0xb4, 0xfa, 0x2a, 0xec, 0x3f, 0x06, 0x1c, - 0xcc, 0x43, 0xcf, 0x55, 0x4f, 0x3e, 0xbd, 0xd6, 0x54, 0x9a, 0x91, 0x91, 0x56, 0x65, 0xc1, 0x46, - 0x6e, 0x6d, 0x8b, 0xdc, 0x7a, 0xb5, 0xdc, 0x46, 0xa5, 0xdc, 0x66, 0x59, 0xee, 0x4e, 0x2a, 0x77, - 0x73, 0xfe, 0xd6, 0x3d, 0x4f, 0xa9, 0x5d, 0xd6, 0xbd, 0x0f, 0xb5, 0x39, 0xf5, 0x30, 0xa8, 0xcb, - 0x9c, 0x53, 0xcf, 0xfe, 0x06, 0x87, 0xfa, 0x71, 0xc5, 0xb3, 0xc0, 0xa7, 0x01, 0xb9, 0xe0, 0x2e, - 0x4f, 0xe2, 0xc7, 0xbc, 0xe7, 0x42, 0x15, 0x9a, 0xe5, 0x2a, 0xfc, 0x55, 0x07, 0x5c, 0x8d, 0xfe, - 0xa4, 0x62, 0x74, 0xa0, 0x1b, 0x27, 0x8b, 0x05, 0x89, 0x05, 0x40, 0xe2, 0xab, 0x92, 0xec, 0x8c, - 0x5f, 0xa9, 0x4d, 0xdb, 0x88, 0x46, 0x17, 0xd9, 0x3d, 0x4e, 0x1e, 0x02, 0xcd, 0x60, 0x57, 0x7d, - 0xf6, 0x34, 0xa4, 0xaa, 0x8b, 0x97, 0x0f, 0x40, 0x9e, 0xc8, 0x2d, 0x53, 0xc2, 0x5d, 0xea, 0x3b, - 0x39, 0x00, 0x6b, 0x02, 0x5d, 0x4d, 0xa8, 0xa6, 0x45, 0x35, 0x86, 0xbe, 0xcb, 0xaf, 0x59, 0xb4, - 0xd2, 0x6f, 0x68, 0x1d, 0x8b, 0xb7, 0x11, 0x4b, 0x54, 0xed, 0x9e, 0x8e, 0xac, 0x2f, 0xb0, 0x9b, - 0xa5, 0x10, 0xeb, 0x94, 0xf1, 0x1a, 0x41, 0x47, 0x05, 0x0f, 0xcd, 0x87, 0x3d, 0xb4, 0x7e, 0x18, - 0xeb, 0xf3, 0x69, 0x07, 0xb6, 0x61, 0x6f, 0x39, 0x1b, 0xba, 0x84, 0xbe, 0x27, 0x4f, 0xf5, 0x59, - 0xab, 0x50, 0xbe, 0x68, 0xe7, 0x1e, 0x79, 0x19, 0xda, 0xba, 0x4a, 0xa4, 0xf1, 0x6f, 0x13, 0x64, - 0xd7, 0x44, 0xef, 0xa0, 0xb3, 0xdc, 0x7c, 0xf9, 0x50, 0x3f, 0x87, 0xad, 0xeb, 0xd3, 0xfa, 0xaf, - 0x22, 0x1b, 0x87, 0xe8, 0x18, 0x7a, 0xf9, 0x5a, 0x46, 0x87, 0xfa, 0x63, 0x57, 0xac, 0x70, 0xab, - 0xe4, 0x98, 0x20, 0xce, 0xf4, 0xbe, 0x94, 0x38, 0xdf, 0x0e, 0x53, 0xe2, 0x62, 0x3f, 0x9e, 0xc8, - 0xc6, 0x90, 0x69, 0x3d, 0x29, 0x71, 0xa9, 0xbb, 0x59, 0xb8, 0x7a, 0x22, 0x0e, 0xd1, 0x1c, 0xfa, - 0x55, 0x16, 0xa2, 0xe7, 0xf7, 0xd9, 0x7b, 0x6b, 0x1d, 0xdd, 0xef, 0xfe, 0x87, 0xee, 0xd7, 0xce, - 0x48, 0xfe, 0x39, 0x39, 0x16, 0x3f, 0x57, 0x4d, 0xf9, 0x17, 0xe5, 0xed, 0xdf, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xae, 0xca, 0xfa, 0xdd, 0xb5, 0x08, 0x00, 0x00, +var fileDescriptor_user_23985c8245c722d0 = []byte{ + // 562 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0x95, 0xed, 0x24, 0x8d, 0x27, 0x6a, 0x92, 0xae, 0x0a, 0xac, 0x22, 0x84, 0x22, 0x8b, 0x43, + 0x4e, 0x01, 0x85, 0x1b, 0x3d, 0x41, 0x22, 0xaa, 0x88, 0xa2, 0x4a, 0x96, 0x7c, 0xe1, 0x84, 0xd3, + 0x9d, 0xa6, 0x2b, 0x1c, 0xaf, 0xb1, 0x37, 0x52, 0x8f, 0xfc, 0x24, 0xfe, 0x1a, 0xff, 0x00, 0xed, + 0x38, 0x4e, 0xfc, 0x55, 0x0e, 0x70, 0xb1, 0x76, 0xde, 0xae, 0xdf, 0xdb, 0x37, 0x33, 0x3b, 0x30, + 0xda, 0x67, 0x98, 0xbe, 0x31, 0x9f, 0x79, 0x92, 0x2a, 0xad, 0x58, 0xc7, 0xac, 0xbd, 0x4f, 0x00, + 0x4b, 0xb5, 0xdb, 0xa9, 0xd8, 0xc7, 0x2c, 0x61, 0x2f, 0xc1, 0xc5, 0x34, 0x55, 0xe9, 0x52, 0x09, + 0xe4, 0xd6, 0xd4, 0x9a, 0x75, 0xfd, 0x13, 0xc0, 0x26, 0xd0, 0xa7, 0xe0, 0x4b, 0xb6, 0xe5, 0xf6, + 0xd4, 0x9a, 0xb9, 0xfe, 0x31, 0xf6, 0x24, 0x8c, 0x56, 0x18, 0xa1, 0xc6, 0x20, 0xc3, 0x34, 0x23, + 0xb2, 0xb7, 0x00, 0x77, 0x47, 0x6a, 0x62, 0x1b, 0x2c, 0xc6, 0x73, 0xba, 0xc1, 0x49, 0xd2, 0x2f, + 0x9d, 0x61, 0xaf, 0xe1, 0xfc, 0x3e, 0x94, 0x11, 0x8a, 0x40, 0x8a, 0x1b, 0x99, 0x69, 0x6e, 0x4f, + 0x9d, 0x99, 0xeb, 0x57, 0x41, 0x2f, 0x86, 0x61, 0x45, 0xea, 0x87, 0xf9, 0x4f, 0xe4, 0x48, 0xf5, + 0xbf, 0x0a, 0xc8, 0x2e, 0xa1, 0xab, 0xd5, 0x77, 0x8c, 0xb9, 0x43, 0x77, 0xcf, 0x03, 0x36, 0x85, + 0xc1, 0x6d, 0x82, 0x69, 0xa8, 0xa5, 0x8a, 0xd7, 0x2b, 0xde, 0xa1, 0xbd, 0x32, 0xe4, 0x7d, 0x86, + 0x8b, 0x6b, 0xd4, 0x1f, 0xa2, 0x88, 0xf4, 0x02, 0x29, 0x8c, 0xe4, 0x91, 0xcc, 0xae, 0x91, 0xa9, + 0x12, 0x59, 0x2e, 0x54, 0x86, 0xbc, 0x6f, 0xc0, 0xea, 0x64, 0xff, 0x94, 0x2a, 0x0e, 0x67, 0xfb, + 0x8a, 0xd9, 0x22, 0xf4, 0x1e, 0x60, 0x78, 0x8d, 0xda, 0xd0, 0xaf, 0xe3, 0x7b, 0x65, 0xee, 0xfa, + 0x0a, 0xc0, 0x50, 0xad, 0x57, 0x74, 0xdc, 0xa2, 0xe3, 0x25, 0xe4, 0x69, 0x2f, 0xb7, 0x4d, 0x2f, + 0xe5, 0xc4, 0x28, 0x18, 0x55, 0x94, 0xfe, 0xa7, 0x81, 0x98, 0x07, 0x9d, 0x55, 0xa8, 0x43, 0xee, + 0x4c, 0x9d, 0xd9, 0x60, 0x31, 0xcc, 0xcd, 0x1f, 0xb9, 0x69, 0xcf, 0xfb, 0x65, 0x41, 0xbf, 0x80, + 0xd8, 0x18, 0x9c, 0xbd, 0x14, 0x24, 0xe2, 0xfa, 0x66, 0xc9, 0x18, 0x74, 0xe2, 0x70, 0x87, 0x07, + 0x6a, 0x5a, 0x1b, 0x4c, 0xde, 0xa9, 0xa2, 0xe6, 0xb4, 0x66, 0xcf, 0xa1, 0xb7, 0xc5, 0x58, 0x60, + 0x4a, 0xd5, 0xee, 0xfa, 0x87, 0xc8, 0xe0, 0x3b, 0xb5, 0x91, 0x11, 0xf2, 0x2e, 0x9d, 0x3e, 0x44, + 0x26, 0x3f, 0x1b, 0x99, 0xea, 0x07, 0xde, 0xcb, 0xf3, 0x43, 0x81, 0x41, 0x71, 0x17, 0xca, 0x88, + 0x9f, 0xe5, 0x28, 0x05, 0x6c, 0x08, 0x36, 0x3e, 0xf2, 0x3e, 0x41, 0x36, 0x3e, 0x7a, 0x4b, 0x70, + 0x6f, 0xd4, 0x56, 0xed, 0xb5, 0x29, 0x44, 0x2d, 0xa5, 0x56, 0x23, 0xa5, 0xed, 0xa5, 0xf0, 0x7e, + 0x5b, 0x70, 0x11, 0x24, 0x22, 0xcc, 0x5b, 0xbe, 0x28, 0x6b, 0x61, 0xcd, 0x2a, 0x59, 0x6b, 0x4b, + 0xc1, 0xc9, 0xae, 0xf3, 0x84, 0xdd, 0x4e, 0xbb, 0xdd, 0x6e, 0xab, 0xdd, 0x5e, 0xd3, 0xee, 0x59, + 0x61, 0xf7, 0x74, 0xff, 0xfe, 0x5f, 0x5a, 0xc9, 0x6d, 0xfa, 0x1e, 0x83, 0x13, 0x48, 0xc1, 0x21, + 0x2f, 0x66, 0x20, 0xc5, 0xe2, 0xa7, 0x0d, 0x34, 0xa1, 0xd8, 0x7b, 0x18, 0x6c, 0x4f, 0x5d, 0xc6, + 0x2e, 0xf3, 0xce, 0xa8, 0xb6, 0xf8, 0xe4, 0x59, 0x0b, 0x9a, 0x25, 0xec, 0x0a, 0x86, 0xd5, 0xbc, + 0xb1, 0x17, 0x87, 0xc6, 0xaa, 0x67, 0x73, 0xd2, 0x78, 0x6e, 0x46, 0xb8, 0x34, 0x67, 0x0a, 0xe1, + 0xea, 0xe8, 0x29, 0x84, 0xeb, 0xb3, 0x6f, 0x49, 0x8f, 0xb0, 0xf4, 0xcc, 0x0b, 0xe1, 0xc6, 0x24, + 0x99, 0xf0, 0xf6, 0x8d, 0x2c, 0xf9, 0x78, 0xfe, 0x75, 0x30, 0xa7, 0x89, 0x7d, 0x65, 0x3e, 0x9b, + 0x1e, 0xcd, 0xed, 0x77, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x30, 0xbd, 0x59, 0x5b, 0xca, 0x05, + 0x00, 0x00, } From f4c727230558c317b546ab190b383a583c93f43f Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 14:09:10 +0800 Subject: [PATCH 11/34] pb file --- pkg/proto/relay/relay.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/proto/relay/relay.proto b/pkg/proto/relay/relay.proto index a3464e077..ff648f760 100644 --- a/pkg/proto/relay/relay.proto +++ b/pkg/proto/relay/relay.proto @@ -40,6 +40,7 @@ message SingleMsgToUser{ message GetUsersOnlineStatusReq{ repeated string userIDList = 1; string operationID = 2; + string token = 3; } message GetUsersOnlineStatusResp{ int32 errCode = 1; From 2f37767899284ad6f347a5e17226f4dfebb05994 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 29 Nov 2021 14:10:42 +0800 Subject: [PATCH 12/34] pb file --- pkg/proto/relay/relay.pb.go | 110 +++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 51 deletions(-) diff --git a/pkg/proto/relay/relay.pb.go b/pkg/proto/relay/relay.pb.go index d56aae9e0..7b7a674c6 100644 --- a/pkg/proto/relay/relay.pb.go +++ b/pkg/proto/relay/relay.pb.go @@ -47,7 +47,7 @@ func (m *MsgToUserReq) Reset() { *m = MsgToUserReq{} } func (m *MsgToUserReq) String() string { return proto.CompactTextString(m) } func (*MsgToUserReq) ProtoMessage() {} func (*MsgToUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{0} + return fileDescriptor_relay_3a61ef77452a8c73, []int{0} } func (m *MsgToUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgToUserReq.Unmarshal(m, b) @@ -176,7 +176,7 @@ func (m *MsgToUserResp) Reset() { *m = MsgToUserResp{} } func (m *MsgToUserResp) String() string { return proto.CompactTextString(m) } func (*MsgToUserResp) ProtoMessage() {} func (*MsgToUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{1} + return fileDescriptor_relay_3a61ef77452a8c73, []int{1} } func (m *MsgToUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgToUserResp.Unmarshal(m, b) @@ -227,7 +227,7 @@ func (m *SingleMsgToUser) Reset() { *m = SingleMsgToUser{} } func (m *SingleMsgToUser) String() string { return proto.CompactTextString(m) } func (*SingleMsgToUser) ProtoMessage() {} func (*SingleMsgToUser) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{2} + return fileDescriptor_relay_3a61ef77452a8c73, []int{2} } func (m *SingleMsgToUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SingleMsgToUser.Unmarshal(m, b) @@ -271,6 +271,7 @@ func (m *SingleMsgToUser) GetRecvPlatFormID() int32 { type GetUsersOnlineStatusReq struct { UserIDList []string `protobuf:"bytes,1,rep,name=userIDList" json:"userIDList,omitempty"` OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + Token string `protobuf:"bytes,3,opt,name=token" json:"token,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -280,7 +281,7 @@ func (m *GetUsersOnlineStatusReq) Reset() { *m = GetUsersOnlineStatusReq func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusReq) ProtoMessage() {} func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{3} + return fileDescriptor_relay_3a61ef77452a8c73, []int{3} } func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b) @@ -314,6 +315,13 @@ func (m *GetUsersOnlineStatusReq) GetOperationID() string { return "" } +func (m *GetUsersOnlineStatusReq) GetToken() string { + if m != nil { + return m.Token + } + return "" +} + type GetUsersOnlineStatusResp struct { ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` @@ -328,7 +336,7 @@ func (m *GetUsersOnlineStatusResp) Reset() { *m = GetUsersOnlineStatusRe func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp) ProtoMessage() {} func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4} + return fileDescriptor_relay_3a61ef77452a8c73, []int{4} } func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b) @@ -390,7 +398,7 @@ func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() { func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage() {} func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 0} + return fileDescriptor_relay_3a61ef77452a8c73, []int{4, 0} } func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b) @@ -437,7 +445,7 @@ func (m *GetUsersOnlineStatusResp_FailedDetail) Reset() { *m = GetUsersO func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage() {} func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 1} + return fileDescriptor_relay_3a61ef77452a8c73, []int{4, 1} } func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b) @@ -493,7 +501,7 @@ func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() { func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage() {} func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 2} + return fileDescriptor_relay_3a61ef77452a8c73, []int{4, 2} } func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b) @@ -650,48 +658,48 @@ var _OnlineMessageRelayService_serviceDesc = grpc.ServiceDesc{ Metadata: "relay/relay.proto", } -func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_709d2b3cc3a7ad83) } +func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_3a61ef77452a8c73) } -var fileDescriptor_relay_709d2b3cc3a7ad83 = []byte{ - // 628 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6b, 0xdb, 0x4c, - 0x10, 0x45, 0x9f, 0xe2, 0x24, 0x9e, 0xd8, 0xc9, 0x97, 0x6d, 0x48, 0xb7, 0x3a, 0xa4, 0xc6, 0x94, - 0x60, 0x4a, 0xeb, 0x42, 0x0a, 0xbd, 0xe4, 0x56, 0x0b, 0x17, 0x41, 0x9c, 0x84, 0x95, 0x43, 0x4b, - 0x7b, 0x52, 0xe4, 0x89, 0x11, 0x95, 0x25, 0x79, 0x77, 0x1d, 0xc8, 0xdf, 0xe9, 0xb9, 0xf7, 0x5e, - 0xfb, 0xd3, 0xca, 0xee, 0x4a, 0xf6, 0xda, 0xb5, 0x1b, 0x72, 0x31, 0x7e, 0x6f, 0x66, 0xdf, 0xcc, - 0xbc, 0xd9, 0x15, 0x1c, 0x72, 0x4c, 0xa3, 0x87, 0x77, 0xfa, 0xb7, 0x5b, 0xf0, 0x5c, 0xe6, 0xa4, - 0xa6, 0x41, 0xfb, 0xb7, 0x0b, 0x8d, 0x81, 0x18, 0x0f, 0xf3, 0x1b, 0x81, 0x9c, 0xe1, 0x94, 0x1c, - 0xc3, 0x76, 0x88, 0xd9, 0x28, 0xf0, 0xa9, 0xd3, 0x72, 0x3a, 0x75, 0x56, 0x22, 0xc5, 0x33, 0x8c, - 0xef, 0x03, 0x9f, 0xfe, 0x67, 0x78, 0x83, 0x08, 0x85, 0x9d, 0x5e, 0x9e, 0x49, 0xcc, 0x24, 0xad, - 0xe9, 0x40, 0x05, 0x55, 0x44, 0xe5, 0x84, 0x38, 0xa5, 0xdb, 0x2d, 0xa7, 0xe3, 0xb2, 0x0a, 0x12, - 0x0f, 0x76, 0x95, 0xea, 0x30, 0x99, 0x20, 0xdd, 0xd1, 0xa1, 0x39, 0x56, 0xa7, 0x06, 0x62, 0xdc, - 0xe7, 0xf9, 0x84, 0xee, 0xb6, 0x9c, 0x4e, 0x8d, 0x55, 0x90, 0xb4, 0x60, 0xaf, 0x94, 0x1e, 0x3e, - 0x14, 0x48, 0xeb, 0x3a, 0x6a, 0x53, 0x2a, 0x23, 0x44, 0x21, 0x92, 0x3c, 0xd3, 0x19, 0x60, 0x32, - 0x2c, 0x4a, 0x65, 0x5c, 0x15, 0xc8, 0x23, 0x99, 0xe4, 0x59, 0xe0, 0xd3, 0x3d, 0xdd, 0xb1, 0x4d, - 0x19, 0x0d, 0x7e, 0x8f, 0x7c, 0x20, 0xc6, 0x81, 0x4f, 0x1b, 0x26, 0xc3, 0xa2, 0xc8, 0x09, 0xc0, - 0x75, 0x1a, 0xc9, 0xbb, 0x9c, 0x4f, 0x02, 0x9f, 0x36, 0x75, 0x11, 0x8b, 0x21, 0xa7, 0xb0, 0xaf, - 0xa6, 0x41, 0x7e, 0x99, 0xc4, 0xdf, 0x2f, 0xa3, 0x09, 0xd2, 0x7d, 0x2d, 0xb2, 0xc2, 0x92, 0x57, - 0xd0, 0x34, 0x4c, 0x3f, 0x8a, 0xf1, 0x86, 0x5d, 0xd0, 0x03, 0x9d, 0xb6, 0x4c, 0xea, 0xa9, 0xd3, - 0x04, 0x33, 0x69, 0xfa, 0xf9, 0xdf, 0xf4, 0x63, 0x51, 0xed, 0x73, 0x68, 0x5a, 0x1b, 0x14, 0x05, - 0x79, 0x0d, 0x5b, 0x1c, 0x45, 0x41, 0x9d, 0x96, 0xdb, 0xd9, 0x3b, 0x3b, 0xee, 0x9a, 0xb5, 0x87, - 0x49, 0x36, 0x4e, 0x71, 0x91, 0xa9, 0x73, 0xda, 0x53, 0x38, 0x58, 0x09, 0xa8, 0xf9, 0x18, 0x8a, - 0x59, 0x2a, 0x7b, 0xf9, 0x08, 0xf5, 0x2d, 0x70, 0x99, 0xc5, 0x6c, 0xbc, 0x09, 0xa7, 0xb0, 0xaf, - 0xfe, 0x29, 0x27, 0xfa, 0xc6, 0x1b, 0x57, 0x7b, 0xb3, 0xc2, 0xb6, 0xbf, 0xc1, 0xf3, 0x4f, 0x28, - 0x55, 0x29, 0x71, 0x95, 0xa5, 0x49, 0x86, 0xa1, 0x8c, 0xe4, 0x4c, 0xa8, 0xcb, 0x77, 0x02, 0x30, - 0x13, 0xc8, 0x03, 0xff, 0x22, 0x11, 0x52, 0xf7, 0x5f, 0x67, 0x16, 0xa3, 0xcc, 0xc8, 0xad, 0xf5, - 0x99, 0xfa, 0x36, 0xd5, 0xfe, 0xb5, 0x05, 0x74, 0xbd, 0xba, 0x28, 0xd4, 0xdd, 0x42, 0xce, 0xe7, - 0x63, 0xd5, 0x58, 0x05, 0xd5, 0x4c, 0xc8, 0xd5, 0x7e, 0xab, 0x99, 0x0c, 0x22, 0x21, 0x34, 0xc5, - 0x2c, 0x8e, 0x51, 0x08, 0x63, 0x00, 0x75, 0xb5, 0xa7, 0x6f, 0x4b, 0x4f, 0x37, 0x55, 0xea, 0x86, - 0xf6, 0x21, 0xb6, 0xac, 0x41, 0xae, 0xa1, 0x71, 0x17, 0x25, 0x29, 0x8e, 0x4a, 0xcd, 0x2d, 0xad, - 0xf9, 0xe6, 0x31, 0xcd, 0xbe, 0x3e, 0xe3, 0xa3, 0x8c, 0x92, 0x94, 0x2d, 0x29, 0x78, 0x3d, 0x68, - 0x96, 0x15, 0x4d, 0x58, 0xbd, 0xb0, 0xa2, 0xbc, 0x91, 0xe5, 0x3b, 0x9e, 0x63, 0x35, 0xab, 0xd0, - 0xaa, 0xd5, 0xac, 0x06, 0x79, 0x5f, 0xa0, 0x61, 0x97, 0x50, 0x79, 0xc6, 0x7a, 0xbd, 0xc7, 0x3a, - 0x2b, 0xd1, 0xd3, 0x5d, 0xf4, 0x7e, 0x38, 0xf3, 0xfe, 0x4a, 0x0b, 0x16, 0xda, 0xce, 0x92, 0xf6, - 0x86, 0xde, 0x48, 0x04, 0x47, 0x23, 0xdd, 0x55, 0xf5, 0xce, 0x8c, 0x2f, 0x4f, 0x5c, 0x47, 0xe9, - 0xdd, 0x5a, 0xa9, 0xb3, 0x9f, 0x0e, 0xbc, 0x30, 0x07, 0x07, 0x28, 0x44, 0x34, 0x46, 0xa6, 0x34, - 0xd5, 0xc3, 0x4f, 0x62, 0x24, 0x1f, 0xa0, 0xbe, 0x78, 0x21, 0xcf, 0xca, 0x7a, 0xf6, 0x87, 0xd3, - 0x3b, 0xfa, 0x9b, 0x14, 0x05, 0xf9, 0x0c, 0x47, 0xeb, 0xba, 0x22, 0x27, 0xff, 0x6c, 0x79, 0xea, - 0xbd, 0x7c, 0x64, 0xa4, 0x8f, 0x87, 0x5f, 0x0f, 0xba, 0xe6, 0x83, 0x7e, 0x5e, 0xdc, 0xea, 0x56, - 0x6f, 0xb7, 0xf5, 0x97, 0xfd, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xe4, 0x7c, 0xdc, - 0xee, 0x05, 0x00, 0x00, +var fileDescriptor_relay_3a61ef77452a8c73 = []byte{ + // 636 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x4f, 0xdb, 0x4e, + 0x10, 0x95, 0x7f, 0x26, 0x40, 0x86, 0x04, 0x7e, 0x6c, 0x23, 0xba, 0xf5, 0x81, 0x46, 0x51, 0x85, + 0xa2, 0xaa, 0x4d, 0x25, 0x2a, 0xf5, 0xc2, 0xad, 0x58, 0xa9, 0x2c, 0x11, 0x40, 0x6b, 0x50, 0xab, + 0xde, 0x8c, 0x33, 0x44, 0x16, 0x8e, 0xed, 0xec, 0x6e, 0x90, 0xf8, 0x3a, 0x3d, 0xf7, 0xde, 0x6b, + 0x3f, 0x5a, 0xb5, 0x7f, 0x1c, 0x36, 0x94, 0x14, 0x71, 0x89, 0xf2, 0xde, 0x8c, 0xdf, 0xcc, 0xbc, + 0xd9, 0x5d, 0xd8, 0xe5, 0x98, 0x27, 0x77, 0x1f, 0xf4, 0xef, 0xa0, 0xe2, 0xa5, 0x2c, 0x49, 0x43, + 0x83, 0xde, 0x6f, 0x1f, 0x5a, 0x23, 0x31, 0xb9, 0x28, 0x2f, 0x05, 0x72, 0x86, 0x33, 0xb2, 0x07, + 0xeb, 0x31, 0x16, 0xe3, 0x28, 0xa4, 0x5e, 0xd7, 0xeb, 0x37, 0x99, 0x45, 0x8a, 0x67, 0x98, 0xde, + 0x46, 0x21, 0xfd, 0xcf, 0xf0, 0x06, 0x11, 0x0a, 0x1b, 0xc7, 0x65, 0x21, 0xb1, 0x90, 0xb4, 0xa1, + 0x03, 0x35, 0x54, 0x11, 0x95, 0x13, 0xe3, 0x8c, 0xae, 0x77, 0xbd, 0xbe, 0xcf, 0x6a, 0x48, 0x02, + 0xd8, 0x54, 0xaa, 0x17, 0xd9, 0x14, 0xe9, 0x86, 0x0e, 0x2d, 0xb0, 0xfa, 0x6a, 0x24, 0x26, 0x43, + 0x5e, 0x4e, 0xe9, 0x66, 0xd7, 0xeb, 0x37, 0x58, 0x0d, 0x49, 0x17, 0xb6, 0xac, 0xf4, 0xc5, 0x5d, + 0x85, 0xb4, 0xa9, 0xa3, 0x2e, 0xa5, 0x32, 0x62, 0x14, 0x22, 0x2b, 0x0b, 0x9d, 0x01, 0x26, 0xc3, + 0xa1, 0x54, 0xc6, 0x59, 0x85, 0x3c, 0x91, 0x59, 0x59, 0x44, 0x21, 0xdd, 0xd2, 0x1d, 0xbb, 0x94, + 0xd1, 0xe0, 0xb7, 0xc8, 0x47, 0x62, 0x12, 0x85, 0xb4, 0x65, 0x32, 0x1c, 0x8a, 0xec, 0x03, 0x9c, + 0xe7, 0x89, 0xbc, 0x2e, 0xf9, 0x34, 0x0a, 0x69, 0x5b, 0x17, 0x71, 0x18, 0x72, 0x00, 0xdb, 0x6a, + 0x1a, 0xe4, 0xa7, 0x59, 0x7a, 0x73, 0x9a, 0x4c, 0x91, 0x6e, 0x6b, 0x91, 0x07, 0x2c, 0x79, 0x03, + 0x6d, 0xc3, 0x0c, 0x93, 0x14, 0x2f, 0xd9, 0x09, 0xdd, 0xd1, 0x69, 0xcb, 0xa4, 0x9e, 0x3a, 0xcf, + 0xb0, 0x90, 0xa6, 0x9f, 0xff, 0x4d, 0x3f, 0x0e, 0xd5, 0x3b, 0x82, 0xb6, 0xb3, 0x41, 0x51, 0x91, + 0xb7, 0xb0, 0xc6, 0x51, 0x54, 0xd4, 0xeb, 0xfa, 0xfd, 0xad, 0xc3, 0xbd, 0x81, 0x59, 0x7b, 0x9c, + 0x15, 0x93, 0x1c, 0xef, 0x33, 0x75, 0x4e, 0x6f, 0x06, 0x3b, 0x0f, 0x02, 0x6a, 0x3e, 0x86, 0x62, + 0x9e, 0xcb, 0xe3, 0x72, 0x8c, 0xfa, 0x14, 0xf8, 0xcc, 0x61, 0x56, 0x9e, 0x84, 0x03, 0xd8, 0x56, + 0xff, 0x94, 0x13, 0x43, 0xe3, 0x8d, 0xaf, 0xbd, 0x79, 0xc0, 0xf6, 0x66, 0xf0, 0xf2, 0x0b, 0x4a, + 0x55, 0x4a, 0x9c, 0x15, 0x79, 0x56, 0x60, 0x2c, 0x13, 0x39, 0x17, 0xea, 0xf0, 0xed, 0x03, 0xcc, + 0x05, 0xf2, 0x28, 0x3c, 0xc9, 0x84, 0xd4, 0xfd, 0x37, 0x99, 0xc3, 0x28, 0x33, 0x4a, 0x67, 0x7d, + 0xa6, 0xbe, 0x4b, 0x91, 0x0e, 0x34, 0x64, 0x79, 0x83, 0x85, 0xae, 0xdd, 0x64, 0x06, 0xf4, 0x7e, + 0xad, 0x01, 0x7d, 0xbc, 0xa6, 0xa8, 0xd4, 0x89, 0x43, 0xce, 0x17, 0xc3, 0x36, 0x58, 0x0d, 0xd5, + 0xa4, 0xc8, 0xd5, 0xd6, 0xeb, 0x49, 0x0d, 0x22, 0x31, 0xb4, 0xc5, 0x3c, 0x4d, 0x51, 0x08, 0x63, + 0x0b, 0xf5, 0xb5, 0xd3, 0xef, 0xad, 0xd3, 0xab, 0x2a, 0x0d, 0x62, 0xf7, 0x23, 0xb6, 0xac, 0x41, + 0xce, 0xa1, 0x75, 0x9d, 0x64, 0x39, 0x8e, 0xad, 0xe6, 0x9a, 0xd6, 0x7c, 0xf7, 0x94, 0xe6, 0x50, + 0x7f, 0x13, 0xa2, 0x4c, 0xb2, 0x9c, 0x2d, 0x29, 0x04, 0xc7, 0xd0, 0xb6, 0x15, 0x4d, 0x58, 0xdd, + 0xbb, 0xca, 0x9e, 0x53, 0x7b, 0xbb, 0x17, 0x58, 0xcd, 0x2a, 0xb4, 0x6a, 0x3d, 0xab, 0x41, 0xc1, + 0x37, 0x68, 0xb9, 0x25, 0x54, 0x9e, 0x59, 0x88, 0x75, 0xd8, 0xa2, 0xe7, 0xbb, 0x18, 0xfc, 0xf0, + 0x16, 0xfd, 0x59, 0x0b, 0xee, 0xb5, 0xbd, 0x25, 0xed, 0x15, 0xbd, 0x91, 0x04, 0x3a, 0x63, 0xdd, + 0x55, 0x7d, 0xfb, 0x8c, 0x2f, 0xcf, 0x5c, 0x87, 0xf5, 0xee, 0x51, 0xa9, 0xc3, 0x9f, 0x1e, 0xbc, + 0x32, 0x1f, 0x8e, 0x50, 0x88, 0x64, 0x82, 0x4c, 0x69, 0xaa, 0xe7, 0x20, 0x4b, 0x91, 0x7c, 0x82, + 0xe6, 0xfd, 0xbd, 0x79, 0x61, 0xeb, 0xb9, 0xcf, 0x69, 0xd0, 0xf9, 0x9b, 0x14, 0x15, 0xf9, 0x0a, + 0x9d, 0xc7, 0xba, 0x22, 0xfb, 0xff, 0x6c, 0x79, 0x16, 0xbc, 0x7e, 0x62, 0xa4, 0xcf, 0xbb, 0xdf, + 0x77, 0x06, 0xe6, 0x99, 0x3f, 0xaa, 0xae, 0x74, 0xab, 0x57, 0xeb, 0xfa, 0xbd, 0xff, 0xf8, 0x27, + 0x00, 0x00, 0xff, 0xff, 0x91, 0xf2, 0x5c, 0xd7, 0x04, 0x06, 0x00, 0x00, } From 0f20e58a469f7509539e9e310de381ea2f96e2b8 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 15:03:19 +0800 Subject: [PATCH 13/34] not token --- pkg/proto/relay/relay.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/proto/relay/relay.proto b/pkg/proto/relay/relay.proto index ff648f760..a3464e077 100644 --- a/pkg/proto/relay/relay.proto +++ b/pkg/proto/relay/relay.proto @@ -40,7 +40,6 @@ message SingleMsgToUser{ message GetUsersOnlineStatusReq{ repeated string userIDList = 1; string operationID = 2; - string token = 3; } message GetUsersOnlineStatusResp{ int32 errCode = 1; From c2a45cdbeb83c4f430643d53dbecdffa051ac580 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 16:26:57 +0800 Subject: [PATCH 14/34] get all node online user status --- internal/api/manage/management_user.go | 71 +++++++++++++++++++++++++ internal/msg_gateway/gate/rpc_server.go | 24 +++++++++ internal/push/logic/push_to_client.go | 3 +- pkg/common/constant/constant.go | 3 ++ 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index dce66a41e..19b25e8a0 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -8,9 +8,13 @@ package manage import ( "Open_IM/pkg/common/config" + "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" + "Open_IM/pkg/common/token_verify" "Open_IM/pkg/grpc-etcdv3/getcdv3" + pbRelay "Open_IM/pkg/proto/relay" pbUser "Open_IM/pkg/proto/user" + "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" "net/http" @@ -24,6 +28,10 @@ type paramsDeleteUsers struct { type paramsGetAllUsersUid struct { OperationID string `json:"operationID" binding:"required"` } +type paramsGetUsersOnlineStatus struct { + OperationID string `json:"operationID" binding:"required"` + UserIDList []string `json:"userIDList" binding:"required,lte=200"` +} func DeleteUser(c *gin.Context) { params := paramsDeleteUsers{} @@ -80,3 +88,66 @@ func GetAllUsersUid(c *gin.Context) { c.JSON(http.StatusOK, resp) } +func GetUsersOnlineStatus(c *gin.Context) { + params := paramsGetUsersOnlineStatus{} + if err := c.BindJSON(¶ms); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + claims, err := token_verify.ParseToken(c.Request.Header.Get("token")) + if err != nil { + log.ErrorByKv("parse token failed", params.OperationID, "err", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": err.Error()}) + return + } + if !utils.IsContain(claims.UID, config.Config.Manager.AppManagerUid) { + log.ErrorByKv(" Authentication failed", params.OperationID, "args", c) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 402, "errMsg": "not authorized"}) + return + } + req := &pbRelay.GetUsersOnlineStatusReq{ + OperationID: params.OperationID, + UserIDList: params.UserIDList, + } + var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult + var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult + flag := false + log.NewDebug(params.OperationID, "GetUsersOnlineStatus req come here", params.UserIDList) + grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName) + for _, v := range grpcCons { + client := pbRelay.NewOnlineMessageRelayServiceClient(v) + reply, err := client.GetUsersOnlineStatus(context.Background(), req) + if err != nil { + log.NewError(params.OperationID, "GetUsersOnlineStatus rpc err", req.String(), err.Error()) + continue + } else { + if reply.ErrCode == 0 { + wsResult = append(wsResult, reply.SuccessResult...) + } + } + } + log.NewDebug(params.OperationID, "call GetUsersOnlineStatus rpc server is success", wsResult) + //Online data merge of each node + for _, v1 := range params.UserIDList { + flag = false + temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) + for _, v2 := range wsResult { + if v2.UserID == v1 { + flag = true + temp.UserID = v1 + temp.Status = constant.OnlineStatus + temp.DetailPlatformStatus = append(temp.DetailPlatformStatus, v2.DetailPlatformStatus...) + } + + } + if !flag { + temp.UserID = v1 + temp.Status = constant.OfflineStatus + } + respResult = append(respResult, temp) + } + log.NewDebug(params.OperationID, "Finished merged data", respResult) + resp := gin.H{"errCode": 0, "errMsg": "", "successResult": respResult} + c.JSON(http.StatusOK, resp) + +} diff --git a/internal/msg_gateway/gate/rpc_server.go b/internal/msg_gateway/gate/rpc_server.go index f87e8a4ff..7a0632fad 100644 --- a/internal/msg_gateway/gate/rpc_server.go +++ b/internal/msg_gateway/gate/rpc_server.go @@ -122,7 +122,31 @@ func (r *RPCServer) MsgToUser(_ context.Context, in *pbRelay.MsgToUserReq) (*pbR Resp: resp, }, nil } +func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *pbRelay.GetUsersOnlineStatusReq) (*pbRelay.GetUsersOnlineStatusResp, error) { + log.NewDebug(req.OperationID, "rpc GetUsersOnlineStatus arrived server", req.String()) + var UIDAndPID []string + var resp pbRelay.GetUsersOnlineStatusResp + for _, v1 := range req.UserIDList { + userIDList := genUidPlatformArray(v1) + temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) + temp.UserID = v1 + for _, v2 := range userIDList { + UIDAndPID = strings.Split(v2, " ") + if conn := ws.getUserConn(v2); conn != nil { + ps := new(pbRelay.GetUsersOnlineStatusResp_SuccessDetail) + ps.Platform = UIDAndPID[1] + ps.Status = constant.OnlineStatus + temp.Status = constant.OnlineStatus + temp.DetailPlatformStatus = append(temp.DetailPlatformStatus, ps) + } + } + if temp.Status == constant.OnlineStatus { + resp.SuccessResult = append(resp.SuccessResult, temp) + } + } + return &resp, nil +} func sendMsgToUser(conn *UserConn, bMsg []byte, in *pbRelay.MsgToUserReq, RecvPlatForm, RecvID string) (ResultCode int64) { err := ws.writeMsg(conn, websocket.BinaryMessage, bMsg) if err != nil { diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 21916a68d..c2d986a59 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -48,8 +48,9 @@ func MsgToUser(sendPbData *pbRelay.MsgToUserReq, OfflineInfo, Options string) { reply, err := msgClient.MsgToUser(context.Background(), sendPbData) if err != nil { log.InfoByKv("push data to client rpc err", sendPbData.OperationID, "err", err) + continue } - if reply != nil && reply.Resp != nil && err == nil { + if reply != nil && reply.Resp != nil { wsResult = append(wsResult, reply.Resp...) } } diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 00c73ff4e..39487fcd0 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -86,6 +86,9 @@ const ( WebAndOther = 3 //Pc端互斥，移动端互斥，但是web端可以同时在线 PcMobileAndWeb = 4 + + OnlineStatus = "Online" + OfflineStatus = "Offline" ) var ContentType2PushContent = map[int64]string{ From 6712d65de4f2b1b5bc2bb5609290af556330cfa2 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 29 Nov 2021 16:31:13 +0800 Subject: [PATCH 15/34] pbfile --- pkg/proto/relay/relay.pb.go | 110 +++++++++++++++++------------------- 1 file changed, 51 insertions(+), 59 deletions(-) diff --git a/pkg/proto/relay/relay.pb.go b/pkg/proto/relay/relay.pb.go index 7b7a674c6..d56aae9e0 100644 --- a/pkg/proto/relay/relay.pb.go +++ b/pkg/proto/relay/relay.pb.go @@ -47,7 +47,7 @@ func (m *MsgToUserReq) Reset() { *m = MsgToUserReq{} } func (m *MsgToUserReq) String() string { return proto.CompactTextString(m) } func (*MsgToUserReq) ProtoMessage() {} func (*MsgToUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{0} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{0} } func (m *MsgToUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgToUserReq.Unmarshal(m, b) @@ -176,7 +176,7 @@ func (m *MsgToUserResp) Reset() { *m = MsgToUserResp{} } func (m *MsgToUserResp) String() string { return proto.CompactTextString(m) } func (*MsgToUserResp) ProtoMessage() {} func (*MsgToUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{1} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{1} } func (m *MsgToUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgToUserResp.Unmarshal(m, b) @@ -227,7 +227,7 @@ func (m *SingleMsgToUser) Reset() { *m = SingleMsgToUser{} } func (m *SingleMsgToUser) String() string { return proto.CompactTextString(m) } func (*SingleMsgToUser) ProtoMessage() {} func (*SingleMsgToUser) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{2} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{2} } func (m *SingleMsgToUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SingleMsgToUser.Unmarshal(m, b) @@ -271,7 +271,6 @@ func (m *SingleMsgToUser) GetRecvPlatFormID() int32 { type GetUsersOnlineStatusReq struct { UserIDList []string `protobuf:"bytes,1,rep,name=userIDList" json:"userIDList,omitempty"` OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` - Token string `protobuf:"bytes,3,opt,name=token" json:"token,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -281,7 +280,7 @@ func (m *GetUsersOnlineStatusReq) Reset() { *m = GetUsersOnlineStatusReq func (m *GetUsersOnlineStatusReq) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusReq) ProtoMessage() {} func (*GetUsersOnlineStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{3} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{3} } func (m *GetUsersOnlineStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusReq.Unmarshal(m, b) @@ -315,13 +314,6 @@ func (m *GetUsersOnlineStatusReq) GetOperationID() string { return "" } -func (m *GetUsersOnlineStatusReq) GetToken() string { - if m != nil { - return m.Token - } - return "" -} - type GetUsersOnlineStatusResp struct { ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` @@ -336,7 +328,7 @@ func (m *GetUsersOnlineStatusResp) Reset() { *m = GetUsersOnlineStatusRe func (m *GetUsersOnlineStatusResp) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp) ProtoMessage() {} func (*GetUsersOnlineStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{4} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4} } func (m *GetUsersOnlineStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp.Unmarshal(m, b) @@ -398,7 +390,7 @@ func (m *GetUsersOnlineStatusResp_SuccessDetail) Reset() { func (m *GetUsersOnlineStatusResp_SuccessDetail) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_SuccessDetail) ProtoMessage() {} func (*GetUsersOnlineStatusResp_SuccessDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{4, 0} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 0} } func (m *GetUsersOnlineStatusResp_SuccessDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessDetail.Unmarshal(m, b) @@ -445,7 +437,7 @@ func (m *GetUsersOnlineStatusResp_FailedDetail) Reset() { *m = GetUsersO func (m *GetUsersOnlineStatusResp_FailedDetail) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_FailedDetail) ProtoMessage() {} func (*GetUsersOnlineStatusResp_FailedDetail) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{4, 1} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 1} } func (m *GetUsersOnlineStatusResp_FailedDetail) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_FailedDetail.Unmarshal(m, b) @@ -501,7 +493,7 @@ func (m *GetUsersOnlineStatusResp_SuccessResult) Reset() { func (m *GetUsersOnlineStatusResp_SuccessResult) String() string { return proto.CompactTextString(m) } func (*GetUsersOnlineStatusResp_SuccessResult) ProtoMessage() {} func (*GetUsersOnlineStatusResp_SuccessResult) Descriptor() ([]byte, []int) { - return fileDescriptor_relay_3a61ef77452a8c73, []int{4, 2} + return fileDescriptor_relay_709d2b3cc3a7ad83, []int{4, 2} } func (m *GetUsersOnlineStatusResp_SuccessResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUsersOnlineStatusResp_SuccessResult.Unmarshal(m, b) @@ -658,48 +650,48 @@ var _OnlineMessageRelayService_serviceDesc = grpc.ServiceDesc{ Metadata: "relay/relay.proto", } -func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_3a61ef77452a8c73) } +func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_relay_709d2b3cc3a7ad83) } -var fileDescriptor_relay_3a61ef77452a8c73 = []byte{ - // 636 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x4f, 0xdb, 0x4e, - 0x10, 0x95, 0x7f, 0x26, 0x40, 0x86, 0x04, 0x7e, 0x6c, 0x23, 0xba, 0xf5, 0x81, 0x46, 0x51, 0x85, - 0xa2, 0xaa, 0x4d, 0x25, 0x2a, 0xf5, 0xc2, 0xad, 0x58, 0xa9, 0x2c, 0x11, 0x40, 0x6b, 0x50, 0xab, - 0xde, 0x8c, 0x33, 0x44, 0x16, 0x8e, 0xed, 0xec, 0x6e, 0x90, 0xf8, 0x3a, 0x3d, 0xf7, 0xde, 0x6b, - 0x3f, 0x5a, 0xb5, 0x7f, 0x1c, 0x36, 0x94, 0x14, 0x71, 0x89, 0xf2, 0xde, 0x8c, 0xdf, 0xcc, 0xbc, - 0xd9, 0x5d, 0xd8, 0xe5, 0x98, 0x27, 0x77, 0x1f, 0xf4, 0xef, 0xa0, 0xe2, 0xa5, 0x2c, 0x49, 0x43, - 0x83, 0xde, 0x6f, 0x1f, 0x5a, 0x23, 0x31, 0xb9, 0x28, 0x2f, 0x05, 0x72, 0x86, 0x33, 0xb2, 0x07, - 0xeb, 0x31, 0x16, 0xe3, 0x28, 0xa4, 0x5e, 0xd7, 0xeb, 0x37, 0x99, 0x45, 0x8a, 0x67, 0x98, 0xde, - 0x46, 0x21, 0xfd, 0xcf, 0xf0, 0x06, 0x11, 0x0a, 0x1b, 0xc7, 0x65, 0x21, 0xb1, 0x90, 0xb4, 0xa1, - 0x03, 0x35, 0x54, 0x11, 0x95, 0x13, 0xe3, 0x8c, 0xae, 0x77, 0xbd, 0xbe, 0xcf, 0x6a, 0x48, 0x02, - 0xd8, 0x54, 0xaa, 0x17, 0xd9, 0x14, 0xe9, 0x86, 0x0e, 0x2d, 0xb0, 0xfa, 0x6a, 0x24, 0x26, 0x43, - 0x5e, 0x4e, 0xe9, 0x66, 0xd7, 0xeb, 0x37, 0x58, 0x0d, 0x49, 0x17, 0xb6, 0xac, 0xf4, 0xc5, 0x5d, - 0x85, 0xb4, 0xa9, 0xa3, 0x2e, 0xa5, 0x32, 0x62, 0x14, 0x22, 0x2b, 0x0b, 0x9d, 0x01, 0x26, 0xc3, - 0xa1, 0x54, 0xc6, 0x59, 0x85, 0x3c, 0x91, 0x59, 0x59, 0x44, 0x21, 0xdd, 0xd2, 0x1d, 0xbb, 0x94, - 0xd1, 0xe0, 0xb7, 0xc8, 0x47, 0x62, 0x12, 0x85, 0xb4, 0x65, 0x32, 0x1c, 0x8a, 0xec, 0x03, 0x9c, - 0xe7, 0x89, 0xbc, 0x2e, 0xf9, 0x34, 0x0a, 0x69, 0x5b, 0x17, 0x71, 0x18, 0x72, 0x00, 0xdb, 0x6a, - 0x1a, 0xe4, 0xa7, 0x59, 0x7a, 0x73, 0x9a, 0x4c, 0x91, 0x6e, 0x6b, 0x91, 0x07, 0x2c, 0x79, 0x03, - 0x6d, 0xc3, 0x0c, 0x93, 0x14, 0x2f, 0xd9, 0x09, 0xdd, 0xd1, 0x69, 0xcb, 0xa4, 0x9e, 0x3a, 0xcf, - 0xb0, 0x90, 0xa6, 0x9f, 0xff, 0x4d, 0x3f, 0x0e, 0xd5, 0x3b, 0x82, 0xb6, 0xb3, 0x41, 0x51, 0x91, - 0xb7, 0xb0, 0xc6, 0x51, 0x54, 0xd4, 0xeb, 0xfa, 0xfd, 0xad, 0xc3, 0xbd, 0x81, 0x59, 0x7b, 0x9c, - 0x15, 0x93, 0x1c, 0xef, 0x33, 0x75, 0x4e, 0x6f, 0x06, 0x3b, 0x0f, 0x02, 0x6a, 0x3e, 0x86, 0x62, - 0x9e, 0xcb, 0xe3, 0x72, 0x8c, 0xfa, 0x14, 0xf8, 0xcc, 0x61, 0x56, 0x9e, 0x84, 0x03, 0xd8, 0x56, - 0xff, 0x94, 0x13, 0x43, 0xe3, 0x8d, 0xaf, 0xbd, 0x79, 0xc0, 0xf6, 0x66, 0xf0, 0xf2, 0x0b, 0x4a, - 0x55, 0x4a, 0x9c, 0x15, 0x79, 0x56, 0x60, 0x2c, 0x13, 0x39, 0x17, 0xea, 0xf0, 0xed, 0x03, 0xcc, - 0x05, 0xf2, 0x28, 0x3c, 0xc9, 0x84, 0xd4, 0xfd, 0x37, 0x99, 0xc3, 0x28, 0x33, 0x4a, 0x67, 0x7d, - 0xa6, 0xbe, 0x4b, 0x91, 0x0e, 0x34, 0x64, 0x79, 0x83, 0x85, 0xae, 0xdd, 0x64, 0x06, 0xf4, 0x7e, - 0xad, 0x01, 0x7d, 0xbc, 0xa6, 0xa8, 0xd4, 0x89, 0x43, 0xce, 0x17, 0xc3, 0x36, 0x58, 0x0d, 0xd5, - 0xa4, 0xc8, 0xd5, 0xd6, 0xeb, 0x49, 0x0d, 0x22, 0x31, 0xb4, 0xc5, 0x3c, 0x4d, 0x51, 0x08, 0x63, - 0x0b, 0xf5, 0xb5, 0xd3, 0xef, 0xad, 0xd3, 0xab, 0x2a, 0x0d, 0x62, 0xf7, 0x23, 0xb6, 0xac, 0x41, - 0xce, 0xa1, 0x75, 0x9d, 0x64, 0x39, 0x8e, 0xad, 0xe6, 0x9a, 0xd6, 0x7c, 0xf7, 0x94, 0xe6, 0x50, - 0x7f, 0x13, 0xa2, 0x4c, 0xb2, 0x9c, 0x2d, 0x29, 0x04, 0xc7, 0xd0, 0xb6, 0x15, 0x4d, 0x58, 0xdd, - 0xbb, 0xca, 0x9e, 0x53, 0x7b, 0xbb, 0x17, 0x58, 0xcd, 0x2a, 0xb4, 0x6a, 0x3d, 0xab, 0x41, 0xc1, - 0x37, 0x68, 0xb9, 0x25, 0x54, 0x9e, 0x59, 0x88, 0x75, 0xd8, 0xa2, 0xe7, 0xbb, 0x18, 0xfc, 0xf0, - 0x16, 0xfd, 0x59, 0x0b, 0xee, 0xb5, 0xbd, 0x25, 0xed, 0x15, 0xbd, 0x91, 0x04, 0x3a, 0x63, 0xdd, - 0x55, 0x7d, 0xfb, 0x8c, 0x2f, 0xcf, 0x5c, 0x87, 0xf5, 0xee, 0x51, 0xa9, 0xc3, 0x9f, 0x1e, 0xbc, - 0x32, 0x1f, 0x8e, 0x50, 0x88, 0x64, 0x82, 0x4c, 0x69, 0xaa, 0xe7, 0x20, 0x4b, 0x91, 0x7c, 0x82, - 0xe6, 0xfd, 0xbd, 0x79, 0x61, 0xeb, 0xb9, 0xcf, 0x69, 0xd0, 0xf9, 0x9b, 0x14, 0x15, 0xf9, 0x0a, - 0x9d, 0xc7, 0xba, 0x22, 0xfb, 0xff, 0x6c, 0x79, 0x16, 0xbc, 0x7e, 0x62, 0xa4, 0xcf, 0xbb, 0xdf, - 0x77, 0x06, 0xe6, 0x99, 0x3f, 0xaa, 0xae, 0x74, 0xab, 0x57, 0xeb, 0xfa, 0xbd, 0xff, 0xf8, 0x27, - 0x00, 0x00, 0xff, 0xff, 0x91, 0xf2, 0x5c, 0xd7, 0x04, 0x06, 0x00, 0x00, +var fileDescriptor_relay_709d2b3cc3a7ad83 = []byte{ + // 628 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6b, 0xdb, 0x4c, + 0x10, 0x45, 0x9f, 0xe2, 0x24, 0x9e, 0xd8, 0xc9, 0x97, 0x6d, 0x48, 0xb7, 0x3a, 0xa4, 0xc6, 0x94, + 0x60, 0x4a, 0xeb, 0x42, 0x0a, 0xbd, 0xe4, 0x56, 0x0b, 0x17, 0x41, 0x9c, 0x84, 0x95, 0x43, 0x4b, + 0x7b, 0x52, 0xe4, 0x89, 0x11, 0x95, 0x25, 0x79, 0x77, 0x1d, 0xc8, 0xdf, 0xe9, 0xb9, 0xf7, 0x5e, + 0xfb, 0xd3, 0xca, 0xee, 0x4a, 0xf6, 0xda, 0xb5, 0x1b, 0x72, 0x31, 0x7e, 0x6f, 0x66, 0xdf, 0xcc, + 0xbc, 0xd9, 0x15, 0x1c, 0x72, 0x4c, 0xa3, 0x87, 0x77, 0xfa, 0xb7, 0x5b, 0xf0, 0x5c, 0xe6, 0xa4, + 0xa6, 0x41, 0xfb, 0xb7, 0x0b, 0x8d, 0x81, 0x18, 0x0f, 0xf3, 0x1b, 0x81, 0x9c, 0xe1, 0x94, 0x1c, + 0xc3, 0x76, 0x88, 0xd9, 0x28, 0xf0, 0xa9, 0xd3, 0x72, 0x3a, 0x75, 0x56, 0x22, 0xc5, 0x33, 0x8c, + 0xef, 0x03, 0x9f, 0xfe, 0x67, 0x78, 0x83, 0x08, 0x85, 0x9d, 0x5e, 0x9e, 0x49, 0xcc, 0x24, 0xad, + 0xe9, 0x40, 0x05, 0x55, 0x44, 0xe5, 0x84, 0x38, 0xa5, 0xdb, 0x2d, 0xa7, 0xe3, 0xb2, 0x0a, 0x12, + 0x0f, 0x76, 0x95, 0xea, 0x30, 0x99, 0x20, 0xdd, 0xd1, 0xa1, 0x39, 0x56, 0xa7, 0x06, 0x62, 0xdc, + 0xe7, 0xf9, 0x84, 0xee, 0xb6, 0x9c, 0x4e, 0x8d, 0x55, 0x90, 0xb4, 0x60, 0xaf, 0x94, 0x1e, 0x3e, + 0x14, 0x48, 0xeb, 0x3a, 0x6a, 0x53, 0x2a, 0x23, 0x44, 0x21, 0x92, 0x3c, 0xd3, 0x19, 0x60, 0x32, + 0x2c, 0x4a, 0x65, 0x5c, 0x15, 0xc8, 0x23, 0x99, 0xe4, 0x59, 0xe0, 0xd3, 0x3d, 0xdd, 0xb1, 0x4d, + 0x19, 0x0d, 0x7e, 0x8f, 0x7c, 0x20, 0xc6, 0x81, 0x4f, 0x1b, 0x26, 0xc3, 0xa2, 0xc8, 0x09, 0xc0, + 0x75, 0x1a, 0xc9, 0xbb, 0x9c, 0x4f, 0x02, 0x9f, 0x36, 0x75, 0x11, 0x8b, 0x21, 0xa7, 0xb0, 0xaf, + 0xa6, 0x41, 0x7e, 0x99, 0xc4, 0xdf, 0x2f, 0xa3, 0x09, 0xd2, 0x7d, 0x2d, 0xb2, 0xc2, 0x92, 0x57, + 0xd0, 0x34, 0x4c, 0x3f, 0x8a, 0xf1, 0x86, 0x5d, 0xd0, 0x03, 0x9d, 0xb6, 0x4c, 0xea, 0xa9, 0xd3, + 0x04, 0x33, 0x69, 0xfa, 0xf9, 0xdf, 0xf4, 0x63, 0x51, 0xed, 0x73, 0x68, 0x5a, 0x1b, 0x14, 0x05, + 0x79, 0x0d, 0x5b, 0x1c, 0x45, 0x41, 0x9d, 0x96, 0xdb, 0xd9, 0x3b, 0x3b, 0xee, 0x9a, 0xb5, 0x87, + 0x49, 0x36, 0x4e, 0x71, 0x91, 0xa9, 0x73, 0xda, 0x53, 0x38, 0x58, 0x09, 0xa8, 0xf9, 0x18, 0x8a, + 0x59, 0x2a, 0x7b, 0xf9, 0x08, 0xf5, 0x2d, 0x70, 0x99, 0xc5, 0x6c, 0xbc, 0x09, 0xa7, 0xb0, 0xaf, + 0xfe, 0x29, 0x27, 0xfa, 0xc6, 0x1b, 0x57, 0x7b, 0xb3, 0xc2, 0xb6, 0xbf, 0xc1, 0xf3, 0x4f, 0x28, + 0x55, 0x29, 0x71, 0x95, 0xa5, 0x49, 0x86, 0xa1, 0x8c, 0xe4, 0x4c, 0xa8, 0xcb, 0x77, 0x02, 0x30, + 0x13, 0xc8, 0x03, 0xff, 0x22, 0x11, 0x52, 0xf7, 0x5f, 0x67, 0x16, 0xa3, 0xcc, 0xc8, 0xad, 0xf5, + 0x99, 0xfa, 0x36, 0xd5, 0xfe, 0xb5, 0x05, 0x74, 0xbd, 0xba, 0x28, 0xd4, 0xdd, 0x42, 0xce, 0xe7, + 0x63, 0xd5, 0x58, 0x05, 0xd5, 0x4c, 0xc8, 0xd5, 0x7e, 0xab, 0x99, 0x0c, 0x22, 0x21, 0x34, 0xc5, + 0x2c, 0x8e, 0x51, 0x08, 0x63, 0x00, 0x75, 0xb5, 0xa7, 0x6f, 0x4b, 0x4f, 0x37, 0x55, 0xea, 0x86, + 0xf6, 0x21, 0xb6, 0xac, 0x41, 0xae, 0xa1, 0x71, 0x17, 0x25, 0x29, 0x8e, 0x4a, 0xcd, 0x2d, 0xad, + 0xf9, 0xe6, 0x31, 0xcd, 0xbe, 0x3e, 0xe3, 0xa3, 0x8c, 0x92, 0x94, 0x2d, 0x29, 0x78, 0x3d, 0x68, + 0x96, 0x15, 0x4d, 0x58, 0xbd, 0xb0, 0xa2, 0xbc, 0x91, 0xe5, 0x3b, 0x9e, 0x63, 0x35, 0xab, 0xd0, + 0xaa, 0xd5, 0xac, 0x06, 0x79, 0x5f, 0xa0, 0x61, 0x97, 0x50, 0x79, 0xc6, 0x7a, 0xbd, 0xc7, 0x3a, + 0x2b, 0xd1, 0xd3, 0x5d, 0xf4, 0x7e, 0x38, 0xf3, 0xfe, 0x4a, 0x0b, 0x16, 0xda, 0xce, 0x92, 0xf6, + 0x86, 0xde, 0x48, 0x04, 0x47, 0x23, 0xdd, 0x55, 0xf5, 0xce, 0x8c, 0x2f, 0x4f, 0x5c, 0x47, 0xe9, + 0xdd, 0x5a, 0xa9, 0xb3, 0x9f, 0x0e, 0xbc, 0x30, 0x07, 0x07, 0x28, 0x44, 0x34, 0x46, 0xa6, 0x34, + 0xd5, 0xc3, 0x4f, 0x62, 0x24, 0x1f, 0xa0, 0xbe, 0x78, 0x21, 0xcf, 0xca, 0x7a, 0xf6, 0x87, 0xd3, + 0x3b, 0xfa, 0x9b, 0x14, 0x05, 0xf9, 0x0c, 0x47, 0xeb, 0xba, 0x22, 0x27, 0xff, 0x6c, 0x79, 0xea, + 0xbd, 0x7c, 0x64, 0xa4, 0x8f, 0x87, 0x5f, 0x0f, 0xba, 0xe6, 0x83, 0x7e, 0x5e, 0xdc, 0xea, 0x56, + 0x6f, 0xb7, 0xf5, 0x97, 0xfd, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xe4, 0x7c, 0xdc, + 0xee, 0x05, 0x00, 0x00, } From c9b3a017a48b19aef32e7dc74a9b619b0a2fc906 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 16:43:22 +0800 Subject: [PATCH 16/34] get all node online user status --- docker-compose.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3a3bd94b0..ba1e31df1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -21,12 +21,12 @@ services: - 37017:27017 container_name: mongo volumes: - # - ./components/mongodb/data/db:/data/db - # - ./components/mongodb/data/logs:/data/logs - # - ./components/mongodb/data/conf:/etc/mongo - environment: - - MONGO_INITDB_ROOT_USERNAME=openIM - - MONGO_INITDB_ROOT_PASSWORD=openIM + - ./components/mongodb/data/db:/data/db + - ./components/mongodb/data/logs:/data/logs + - ./components/mongodb/data/conf:/etc/mongo +# environment: +# - MONGO_INITDB_ROOT_USERNAME=openIM +# - MONGO_INITDB_ROOT_PASSWORD=openIM #TZ: Asia/Shanghai restart: always From 4a66911a616a2d5ecf6529c2a07527caac297d82 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 17:22:23 +0800 Subject: [PATCH 17/34] get all node online user status --- cmd/open_im_api/main.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 14c8e1e38..6d6bf85c4 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -94,7 +94,15 @@ func main() { managementGroup.POST("/delete_user", manage.DeleteUser) managementGroup.POST("/send_msg", manage.ManagementSendMsg) managementGroup.POST("/get_all_users_uid", manage.GetAllUsersUid) + managementGroup.POST("/get_users_online_status", manage.GetUsersOnlineStatus) } + //Conversation + conversationGroup := r.Group("/conversation") + { + conversationGroup.POST("/delete_user", manage.DeleteUser) + + } + log.NewPrivateLog("api") ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port") flag.Parse() From aff733bbd9779b295afb4438860f3055554faeea Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 29 Nov 2021 18:24:39 +0800 Subject: [PATCH 18/34] constan --- cmd/Open-IM-SDK-Core | 2 +- pkg/common/constant/constant.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 610fc07d4..0e5729141 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 610fc07d46dd0ee52428bf429beb80a515e6b872 +Subproject commit 0e57291413f3cccd365c6947875387638349276a diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 39487fcd0..42a4d07c3 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -87,8 +87,8 @@ const ( //Pc端互斥，移动端互斥，但是web端可以同时在线 PcMobileAndWeb = 4 - OnlineStatus = "Online" - OfflineStatus = "Offline" + OnlineStatus = "online" + OfflineStatus = "offline" ) var ContentType2PushContent = map[int64]string{ From b02830c8916547b5a952bd9cb7b63f3b0e656385 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 15:37:51 +0800 Subject: [PATCH 19/34] token modify --- internal/utils/jwt_token_test.go | 6 ++++++ pkg/common/token_verify/jwt_token.go | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/utils/jwt_token_test.go b/internal/utils/jwt_token_test.go index 721df496e..2c6550d87 100644 --- a/internal/utils/jwt_token_test.go +++ b/internal/utils/jwt_token_test.go @@ -81,3 +81,9 @@ func Test_ParseToken(t *testing.T) { assert.Equal(t, claims.UID, uid) } } +func Test_GetClaimFromToken(t *testing.T) { + token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVSUQiOiJvcGVuSU0xMjM0NTYiLCJQbGF0Zm9ybSI6IiIsImV4cCI6MTYzODg0NjQ3NiwibmJmIjoxNjM4MjQxNjc2LCJpYXQiOjE2MzgyNDE2NzZ9.W8RZB7ec5ySFj-rGE2Aho2z32g3MprQMdCyPiQu_C2I" + c, err := token_verify.GetClaimFromToken(token) + assert.Nil(t, c) + assert.Nil(t, err) +} diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 2f5f32c23..961919605 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -55,7 +55,7 @@ func secret() jwt.Keyfunc { } } -func getClaimFromToken(tokensString string) (*Claims, error) { +func GetClaimFromToken(tokensString string) (*Claims, error) { token, err := jwt.ParseWithClaims(tokensString, &Claims{}, secret()) if err != nil { if ve, ok := err.(*jwt.ValidationError); ok { @@ -82,7 +82,7 @@ func getClaimFromToken(tokensString string) (*Claims, error) { func ParseToken(tokensString string) (claims *Claims, err error) { - claims, err = getClaimFromToken(tokensString) + claims, err = GetClaimFromToken(tokensString) if err != nil { log.NewError("", "token validate err", err.Error()) return nil, err @@ -112,7 +112,7 @@ func ParseToken(tokensString string) (claims *Claims, err error) { return nil, &constant.ErrTokenUnknown } } - return nil, err + return nil, &constant.ErrTokenUnknown } //func MakeTheTokenInvalid(currentClaims *Claims, platformClass string) (bool, error) { @@ -132,7 +132,7 @@ func ParseToken(tokensString string) (claims *Claims, err error) { //} func ParseRedisInterfaceToken(redisToken interface{}) (*Claims, error) { - return getClaimFromToken(string(redisToken.([]uint8))) + return GetClaimFromToken(string(redisToken.([]uint8))) } //Validation token, false means failure, true means successful verification From f18f54afc6e453a7cd5cf8028f0e9d01c110cae1 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 19:35:55 +0800 Subject: [PATCH 20/34] test modify --- pkg/common/db/redisModel_test.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 pkg/common/db/redisModel_test.go diff --git a/pkg/common/db/redisModel_test.go b/pkg/common/db/redisModel_test.go new file mode 100644 index 000000000..1fddeb948 --- /dev/null +++ b/pkg/common/db/redisModel_test.go @@ -0,0 +1,20 @@ +package db + +import ( + "fmt" + "github.com/stretchr/testify/assert" + "testing" +) + +func Test_SetTokenMapByUidPid(t *testing.T) { + m := make(map[string]int, 0) + m["哈哈"] = 1 + m["heihei"] = 2 + _ = DB.SetTokenMapByUidPid("1234", 2, m) + +} +func Test_GetTokenMapByUidPid(t *testing.T) { + m, err := DB.GetTokenMapByUidPid("1234", "Android") + assert.Nil(t, err) + fmt.Println(m) +} From b416cd380a60c04015ac873e2372aac7285f6ab6 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 19:37:14 +0800 Subject: [PATCH 21/34] test modify --- pkg/common/db/redisModel.go | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 6e0848e81..c28f67f3f 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -3,7 +3,6 @@ package db import ( "Open_IM/pkg/common/constant" log2 "Open_IM/pkg/common/log" - "Open_IM/pkg/utils" "github.com/garyburd/redigo/redis" ) @@ -77,38 +76,19 @@ func (d *DataBases) DelAppleDeviceToken(accountAddress string) (err error) { //Store userid and platform class to redis func (d *DataBases) AddTokenFlag(userID string, platformID int32, token string, flag int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - var m map[string]int - m = make(map[string]int) - ls, err := redis.String(d.Exec("GET", key)) - if err != nil && err != redis.ErrNil { - return err - } - if err == redis.ErrNil { - } else { - _ = utils.JsonStringToStruct(ls, &m) - } - m[token] = flag - s := utils.StructToJsonString(m) - _, err1 := d.Exec("SET", key, s) + log2.NewDebug("", "add token key is ", key) + _, err1 := d.Exec("HSet", key, token, flag) return err1 } -func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (m map[string]int, e error) { +func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]int, error) { key := uidPidToken + userID + ":" + platformID - log2.NewDebug("", "key is ", key) - s, e := redis.String(d.Exec("GET", key)) - if e != nil { - return nil, e - } else { - m = make(map[string]int) - _ = utils.JsonStringToStruct(s, &m) - return m, nil - } + log2.NewDebug("", "get token key is ", key) + return redis.IntMap(d.Exec("HGETALL", key)) } func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[string]int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - s := utils.StructToJsonString(m) - _, err := d.Exec("SET", key, s) + _, err := d.Exec("SET", key, m) return err } From 2be1e1a70d730e5decec8904cd401a0a0a5a9998 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 19:52:14 +0800 Subject: [PATCH 22/34] test modify --- pkg/common/db/redisModel.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index c28f67f3f..97ad066bc 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -88,7 +88,12 @@ func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]i } func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[string]int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - _, err := d.Exec("SET", key, m) + var a []interface{} + for k, v := range m { + a = append(a, k) + a = append(a, v) + } + _, err := d.Exec("HMSET", key, a...) return err } From b2f5f56fa016bb2ab68edf4ecfae283fba13f1ec Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 19:54:27 +0800 Subject: [PATCH 23/34] test modify --- pkg/common/db/redisModel.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 97ad066bc..838b8e5f6 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -88,12 +88,12 @@ func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]i } func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[string]int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - var a []interface{} - for k, v := range m { - a = append(a, k) - a = append(a, v) - } - _, err := d.Exec("HMSET", key, a...) + //var a []interface{} + //for k, v := range m { + // a = append(a, k) + // a = append(a, v) + //} + _, err := d.Exec("HMSET", key, m) return err } From a2292b1177087e6b0205cccfe09e7b1f6ec2bc79 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 19:58:57 +0800 Subject: [PATCH 24/34] test modify --- pkg/common/db/redisModel.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 838b8e5f6..97ad066bc 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -88,12 +88,12 @@ func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]i } func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[string]int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - //var a []interface{} - //for k, v := range m { - // a = append(a, k) - // a = append(a, v) - //} - _, err := d.Exec("HMSET", key, m) + var a []interface{} + for k, v := range m { + a = append(a, k) + a = append(a, v) + } + _, err := d.Exec("HMSET", key, a...) return err } From 01515f919d1bcea3d4b047c488e8f2542eea53e7 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 20:15:34 +0800 Subject: [PATCH 25/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 97ad066bc..ea34b4777 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s a = append(a, k) a = append(a, v) } - _, err := d.Exec("HMSET", key, a...) + _, err := d.Exec("HMSET", key, a) return err } From 5f90851458b7d238abe3b68746ce1bc87a12dad4 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 20:33:34 +0800 Subject: [PATCH 26/34] test modify --- pkg/common/db/redisModel.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index ea34b4777..23080ca63 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -88,12 +88,12 @@ func (d *DataBases) GetTokenMapByUidPid(userID, platformID string) (map[string]i } func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[string]int) error { key := uidPidToken + userID + ":" + constant.PlatformIDToName(platformID) - var a []interface{} - for k, v := range m { - a = append(a, k) - a = append(a, v) - } - _, err := d.Exec("HMSET", key, a) + //var a []interface{} + //for k, v := range m { + // a = append(a, k) + // a = append(a, v) + //} + _, err := d.Exec("HMSET", key, redis.Args{}.Add(m)) return err } From 45f29c4c6fd895791fd8adcac89e79fd818d6dbc Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 20:38:23 +0800 Subject: [PATCH 27/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 23080ca63..bedf144f4 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("HMSET", key, redis.Args{}.Add(m)) + _, err := d.Exec("HMSET", redis.Args{}.Add(key).AddFlat(m)) return err } From a705e595ee1b38db24f1344825d19bd583df2286 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 20:43:58 +0800 Subject: [PATCH 28/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index bedf144f4..bf5998691 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("HMSET", redis.Args{}.Add(key).AddFlat(m)) + _, err := d.Exec("hmset", redis.Args{}.Add(key).AddFlat(m)) return err } From bee12423b02a4e1605bff09a8b0b61a059bfc2fb Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 20:50:38 +0800 Subject: [PATCH 29/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index bf5998691..e9bc1c9bd 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("hmset", redis.Args{}.Add(key).AddFlat(m)) + _, err := d.Exec("hmset", key, redis.Args{}.AddFlat(m)) return err } From 3495d75a6fd07d628f1dd908bbd3850649855f89 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 21:05:24 +0800 Subject: [PATCH 30/34] test modify --- pkg/common/db/redisModel.go | 2 +- pkg/common/db/redisModel_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index e9bc1c9bd..d34ec185c 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("hmset", key, redis.Args{}.AddFlat(m)) + _, err := d.Exec("hmset", key, m) return err } diff --git a/pkg/common/db/redisModel_test.go b/pkg/common/db/redisModel_test.go index 1fddeb948..f8b5c299f 100644 --- a/pkg/common/db/redisModel_test.go +++ b/pkg/common/db/redisModel_test.go @@ -10,6 +10,7 @@ func Test_SetTokenMapByUidPid(t *testing.T) { m := make(map[string]int, 0) m["哈哈"] = 1 m["heihei"] = 2 + m["2332"] = 4 _ = DB.SetTokenMapByUidPid("1234", 2, m) } From 58785e947008d4c916fed5de3cfac2a6195cc4af Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 21:06:10 +0800 Subject: [PATCH 31/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index d34ec185c..74ba62973 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("hmset", key, m) + _, err := d.Exec("hset", key, m) return err } From 39f5e134631e9d477af8a080109e995efe93c739 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 21:08:52 +0800 Subject: [PATCH 32/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 74ba62973..b2d175d56 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("hset", key, m) + _, err := d.Exec("hmset", key, redis.Args{}.Add(m)) return err } From df592d99dda31790c7e3b3fc4030e645009bb174 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 21:12:03 +0800 Subject: [PATCH 33/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index b2d175d56..69fa05f57 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("hmset", key, redis.Args{}.Add(m)) + _, err := d.Exec("hmset", key, redis.Args{}.Add(m)...) return err } From bd62da8e1ad037ad375d467673bb7711eb5e538d Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 30 Nov 2021 21:17:20 +0800 Subject: [PATCH 34/34] test modify --- pkg/common/db/redisModel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/redisModel.go b/pkg/common/db/redisModel.go index 69fa05f57..2b747cb7d 100644 --- a/pkg/common/db/redisModel.go +++ b/pkg/common/db/redisModel.go @@ -93,7 +93,7 @@ func (d *DataBases) SetTokenMapByUidPid(userID string, platformID int32, m map[s // a = append(a, k) // a = append(a, v) //} - _, err := d.Exec("hmset", key, redis.Args{}.Add(m)...) + _, err := d.Exec("hmset", key, redis.Args{}.Add().AddFlat(m)...) return err }