同步st代码

pb/client/gogameclient/go_game_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.8.5
+// goctl 1.9.2
 // Source: gorpc.proto
 
 package gogameclient
@@ -44,12 +44,8 @@ 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
@@ -356,7 +352,6 @@ type (
 	VpnTagListReq                              = pb.VpnTagListReq
 	VpnTagListResp                             = pb.VpnTagListResp
 	VpnTagVo                                   = pb.VpnTagVo
-	VpnWithIPAndPortItem                       = pb.VpnWithIPAndPortItem
 	VpnWithIPAndPortReq                        = pb.VpnWithIPAndPortReq
 	VpnWithIPAndPortResp                       = pb.VpnWithIPAndPortResp
 	VpnipAddReq                                = pb.VpnipAddReq

pb/client/gopmpclient/go_pmp_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.8.5
+// goctl 1.9.2
 // Source: gorpc.proto
 
 package gopmpclient
@@ -44,12 +44,8 @@ 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
@@ -356,7 +352,6 @@ type (
 	VpnTagListReq                              = pb.VpnTagListReq
 	VpnTagListResp                             = pb.VpnTagListResp
 	VpnTagVo                                   = pb.VpnTagVo
-	VpnWithIPAndPortItem                       = pb.VpnWithIPAndPortItem
 	VpnWithIPAndPortReq                        = pb.VpnWithIPAndPortReq
 	VpnWithIPAndPortResp                       = pb.VpnWithIPAndPortResp
 	VpnipAddReq                                = pb.VpnipAddReq

pb/client/goshortdramaclient/go_short_drama_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.8.5
+// goctl 1.9.2
 // Source: gorpc.proto
 
 package goshortdramaclient
@@ -44,12 +44,8 @@ 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
@@ -356,7 +352,6 @@ type (
 	VpnTagListReq                              = pb.VpnTagListReq
 	VpnTagListResp                             = pb.VpnTagListResp
 	VpnTagVo                                   = pb.VpnTagVo
-	VpnWithIPAndPortItem                       = pb.VpnWithIPAndPortItem
 	VpnWithIPAndPortReq                        = pb.VpnWithIPAndPortReq
 	VpnWithIPAndPortResp                       = pb.VpnWithIPAndPortResp
 	VpnipAddReq                                = pb.VpnipAddReq

pb/client/gosysclient/go_sys_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.8.5
+// goctl 1.9.2
 // Source: gorpc.proto
 
 package gosysclient
@@ -44,12 +44,8 @@ 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
@@ -356,7 +352,6 @@ type (
 	VpnTagListReq                              = pb.VpnTagListReq
 	VpnTagListResp                             = pb.VpnTagListResp
 	VpnTagVo                                   = pb.VpnTagVo
-	VpnWithIPAndPortItem                       = pb.VpnWithIPAndPortItem
 	VpnWithIPAndPortReq                        = pb.VpnWithIPAndPortReq
 	VpnWithIPAndPortResp                       = pb.VpnWithIPAndPortResp
 	VpnipAddReq                                = pb.VpnipAddReq

pb/client/gouserclient/go_user_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.8.5
+// goctl 1.9.2
 // Source: gorpc.proto
 
 package gouserclient
@@ -44,12 +44,8 @@ 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
@@ -356,7 +352,6 @@ type (
 	VpnTagListReq                              = pb.VpnTagListReq
 	VpnTagListResp                             = pb.VpnTagListResp
 	VpnTagVo                                   = pb.VpnTagVo
-	VpnWithIPAndPortItem                       = pb.VpnWithIPAndPortItem
 	VpnWithIPAndPortReq                        = pb.VpnWithIPAndPortReq
 	VpnWithIPAndPortResp                       = pb.VpnWithIPAndPortResp
 	VpnipAddReq                                = pb.VpnipAddReq
@@ -448,9 +443,6 @@ 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)
@@ -563,21 +555,6 @@ 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

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.8.5
+// goctl 1.9.2
 // Source: gorpc.proto
 
 package govpnclient
@@ -44,12 +44,8 @@ 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
@@ -356,7 +352,6 @@ type (
 	VpnTagListReq                              = pb.VpnTagListReq
 	VpnTagListResp                             = pb.VpnTagListResp
 	VpnTagVo                                   = pb.VpnTagVo
-	VpnWithIPAndPortItem                       = pb.VpnWithIPAndPortItem
 	VpnWithIPAndPortReq                        = pb.VpnWithIPAndPortReq
 	VpnWithIPAndPortResp                       = pb.VpnWithIPAndPortResp
 	VpnipAddReq                                = pb.VpnipAddReq

pb/constant/topic.go

@@ -45,6 +45,8 @@ 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"
+
+	STTopicPeakMain = "speedtop_topic_peak_main" // Speedtop 削峰填谷主topic
 )
 
 const (

pb/gorpc.proto

@@ -1977,25 +1977,25 @@ service GoSysClient {
 
 // 白名单表
 message UserWhiteVo {
-  int64 id = 1;          // 主键ID
-  string userIdentifier = 2;      // 用户
-  UserType userType = 3; // 用户类型 1 设备 2 账号
-  Status status = 4;     // 状态
-  int64 createTime = 5;  // 创建时间
-  int64 updateTime = 6;  // 更新时间
+  int64 id = 1;              // 主键ID
+  string userIdentifier = 2; // 用户
+  UserType userType = 3;     // 用户类型 1 设备 2 账号
+  Status status = 4;         // 状态
+  int64 createTime = 5;      // 创建时间
+  int64 updateTime = 6;      // 更新时间
 }
 
 // 测试用户表
 message UserTestVo {
-  int64 id = 1;          // 主键ID
-  string userIdentifier = 2;      // 用户
-  UserType userType = 3; // 用户类型 1 设备 2 账号
-  string area = 4;       // 指定地区
-  string apis = 5;       // 指定接口
-  string routers = 6;    // 指定路由
-  Status status = 7;     // 状态
-  int64 createTime = 8;  // 创建时间
-  int64 updateTime = 9;  // 更新时间
+  int64 id = 1;              // 主键ID
+  string userIdentifier = 2; // 用户
+  UserType userType = 3;     // 用户类型 1 设备 2 账号
+  string area = 4;           // 指定地区
+  string apis = 5;           // 指定接口
+  string routers = 6;        // 指定路由
+  Status status = 7;         // 状态
+  int64 createTime = 8;      // 创建时间
+  int64 updateTime = 9;      // 更新时间
 }
 
 // Account
@@ -2183,26 +2183,6 @@ 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;     // 产品标识
@@ -2333,9 +2313,6 @@ 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
@@ -2666,16 +2643,14 @@ message VpnProbeTaskListResp {
 message VpnWithIPAndPortReq {
   // 产品Code
   string productCode = 1;
+  // 国家
+  string country = 2;
+  // 需要随机的总数
+  int64 limitCount = 3;
 }
 
 message VpnWithIPAndPortResp {
-  repeated VpnWithIPAndPortItem list = 1;
-}
-message VpnWithIPAndPortItem {
-  // location displayConfig
-  string displayConfig = 1;
-  // 设备
-  repeated VpnServerVo vo = 2;
+  repeated VpnServerVo list = 1;
 }
 
 // VpnipWalledVo

pb/pb/gorpc_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.5.1
-// - protoc             v3.19.4
+// - protoc             v6.33.0
 // source: gorpc.proto
 
 package pb
@@ -9037,55 +9037,52 @@ 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_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"
+	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"
 )
 
 // GoUserClientClient is the client API for GoUserClient service.
@@ -9108,9 +9105,6 @@ 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)
@@ -9278,36 +9272,6 @@ 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)
@@ -9678,9 +9642,6 @@ 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)
@@ -9771,15 +9732,6 @@ 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")
 }
@@ -10104,60 +10056,6 @@ 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 {
@@ -10839,18 +10737,6 @@ 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

@@ -7,25 +7,25 @@ import "pb/common.proto";
 
 // 白名单表
 message UserWhiteVo {
-  int64 id = 1;          // 主键ID
-  string userIdentifier = 2;      // 用户
-  UserType userType = 3; // 用户类型 1 设备 2 账号
-  Status status = 4;     // 状态
-  int64 createTime = 5;  // 创建时间
-  int64 updateTime = 6;  // 更新时间
+  int64 id = 1;              // 主键ID
+  string userIdentifier = 2; // 用户
+  UserType userType = 3;     // 用户类型 1 设备 2 账号
+  Status status = 4;         // 状态
+  int64 createTime = 5;      // 创建时间
+  int64 updateTime = 6;      // 更新时间
 }
 
 // 测试用户表
 message UserTestVo {
-  int64 id = 1;          // 主键ID
-  string userIdentifier = 2;      // 用户
-  UserType userType = 3; // 用户类型 1 设备 2 账号
-  string area = 4;       // 指定地区
-  string apis = 5;       // 指定接口
-  string routers = 6;    // 指定路由
-  Status status = 7;     // 状态
-  int64 createTime = 8;  // 创建时间
-  int64 updateTime = 9;  // 更新时间
+  int64 id = 1;              // 主键ID
+  string userIdentifier = 2; // 用户
+  UserType userType = 3;     // 用户类型 1 设备 2 账号
+  string area = 4;           // 指定地区
+  string apis = 5;           // 指定接口
+  string routers = 6;        // 指定路由
+  Status status = 7;         // 状态
+  int64 createTime = 8;      // 创建时间
+  int64 updateTime = 9;      // 更新时间
 }
 
 // Account
@@ -213,26 +213,6 @@ 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;     // 产品标识
@@ -363,9 +343,6 @@ 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/vpn.proto

@@ -277,16 +277,14 @@ message VpnProbeTaskListResp {
 message VpnWithIPAndPortReq {
   // 产品Code
   string productCode = 1;
+  // 国家
+  string country = 2;
+  // 需要随机的总数
+  int64 limitCount = 3;
 }
 
 message VpnWithIPAndPortResp {
-  repeated VpnWithIPAndPortItem list = 1;
-}
-message VpnWithIPAndPortItem {
-  // location displayConfig
-  string displayConfig = 1;
-  // 设备
-  repeated VpnServerVo vo = 2;
+  repeated VpnServerVo list = 1;
 }
 
 // VpnipWalledVo