Jay 3 месяцев назад
Родитель
Сommit
b850a6a415

+ 3 - 1
pb/client/gogameclient/go_game_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gogameclient
@@ -229,6 +229,8 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
+	UserTest                                   = pb.UserTest
+	UserWhite                                  = pb.UserWhite
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 3 - 1
pb/client/gopmpclient/go_pmp_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gopmpclient
@@ -229,6 +229,8 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
+	UserTest                                   = pb.UserTest
+	UserWhite                                  = pb.UserWhite
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 3 - 1
pb/client/goshortdramaclient/go_short_drama_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package goshortdramaclient
@@ -229,6 +229,8 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
+	UserTest                                   = pb.UserTest
+	UserWhite                                  = pb.UserWhite
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 3 - 1
pb/client/gosysclient/go_sys_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gosysclient
@@ -229,6 +229,8 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
+	UserTest                                   = pb.UserTest
+	UserWhite                                  = pb.UserWhite
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 3 - 1
pb/client/gouserclient/go_user_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package gouserclient
@@ -229,6 +229,8 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
+	UserTest                                   = pb.UserTest
+	UserWhite                                  = pb.UserWhite
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 3 - 1
pb/client/govpnclient/go_vpn_client.go

@@ -1,5 +1,5 @@
 // Code generated by goctl. DO NOT EDIT.
-// goctl 1.9.2
+// goctl 1.8.5
 // Source: gorpc.proto
 
 package govpnclient
@@ -229,6 +229,8 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
+	UserTest                                   = pb.UserTest
+	UserWhite                                  = pb.UserWhite
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 6 - 0
pb/common.proto

@@ -23,6 +23,12 @@ enum BoolInt {
   BoolIntFalse = 2;
 }
 
+enum UserType {
+  UserTypeUnknown = 0;
+  UserTypeDevice = 1;
+  UserTypeAccount= 2;
+}
+
 message Empty {}
 
 message Int64SelectController {

+ 29 - 0
pb/gorpc.proto

@@ -42,6 +42,12 @@ enum BoolInt {
   BoolIntFalse = 2;
 }
 
+enum UserType {
+  UserTypeUnknown = 0;
+  UserTypeDevice = 1;
+  UserTypeAccount= 2;
+}
+
 message Empty {}
 
 message Int64SelectController {
@@ -1982,6 +1988,29 @@ service GoSysClient {
 
 
 
+//白名单表
+message UserWhite{
+  int64 id = 1;                // 主键ID
+  int64 userId = 2;            // 用户
+  UserType userType = 3;       //用户类型 1 设备 2 账号
+  Status status = 4;           // 状态
+  int64 createTime = 5;        // 创建时间
+  int64 updateTime = 6;        // 更新时间
+}
+
+//测试用户表
+message UserTest{
+  int64 id = 1;                 // 主键ID
+  int64 userId = 2;             // 用户
+  UserType userType = 3;        //用户类型 1 设备 2 账号
+  string area = 4;              // 指定地区
+  repeated string apis = 5;     // 指定接口
+  repeated string routers = 6;  // 指定路由
+  Status status = 7;            // 状态
+  int64 createTime = 8;         // 创建时间
+  int64 updateTime = 9;         // 更新时间
+}
+
 // Account
 message AccountVo {
   int64 id = 1;                 // 主键ID

Разница между файлами не показана из-за своего большого размера
+ 326 - 83
pb/pb/gorpc.pb.go


+ 1 - 1
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             v6.33.0
+// - protoc             v3.19.4
 // source: gorpc.proto
 
 package pb

+ 23 - 0
pb/user.proto

@@ -5,6 +5,29 @@ option go_package = "code.clickto.dev/nomo-server/go-service-pb/client";
 
 import "pb/common.proto";
 
+//白名单表
+message UserWhite{
+  int64 id = 1;                // 主键ID
+  int64 userId = 2;            // 用户
+  UserType userType = 3;       //用户类型 1 设备 2 账号
+  Status status = 4;           // 状态
+  int64 createTime = 5;        // 创建时间
+  int64 updateTime = 6;        // 更新时间
+}
+
+//测试用户表
+message UserTest{
+  int64 id = 1;                 // 主键ID
+  int64 userId = 2;             // 用户
+  UserType userType = 3;        //用户类型 1 设备 2 账号
+  string area = 4;              // 指定地区
+  repeated string apis = 5;     // 指定接口
+  repeated string routers = 6;  // 指定路由
+  Status status = 7;            // 状态
+  int64 createTime = 8;         // 创建时间
+  int64 updateTime = 9;         // 更新时间
+}
+
 // Account
 message AccountVo {
   int64 id = 1;                 // 主键ID

Некоторые файлы не были показаны из-за большого количества измененных файлов