feat: 合并st代码

pb/client/gogameclient/go_game_client.go

@@ -44,8 +44,12 @@ type (
 	DeployConfigListReq                        = pb.DeployConfigListReq
 	DeployConfigListResp                       = pb.DeployConfigListResp
 	DeployConfigVo                             = pb.DeployConfigVo
+	DeviceAddFirebaseTokenReq                  = pb.DeviceAddFirebaseTokenReq
+	DeviceFirebaseTokenMapReq                  = pb.DeviceFirebaseTokenMapReq
+	DeviceFirebaseTokenMapRes                  = pb.DeviceFirebaseTokenMapRes
 	DeviceListReq                              = pb.DeviceListReq
 	DeviceListRes                              = pb.DeviceListRes
+	DeviceUpdateFirebaseTokenReq               = pb.DeviceUpdateFirebaseTokenReq
 	DeviceVo                                   = pb.DeviceVo
 	DictGetReq                                 = pb.DictGetReq
 	DictListReq                                = pb.DictListReq

pb/client/gopmpclient/go_pmp_client.go

@@ -44,8 +44,12 @@ type (
 	DeployConfigListReq                        = pb.DeployConfigListReq
 	DeployConfigListResp                       = pb.DeployConfigListResp
 	DeployConfigVo                             = pb.DeployConfigVo
+	DeviceAddFirebaseTokenReq                  = pb.DeviceAddFirebaseTokenReq
+	DeviceFirebaseTokenMapReq                  = pb.DeviceFirebaseTokenMapReq
+	DeviceFirebaseTokenMapRes                  = pb.DeviceFirebaseTokenMapRes
 	DeviceListReq                              = pb.DeviceListReq
 	DeviceListRes                              = pb.DeviceListRes
+	DeviceUpdateFirebaseTokenReq               = pb.DeviceUpdateFirebaseTokenReq
 	DeviceVo                                   = pb.DeviceVo
 	DictGetReq                                 = pb.DictGetReq
 	DictListReq                                = pb.DictListReq

pb/client/goshortdramaclient/go_short_drama_client.go

@@ -44,8 +44,12 @@ type (
 	DeployConfigListReq                        = pb.DeployConfigListReq
 	DeployConfigListResp                       = pb.DeployConfigListResp
 	DeployConfigVo                             = pb.DeployConfigVo
+	DeviceAddFirebaseTokenReq                  = pb.DeviceAddFirebaseTokenReq
+	DeviceFirebaseTokenMapReq                  = pb.DeviceFirebaseTokenMapReq
+	DeviceFirebaseTokenMapRes                  = pb.DeviceFirebaseTokenMapRes
 	DeviceListReq                              = pb.DeviceListReq
 	DeviceListRes                              = pb.DeviceListRes
+	DeviceUpdateFirebaseTokenReq               = pb.DeviceUpdateFirebaseTokenReq
 	DeviceVo                                   = pb.DeviceVo
 	DictGetReq                                 = pb.DictGetReq
 	DictListReq                                = pb.DictListReq

pb/client/gosysclient/go_sys_client.go

@@ -44,8 +44,12 @@ type (
 	DeployConfigListReq                        = pb.DeployConfigListReq
 	DeployConfigListResp                       = pb.DeployConfigListResp
 	DeployConfigVo                             = pb.DeployConfigVo
+	DeviceAddFirebaseTokenReq                  = pb.DeviceAddFirebaseTokenReq
+	DeviceFirebaseTokenMapReq                  = pb.DeviceFirebaseTokenMapReq
+	DeviceFirebaseTokenMapRes                  = pb.DeviceFirebaseTokenMapRes
 	DeviceListReq                              = pb.DeviceListReq
 	DeviceListRes                              = pb.DeviceListRes
+	DeviceUpdateFirebaseTokenReq               = pb.DeviceUpdateFirebaseTokenReq
 	DeviceVo                                   = pb.DeviceVo
 	DictGetReq                                 = pb.DictGetReq
 	DictListReq                                = pb.DictListReq

pb/client/gouserclient/go_user_client.go

@@ -44,8 +44,12 @@ type (
 	DeployConfigListReq                        = pb.DeployConfigListReq
 	DeployConfigListResp                       = pb.DeployConfigListResp
 	DeployConfigVo                             = pb.DeployConfigVo
+	DeviceAddFirebaseTokenReq                  = pb.DeviceAddFirebaseTokenReq
+	DeviceFirebaseTokenMapReq                  = pb.DeviceFirebaseTokenMapReq
+	DeviceFirebaseTokenMapRes                  = pb.DeviceFirebaseTokenMapRes
 	DeviceListReq                              = pb.DeviceListReq
 	DeviceListRes                              = pb.DeviceListRes
+	DeviceUpdateFirebaseTokenReq               = pb.DeviceUpdateFirebaseTokenReq
 	DeviceVo                                   = pb.DeviceVo
 	DictGetReq                                 = pb.DictGetReq
 	DictListReq                                = pb.DictListReq
@@ -430,6 +434,9 @@ type (
 		DeviceDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
 		DeviceGet(ctx context.Context, in *DeviceVo, opts ...grpc.CallOption) (*DeviceVo, error)
 		DeviceList(ctx context.Context, in *DeviceListReq, opts ...grpc.CallOption) (*DeviceListRes, error)
+		DeviceAddFirebaseToken(ctx context.Context, in *DeviceAddFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error)
+		DeviceUpdateFirebaseToken(ctx context.Context, in *DeviceUpdateFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error)
+		DeviceFirebaseTokenMap(ctx context.Context, in *DeviceFirebaseTokenMapReq, opts ...grpc.CallOption) (*DeviceFirebaseTokenMapRes, error)
 		// Account Model
 		AccountAdd(ctx context.Context, in *AccountVo, opts ...grpc.CallOption) (*AccountVo, error)
 		AccountUpdate(ctx context.Context, in *AccountVo, opts ...grpc.CallOption) (*AccountVo, error)
@@ -542,6 +549,21 @@ func (m *defaultGoUserClient) DeviceList(ctx context.Context, in *DeviceListReq,
 	return client.DeviceList(ctx, in, opts...)
 }
 
+func (m *defaultGoUserClient) DeviceAddFirebaseToken(ctx context.Context, in *DeviceAddFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.DeviceAddFirebaseToken(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) DeviceUpdateFirebaseToken(ctx context.Context, in *DeviceUpdateFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.DeviceUpdateFirebaseToken(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) DeviceFirebaseTokenMap(ctx context.Context, in *DeviceFirebaseTokenMapReq, opts ...grpc.CallOption) (*DeviceFirebaseTokenMapRes, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.DeviceFirebaseTokenMap(ctx, in, opts...)
+}
+
 // Account Model
 func (m *defaultGoUserClient) AccountAdd(ctx context.Context, in *AccountVo, opts ...grpc.CallOption) (*AccountVo, error) {
 	client := pb.NewGoUserClientClient(m.cli.Conn())

pb/client/govpnclient/go_vpn_client.go

@@ -44,8 +44,12 @@ type (
 	DeployConfigListReq                        = pb.DeployConfigListReq
 	DeployConfigListResp                       = pb.DeployConfigListResp
 	DeployConfigVo                             = pb.DeployConfigVo
+	DeviceAddFirebaseTokenReq                  = pb.DeviceAddFirebaseTokenReq
+	DeviceFirebaseTokenMapReq                  = pb.DeviceFirebaseTokenMapReq
+	DeviceFirebaseTokenMapRes                  = pb.DeviceFirebaseTokenMapRes
 	DeviceListReq                              = pb.DeviceListReq
 	DeviceListRes                              = pb.DeviceListRes
+	DeviceUpdateFirebaseTokenReq               = pb.DeviceUpdateFirebaseTokenReq
 	DeviceVo                                   = pb.DeviceVo
 	DictGetReq                                 = pb.DictGetReq
 	DictListReq                                = pb.DictListReq

pb/constant/topic.go

@@ -16,7 +16,6 @@ const (
 	FKTopicDisconnectDomainOds               = "fkey_topic_disconnect_domain_ods"    // FK disconnect domain topic
 	FKTopicFireBaseOds                       = "fkey_topic_firebase_ods"             // FK Firebase topic
 	FKTopicFireBaseTaskResultOds             = "fkey_topic_firebase_task_result_ods" // FK Firebase task result topic
-	FKTopicFireBasePrimary                   = "fkey_topic_firebase_primary"         // FK Firebase token
 	FKTopicPeekLogOds                        = "fkey_topic_peek_log_ods"             // FK Peek log topic
 	FKTopicBoostResultOds                    = "fkey_topic_boost_result_ods"         // FK Boost result topic
 	FKTopicAdLogOds                          = "fkey_topic_ad_log_ods"               // FK Ad log topic
@@ -46,7 +45,6 @@ const (
 	STTopicBoostResultOds             = "speedtop_topic_boost_result_ods"         // SpeedTop Boost result topic
 	STTopicAdLogOds                   = "speedtop_topic_ad_log_ods"               // SpeedTop Ad log topic
 	STTopicUserUploadLogOds           = "speedtop_topic_user_upload_log_ods"
-	STTopicFireBasePrimary            = "speedtop_topic_firebase_primary" // SpeedTop Firebase topic
 )
 
 const (

pb/gorpc.proto

@@ -2124,6 +2124,8 @@ message DeviceVo {
   string mockApi = 27;      // 指定API
   string mockRouter = 28;   // 指定路由
   string referSubChannel = 29;
+  string firebaseToken = 30; // firebase token
+  string appVerName = 31; // 版本
 }
 
 message DeviceListReq {
@@ -2134,6 +2136,9 @@ message DeviceListReq {
   repeated string dateRange = 5;    // 日期范围
   int64 createStartTime = 6;        // 创建开始时间
   int64 createEndTime = 7;          // 创建结束时间
+  repeated string deviceIds = 8; // 设备IDs
+  string country = 9; // 国家
+  string vn = 10; // 运营商
 }
 message DeviceListRes {
   int64 total = 1;
@@ -2159,6 +2164,26 @@ message UserAppConfigListRes {
   repeated UserAppConfigVo list = 2;
 }
 
+message DeviceUpdateFirebaseTokenReq {
+  // 设备ID
+  string deviceId = 1;
+  // firebaseToken
+  string firebaseToken = 2;
+  string productCode =3;
+}
+
+message DeviceAddFirebaseTokenReq {
+  string deviceId = 1;
+  string firebaseToken = 2;
+}
+
+message DeviceFirebaseTokenMapReq {
+  repeated string deviceId = 1;
+}
+message DeviceFirebaseTokenMapRes {
+  map<string, string> result = 1;
+}
+
 message UserVo {
   int64 id = 1;               // ID
   string productCode = 2;     // 产品标识
@@ -2289,6 +2314,9 @@ service GoUserClient {
   rpc DeviceDel(Ids) returns (Empty);
   rpc DeviceGet(DeviceVo) returns (DeviceVo);
   rpc DeviceList(DeviceListReq) returns (DeviceListRes);
+  rpc DeviceAddFirebaseToken (DeviceAddFirebaseTokenReq) returns (Empty);
+  rpc DeviceUpdateFirebaseToken(DeviceUpdateFirebaseTokenReq) returns (Empty);
+  rpc DeviceFirebaseTokenMap (DeviceFirebaseTokenMapReq) returns (DeviceFirebaseTokenMapRes);
 
   // Account Model
   // AccountAdd

pb/pb/gorpc_grpc.pb.go

@@ -9037,52 +9037,55 @@ var GoSysClient_ServiceDesc = grpc.ServiceDesc{
 }
 
 const (
-	GoUserClient_Ping_FullMethodName                 = "/gorpc.GoUserClient/Ping"
-	GoUserClient_UserAppConfigAdd_FullMethodName     = "/gorpc.GoUserClient/UserAppConfigAdd"
-	GoUserClient_UserAppConfigUpdate_FullMethodName  = "/gorpc.GoUserClient/UserAppConfigUpdate"
-	GoUserClient_UserAppConfigDel_FullMethodName     = "/gorpc.GoUserClient/UserAppConfigDel"
-	GoUserClient_UserAppConfigGet_FullMethodName     = "/gorpc.GoUserClient/UserAppConfigGet"
-	GoUserClient_UserAppConfigList_FullMethodName    = "/gorpc.GoUserClient/UserAppConfigList"
-	GoUserClient_DeviceAdd_FullMethodName            = "/gorpc.GoUserClient/DeviceAdd"
-	GoUserClient_DeviceUpdate_FullMethodName         = "/gorpc.GoUserClient/DeviceUpdate"
-	GoUserClient_DeviceDel_FullMethodName            = "/gorpc.GoUserClient/DeviceDel"
-	GoUserClient_DeviceGet_FullMethodName            = "/gorpc.GoUserClient/DeviceGet"
-	GoUserClient_DeviceList_FullMethodName           = "/gorpc.GoUserClient/DeviceList"
-	GoUserClient_AccountAdd_FullMethodName           = "/gorpc.GoUserClient/AccountAdd"
-	GoUserClient_AccountUpdate_FullMethodName        = "/gorpc.GoUserClient/AccountUpdate"
-	GoUserClient_AccountDel_FullMethodName           = "/gorpc.GoUserClient/AccountDel"
-	GoUserClient_AccountGet_FullMethodName           = "/gorpc.GoUserClient/AccountGet"
-	GoUserClient_AccountList_FullMethodName          = "/gorpc.GoUserClient/AccountList"
-	GoUserClient_AccountDeviceAdd_FullMethodName     = "/gorpc.GoUserClient/AccountDeviceAdd"
-	GoUserClient_AccountDeviceUpdate_FullMethodName  = "/gorpc.GoUserClient/AccountDeviceUpdate"
-	GoUserClient_AccountDeviceDel_FullMethodName     = "/gorpc.GoUserClient/AccountDeviceDel"
-	GoUserClient_AccountDeviceGet_FullMethodName     = "/gorpc.GoUserClient/AccountDeviceGet"
-	GoUserClient_AccountDeviceList_FullMethodName    = "/gorpc.GoUserClient/AccountDeviceList"
-	GoUserClient_UserWhiteAdd_FullMethodName         = "/gorpc.GoUserClient/UserWhiteAdd"
-	GoUserClient_UserWhiteUpdate_FullMethodName      = "/gorpc.GoUserClient/UserWhiteUpdate"
-	GoUserClient_UserWhiteDel_FullMethodName         = "/gorpc.GoUserClient/UserWhiteDel"
-	GoUserClient_UserWhiteGet_FullMethodName         = "/gorpc.GoUserClient/UserWhiteGet"
-	GoUserClient_UserWhiteList_FullMethodName        = "/gorpc.GoUserClient/UserWhiteList"
-	GoUserClient_UserTestAdd_FullMethodName          = "/gorpc.GoUserClient/UserTestAdd"
-	GoUserClient_UserTestUpdate_FullMethodName       = "/gorpc.GoUserClient/UserTestUpdate"
-	GoUserClient_UserTestDel_FullMethodName          = "/gorpc.GoUserClient/UserTestDel"
-	GoUserClient_UserTestGet_FullMethodName          = "/gorpc.GoUserClient/UserTestGet"
-	GoUserClient_UserTestList_FullMethodName         = "/gorpc.GoUserClient/UserTestList"
-	GoUserClient_UserAdd_FullMethodName              = "/gorpc.GoUserClient/UserAdd"
-	GoUserClient_UserUpdate_FullMethodName           = "/gorpc.GoUserClient/UserUpdate"
-	GoUserClient_UserDel_FullMethodName              = "/gorpc.GoUserClient/UserDel"
-	GoUserClient_UserGet_FullMethodName              = "/gorpc.GoUserClient/UserGet"
-	GoUserClient_UserList_FullMethodName             = "/gorpc.GoUserClient/UserList"
-	GoUserClient_UserCredentialAdd_FullMethodName    = "/gorpc.GoUserClient/UserCredentialAdd"
-	GoUserClient_UserCredentialUpdate_FullMethodName = "/gorpc.GoUserClient/UserCredentialUpdate"
-	GoUserClient_UserCredentialDel_FullMethodName    = "/gorpc.GoUserClient/UserCredentialDel"
-	GoUserClient_UserCredentialGet_FullMethodName    = "/gorpc.GoUserClient/UserCredentialGet"
-	GoUserClient_UserCredentialList_FullMethodName   = "/gorpc.GoUserClient/UserCredentialList"
-	GoUserClient_UserDeviceAdd_FullMethodName        = "/gorpc.GoUserClient/UserDeviceAdd"
-	GoUserClient_UserDeviceUpdate_FullMethodName     = "/gorpc.GoUserClient/UserDeviceUpdate"
-	GoUserClient_UserDeviceDel_FullMethodName        = "/gorpc.GoUserClient/UserDeviceDel"
-	GoUserClient_UserDeviceGet_FullMethodName        = "/gorpc.GoUserClient/UserDeviceGet"
-	GoUserClient_UserDeviceList_FullMethodName       = "/gorpc.GoUserClient/UserDeviceList"
+	GoUserClient_Ping_FullMethodName                      = "/gorpc.GoUserClient/Ping"
+	GoUserClient_UserAppConfigAdd_FullMethodName          = "/gorpc.GoUserClient/UserAppConfigAdd"
+	GoUserClient_UserAppConfigUpdate_FullMethodName       = "/gorpc.GoUserClient/UserAppConfigUpdate"
+	GoUserClient_UserAppConfigDel_FullMethodName          = "/gorpc.GoUserClient/UserAppConfigDel"
+	GoUserClient_UserAppConfigGet_FullMethodName          = "/gorpc.GoUserClient/UserAppConfigGet"
+	GoUserClient_UserAppConfigList_FullMethodName         = "/gorpc.GoUserClient/UserAppConfigList"
+	GoUserClient_DeviceAdd_FullMethodName                 = "/gorpc.GoUserClient/DeviceAdd"
+	GoUserClient_DeviceUpdate_FullMethodName              = "/gorpc.GoUserClient/DeviceUpdate"
+	GoUserClient_DeviceDel_FullMethodName                 = "/gorpc.GoUserClient/DeviceDel"
+	GoUserClient_DeviceGet_FullMethodName                 = "/gorpc.GoUserClient/DeviceGet"
+	GoUserClient_DeviceList_FullMethodName                = "/gorpc.GoUserClient/DeviceList"
+	GoUserClient_DeviceAddFirebaseToken_FullMethodName    = "/gorpc.GoUserClient/DeviceAddFirebaseToken"
+	GoUserClient_DeviceUpdateFirebaseToken_FullMethodName = "/gorpc.GoUserClient/DeviceUpdateFirebaseToken"
+	GoUserClient_DeviceFirebaseTokenMap_FullMethodName    = "/gorpc.GoUserClient/DeviceFirebaseTokenMap"
+	GoUserClient_AccountAdd_FullMethodName                = "/gorpc.GoUserClient/AccountAdd"
+	GoUserClient_AccountUpdate_FullMethodName             = "/gorpc.GoUserClient/AccountUpdate"
+	GoUserClient_AccountDel_FullMethodName                = "/gorpc.GoUserClient/AccountDel"
+	GoUserClient_AccountGet_FullMethodName                = "/gorpc.GoUserClient/AccountGet"
+	GoUserClient_AccountList_FullMethodName               = "/gorpc.GoUserClient/AccountList"
+	GoUserClient_AccountDeviceAdd_FullMethodName          = "/gorpc.GoUserClient/AccountDeviceAdd"
+	GoUserClient_AccountDeviceUpdate_FullMethodName       = "/gorpc.GoUserClient/AccountDeviceUpdate"
+	GoUserClient_AccountDeviceDel_FullMethodName          = "/gorpc.GoUserClient/AccountDeviceDel"
+	GoUserClient_AccountDeviceGet_FullMethodName          = "/gorpc.GoUserClient/AccountDeviceGet"
+	GoUserClient_AccountDeviceList_FullMethodName         = "/gorpc.GoUserClient/AccountDeviceList"
+	GoUserClient_UserWhiteAdd_FullMethodName              = "/gorpc.GoUserClient/UserWhiteAdd"
+	GoUserClient_UserWhiteUpdate_FullMethodName           = "/gorpc.GoUserClient/UserWhiteUpdate"
+	GoUserClient_UserWhiteDel_FullMethodName              = "/gorpc.GoUserClient/UserWhiteDel"
+	GoUserClient_UserWhiteGet_FullMethodName              = "/gorpc.GoUserClient/UserWhiteGet"
+	GoUserClient_UserWhiteList_FullMethodName             = "/gorpc.GoUserClient/UserWhiteList"
+	GoUserClient_UserTestAdd_FullMethodName               = "/gorpc.GoUserClient/UserTestAdd"
+	GoUserClient_UserTestUpdate_FullMethodName            = "/gorpc.GoUserClient/UserTestUpdate"
+	GoUserClient_UserTestDel_FullMethodName               = "/gorpc.GoUserClient/UserTestDel"
+	GoUserClient_UserTestGet_FullMethodName               = "/gorpc.GoUserClient/UserTestGet"
+	GoUserClient_UserTestList_FullMethodName              = "/gorpc.GoUserClient/UserTestList"
+	GoUserClient_UserAdd_FullMethodName                   = "/gorpc.GoUserClient/UserAdd"
+	GoUserClient_UserUpdate_FullMethodName                = "/gorpc.GoUserClient/UserUpdate"
+	GoUserClient_UserDel_FullMethodName                   = "/gorpc.GoUserClient/UserDel"
+	GoUserClient_UserGet_FullMethodName                   = "/gorpc.GoUserClient/UserGet"
+	GoUserClient_UserList_FullMethodName                  = "/gorpc.GoUserClient/UserList"
+	GoUserClient_UserCredentialAdd_FullMethodName         = "/gorpc.GoUserClient/UserCredentialAdd"
+	GoUserClient_UserCredentialUpdate_FullMethodName      = "/gorpc.GoUserClient/UserCredentialUpdate"
+	GoUserClient_UserCredentialDel_FullMethodName         = "/gorpc.GoUserClient/UserCredentialDel"
+	GoUserClient_UserCredentialGet_FullMethodName         = "/gorpc.GoUserClient/UserCredentialGet"
+	GoUserClient_UserCredentialList_FullMethodName        = "/gorpc.GoUserClient/UserCredentialList"
+	GoUserClient_UserDeviceAdd_FullMethodName             = "/gorpc.GoUserClient/UserDeviceAdd"
+	GoUserClient_UserDeviceUpdate_FullMethodName          = "/gorpc.GoUserClient/UserDeviceUpdate"
+	GoUserClient_UserDeviceDel_FullMethodName             = "/gorpc.GoUserClient/UserDeviceDel"
+	GoUserClient_UserDeviceGet_FullMethodName             = "/gorpc.GoUserClient/UserDeviceGet"
+	GoUserClient_UserDeviceList_FullMethodName            = "/gorpc.GoUserClient/UserDeviceList"
 )
 
 // GoUserClientClient is the client API for GoUserClient service.
@@ -9105,6 +9108,9 @@ type GoUserClientClient interface {
 	DeviceDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
 	DeviceGet(ctx context.Context, in *DeviceVo, opts ...grpc.CallOption) (*DeviceVo, error)
 	DeviceList(ctx context.Context, in *DeviceListReq, opts ...grpc.CallOption) (*DeviceListRes, error)
+	DeviceAddFirebaseToken(ctx context.Context, in *DeviceAddFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error)
+	DeviceUpdateFirebaseToken(ctx context.Context, in *DeviceUpdateFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error)
+	DeviceFirebaseTokenMap(ctx context.Context, in *DeviceFirebaseTokenMapReq, opts ...grpc.CallOption) (*DeviceFirebaseTokenMapRes, error)
 	// Account Model
 	// AccountAdd
 	AccountAdd(ctx context.Context, in *AccountVo, opts ...grpc.CallOption) (*AccountVo, error)
@@ -9272,6 +9278,36 @@ func (c *goUserClientClient) DeviceList(ctx context.Context, in *DeviceListReq,
 	return out, nil
 }
 
+func (c *goUserClientClient) DeviceAddFirebaseToken(ctx context.Context, in *DeviceAddFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(Empty)
+	err := c.cc.Invoke(ctx, GoUserClient_DeviceAddFirebaseToken_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) DeviceUpdateFirebaseToken(ctx context.Context, in *DeviceUpdateFirebaseTokenReq, opts ...grpc.CallOption) (*Empty, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(Empty)
+	err := c.cc.Invoke(ctx, GoUserClient_DeviceUpdateFirebaseToken_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) DeviceFirebaseTokenMap(ctx context.Context, in *DeviceFirebaseTokenMapReq, opts ...grpc.CallOption) (*DeviceFirebaseTokenMapRes, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(DeviceFirebaseTokenMapRes)
+	err := c.cc.Invoke(ctx, GoUserClient_DeviceFirebaseTokenMap_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *goUserClientClient) AccountAdd(ctx context.Context, in *AccountVo, opts ...grpc.CallOption) (*AccountVo, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(AccountVo)
@@ -9642,6 +9678,9 @@ type GoUserClientServer interface {
 	DeviceDel(context.Context, *Ids) (*Empty, error)
 	DeviceGet(context.Context, *DeviceVo) (*DeviceVo, error)
 	DeviceList(context.Context, *DeviceListReq) (*DeviceListRes, error)
+	DeviceAddFirebaseToken(context.Context, *DeviceAddFirebaseTokenReq) (*Empty, error)
+	DeviceUpdateFirebaseToken(context.Context, *DeviceUpdateFirebaseTokenReq) (*Empty, error)
+	DeviceFirebaseTokenMap(context.Context, *DeviceFirebaseTokenMapReq) (*DeviceFirebaseTokenMapRes, error)
 	// Account Model
 	// AccountAdd
 	AccountAdd(context.Context, *AccountVo) (*AccountVo, error)
@@ -9732,6 +9771,15 @@ func (UnimplementedGoUserClientServer) DeviceGet(context.Context, *DeviceVo) (*D
 func (UnimplementedGoUserClientServer) DeviceList(context.Context, *DeviceListReq) (*DeviceListRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeviceList not implemented")
 }
+func (UnimplementedGoUserClientServer) DeviceAddFirebaseToken(context.Context, *DeviceAddFirebaseTokenReq) (*Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeviceAddFirebaseToken not implemented")
+}
+func (UnimplementedGoUserClientServer) DeviceUpdateFirebaseToken(context.Context, *DeviceUpdateFirebaseTokenReq) (*Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeviceUpdateFirebaseToken not implemented")
+}
+func (UnimplementedGoUserClientServer) DeviceFirebaseTokenMap(context.Context, *DeviceFirebaseTokenMapReq) (*DeviceFirebaseTokenMapRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeviceFirebaseTokenMap not implemented")
+}
 func (UnimplementedGoUserClientServer) AccountAdd(context.Context, *AccountVo) (*AccountVo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AccountAdd not implemented")
 }
@@ -10056,6 +10104,60 @@ func _GoUserClient_DeviceList_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _GoUserClient_DeviceAddFirebaseToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeviceAddFirebaseTokenReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).DeviceAddFirebaseToken(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_DeviceAddFirebaseToken_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).DeviceAddFirebaseToken(ctx, req.(*DeviceAddFirebaseTokenReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_DeviceUpdateFirebaseToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeviceUpdateFirebaseTokenReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).DeviceUpdateFirebaseToken(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_DeviceUpdateFirebaseToken_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).DeviceUpdateFirebaseToken(ctx, req.(*DeviceUpdateFirebaseTokenReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_DeviceFirebaseTokenMap_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeviceFirebaseTokenMapReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).DeviceFirebaseTokenMap(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_DeviceFirebaseTokenMap_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).DeviceFirebaseTokenMap(ctx, req.(*DeviceFirebaseTokenMapReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _GoUserClient_AccountAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(AccountVo)
 	if err := dec(in); err != nil {
@@ -10737,6 +10839,18 @@ var GoUserClient_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DeviceList",
 			Handler:    _GoUserClient_DeviceList_Handler,
 		},
+		{
+			MethodName: "DeviceAddFirebaseToken",
+			Handler:    _GoUserClient_DeviceAddFirebaseToken_Handler,
+		},
+		{
+			MethodName: "DeviceUpdateFirebaseToken",
+			Handler:    _GoUserClient_DeviceUpdateFirebaseToken_Handler,
+		},
+		{
+			MethodName: "DeviceFirebaseTokenMap",
+			Handler:    _GoUserClient_DeviceFirebaseTokenMap_Handler,
+		},
 		{
 			MethodName: "AccountAdd",
 			Handler:    _GoUserClient_AccountAdd_Handler,

pb/user.proto

@@ -154,6 +154,8 @@ message DeviceVo {
   string mockApi = 27;      // 指定API
   string mockRouter = 28;   // 指定路由
   string referSubChannel = 29;
+  string firebaseToken = 30; // firebase token
+  string appVerName = 31; // 版本
 }
 
 message DeviceListReq {
@@ -164,6 +166,9 @@ message DeviceListReq {
   repeated string dateRange = 5;    // 日期范围
   int64 createStartTime = 6;        // 创建开始时间
   int64 createEndTime = 7;          // 创建结束时间
+  repeated string deviceIds = 8; // 设备IDs
+  string country = 9; // 国家
+  string vn = 10; // 运营商
 }
 message DeviceListRes {
   int64 total = 1;
@@ -189,6 +194,26 @@ message UserAppConfigListRes {
   repeated UserAppConfigVo list = 2;
 }
 
+message DeviceUpdateFirebaseTokenReq {
+  // 设备ID
+  string deviceId = 1;
+  // firebaseToken
+  string firebaseToken = 2;
+  string productCode =3;
+}
+
+message DeviceAddFirebaseTokenReq {
+  string deviceId = 1;
+  string firebaseToken = 2;
+}
+
+message DeviceFirebaseTokenMapReq {
+  repeated string deviceId = 1;
+}
+message DeviceFirebaseTokenMapRes {
+  map<string, string> result = 1;
+}
+
 message UserVo {
   int64 id = 1;               // ID
   string productCode = 2;     // 产品标识
@@ -319,6 +344,9 @@ service GoUserClient {
   rpc DeviceDel(Ids) returns (Empty);
   rpc DeviceGet(DeviceVo) returns (DeviceVo);
   rpc DeviceList(DeviceListReq) returns (DeviceListRes);
+  rpc DeviceAddFirebaseToken (DeviceAddFirebaseTokenReq) returns (Empty);
+  rpc DeviceUpdateFirebaseToken(DeviceUpdateFirebaseTokenReq) returns (Empty);
+  rpc DeviceFirebaseTokenMap (DeviceFirebaseTokenMapReq) returns (DeviceFirebaseTokenMapRes);
 
   // Account Model
   // AccountAdd