소스 검색

usertest and userwhite 框架

Jay 3 달 전
부모
커밋
74007df61f

+ 6 - 2
pb/client/gogameclient/go_game_client.go

@@ -229,8 +229,12 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
-	UserTest                                   = pb.UserTest
-	UserWhite                                  = pb.UserWhite
+	UserTestListReq                            = pb.UserTestListReq
+	UserTestListResp                           = pb.UserTestListResp
+	UserTestVo                                 = pb.UserTestVo
+	UserWhiteListReq                           = pb.UserWhiteListReq
+	UserWhiteListResp                          = pb.UserWhiteListResp
+	UserWhiteVo                                = pb.UserWhiteVo
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 6 - 2
pb/client/gopmpclient/go_pmp_client.go

@@ -229,8 +229,12 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
-	UserTest                                   = pb.UserTest
-	UserWhite                                  = pb.UserWhite
+	UserTestListReq                            = pb.UserTestListReq
+	UserTestListResp                           = pb.UserTestListResp
+	UserTestVo                                 = pb.UserTestVo
+	UserWhiteListReq                           = pb.UserWhiteListReq
+	UserWhiteListResp                          = pb.UserWhiteListResp
+	UserWhiteVo                                = pb.UserWhiteVo
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 6 - 2
pb/client/goshortdramaclient/go_short_drama_client.go

@@ -229,8 +229,12 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
-	UserTest                                   = pb.UserTest
-	UserWhite                                  = pb.UserWhite
+	UserTestListReq                            = pb.UserTestListReq
+	UserTestListResp                           = pb.UserTestListResp
+	UserTestVo                                 = pb.UserTestVo
+	UserWhiteListReq                           = pb.UserWhiteListReq
+	UserWhiteListResp                          = pb.UserWhiteListResp
+	UserWhiteVo                                = pb.UserWhiteVo
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 6 - 2
pb/client/gosysclient/go_sys_client.go

@@ -229,8 +229,12 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
-	UserTest                                   = pb.UserTest
-	UserWhite                                  = pb.UserWhite
+	UserTestListReq                            = pb.UserTestListReq
+	UserTestListResp                           = pb.UserTestListResp
+	UserTestVo                                 = pb.UserTestVo
+	UserWhiteListReq                           = pb.UserWhiteListReq
+	UserWhiteListResp                          = pb.UserWhiteListResp
+	UserWhiteVo                                = pb.UserWhiteVo
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 70 - 2
pb/client/gouserclient/go_user_client.go

@@ -229,8 +229,12 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
-	UserTest                                   = pb.UserTest
-	UserWhite                                  = pb.UserWhite
+	UserTestListReq                            = pb.UserTestListReq
+	UserTestListResp                           = pb.UserTestListResp
+	UserTestVo                                 = pb.UserTestVo
+	UserWhiteListReq                           = pb.UserWhiteListReq
+	UserWhiteListResp                          = pb.UserWhiteListResp
+	UserWhiteVo                                = pb.UserWhiteVo
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq
@@ -405,6 +409,18 @@ type (
 		AccountDeviceDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
 		AccountDeviceGet(ctx context.Context, in *AccountDeviceVo, opts ...grpc.CallOption) (*AccountDeviceVo, error)
 		AccountDeviceList(ctx context.Context, in *AccountDeviceListReq, opts ...grpc.CallOption) (*AccountDeviceListResp, error)
+		// 用户白名单管理
+		UserWhiteAdd(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error)
+		UserWhiteUpdate(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error)
+		UserWhiteDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
+		UserWhiteGet(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error)
+		UserWhiteList(ctx context.Context, in *UserWhiteListReq, opts ...grpc.CallOption) (*UserWhiteListResp, error)
+		// 测试用户管理
+		UserTestAdd(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error)
+		UserTestUpdate(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error)
+		UserTestDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
+		UserTestGet(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error)
+		UserTestList(ctx context.Context, in *UserTestListReq, opts ...grpc.CallOption) (*UserTestListResp, error)
 	}
 
 	defaultGoUserClient struct {
@@ -526,3 +542,55 @@ func (m *defaultGoUserClient) AccountDeviceList(ctx context.Context, in *Account
 	client := pb.NewGoUserClientClient(m.cli.Conn())
 	return client.AccountDeviceList(ctx, in, opts...)
 }
+
+// 用户白名单管理
+func (m *defaultGoUserClient) UserWhiteAdd(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserWhiteAdd(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserWhiteUpdate(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserWhiteUpdate(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserWhiteDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserWhiteDel(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserWhiteGet(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserWhiteGet(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserWhiteList(ctx context.Context, in *UserWhiteListReq, opts ...grpc.CallOption) (*UserWhiteListResp, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserWhiteList(ctx, in, opts...)
+}
+
+// 测试用户管理
+func (m *defaultGoUserClient) UserTestAdd(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserTestAdd(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserTestUpdate(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserTestUpdate(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserTestDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserTestDel(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserTestGet(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserTestGet(ctx, in, opts...)
+}
+
+func (m *defaultGoUserClient) UserTestList(ctx context.Context, in *UserTestListReq, opts ...grpc.CallOption) (*UserTestListResp, error) {
+	client := pb.NewGoUserClientClient(m.cli.Conn())
+	return client.UserTestList(ctx, in, opts...)
+}

+ 6 - 2
pb/client/govpnclient/go_vpn_client.go

@@ -229,8 +229,12 @@ type (
 	UserAppConfigListReq                       = pb.UserAppConfigListReq
 	UserAppConfigListRes                       = pb.UserAppConfigListRes
 	UserAppConfigVo                            = pb.UserAppConfigVo
-	UserTest                                   = pb.UserTest
-	UserWhite                                  = pb.UserWhite
+	UserTestListReq                            = pb.UserTestListReq
+	UserTestListResp                           = pb.UserTestListResp
+	UserTestVo                                 = pb.UserTestVo
+	UserWhiteListReq                           = pb.UserWhiteListReq
+	UserWhiteListResp                          = pb.UserWhiteListResp
+	UserWhiteVo                                = pb.UserWhiteVo
 	VpnConfigTemplatePlanAddReq                = pb.VpnConfigTemplatePlanAddReq
 	VpnConfigTemplatePlanAddResp               = pb.VpnConfigTemplatePlanAddResp
 	VpnConfigTemplatePlanDelReq                = pb.VpnConfigTemplatePlanDelReq

+ 38 - 2
pb/gorpc.proto

@@ -1989,7 +1989,7 @@ service GoSysClient {
 
 
 //白名单表
-message UserWhite{
+message UserWhiteVo{
   int64 id = 1;                // 主键ID
   int64 userId = 2;            // 用户
   UserType userType = 3;       //用户类型 1 设备 2 账号
@@ -1999,7 +1999,7 @@ message UserWhite{
 }
 
 //测试用户表
-message UserTest{
+message UserTestVo{
   int64 id = 1;                 // 主键ID
   int64 userId = 2;             // 用户
   UserType userType = 3;        //用户类型 1 设备 2 账号
@@ -2085,6 +2085,28 @@ message AccountDeviceListResp {
   repeated AccountDeviceVo list = 2;
 }
 
+message UserWhiteListReq {
+  Page page = 1;
+  UserWhiteVo vo = 2;
+  repeated int64 excludeIds = 3; // 排除的ID
+}
+
+message UserWhiteListResp {
+  int64 total = 1;
+  repeated UserWhiteVo list = 2;
+}
+
+message UserTestListReq {
+  Page page = 1;
+  UserTestVo vo = 2;
+  repeated int64 excludeIds = 3; // 排除的ID
+}
+
+message UserTestListResp {
+  int64 total = 1;
+  repeated UserTestVo list = 2;
+}
+
 message DeviceVo {
   int64 id = 1;
   string userUuid = 2;
@@ -2181,6 +2203,20 @@ service GoUserClient {
   rpc AccountDeviceDel(Ids) returns (Empty);
   rpc AccountDeviceGet(AccountDeviceVo) returns (AccountDeviceVo);
   rpc AccountDeviceList(AccountDeviceListReq) returns (AccountDeviceListResp);
+
+  // 用户白名单管理
+  rpc UserWhiteAdd(UserWhiteVo) returns (UserWhiteVo);
+  rpc UserWhiteUpdate(UserWhiteVo) returns (UserWhiteVo);
+  rpc UserWhiteDel(Ids) returns (Empty);
+  rpc UserWhiteGet(UserWhiteVo) returns (UserWhiteVo);
+  rpc UserWhiteList(UserWhiteListReq) returns (UserWhiteListResp);
+
+  // 测试用户管理
+  rpc UserTestAdd(UserTestVo) returns (UserTestVo);
+  rpc UserTestUpdate(UserTestVo) returns (UserTestVo);
+  rpc UserTestDel(Ids) returns (Empty);
+  rpc UserTestGet(UserTestVo) returns (UserTestVo);
+  rpc UserTestList(UserTestListReq) returns (UserTestListResp);
 }
 
 

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 318 - 94
pb/pb/gorpc.pb.go


+ 384 - 0
pb/pb/gorpc_grpc.pb.go

@@ -9012,6 +9012,16 @@ const (
 	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"
 )
 
 // GoUserClientClient is the client API for GoUserClient service.
@@ -9045,6 +9055,18 @@ type GoUserClientClient interface {
 	AccountDeviceDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
 	AccountDeviceGet(ctx context.Context, in *AccountDeviceVo, opts ...grpc.CallOption) (*AccountDeviceVo, error)
 	AccountDeviceList(ctx context.Context, in *AccountDeviceListReq, opts ...grpc.CallOption) (*AccountDeviceListResp, error)
+	// 用户白名单管理
+	UserWhiteAdd(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error)
+	UserWhiteUpdate(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error)
+	UserWhiteDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
+	UserWhiteGet(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error)
+	UserWhiteList(ctx context.Context, in *UserWhiteListReq, opts ...grpc.CallOption) (*UserWhiteListResp, error)
+	// 测试用户管理
+	UserTestAdd(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error)
+	UserTestUpdate(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error)
+	UserTestDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error)
+	UserTestGet(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error)
+	UserTestList(ctx context.Context, in *UserTestListReq, opts ...grpc.CallOption) (*UserTestListResp, error)
 }
 
 type goUserClientClient struct {
@@ -9265,6 +9287,106 @@ func (c *goUserClientClient) AccountDeviceList(ctx context.Context, in *AccountD
 	return out, nil
 }
 
+func (c *goUserClientClient) UserWhiteAdd(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserWhiteVo)
+	err := c.cc.Invoke(ctx, GoUserClient_UserWhiteAdd_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserWhiteUpdate(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserWhiteVo)
+	err := c.cc.Invoke(ctx, GoUserClient_UserWhiteUpdate_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserWhiteDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(Empty)
+	err := c.cc.Invoke(ctx, GoUserClient_UserWhiteDel_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserWhiteGet(ctx context.Context, in *UserWhiteVo, opts ...grpc.CallOption) (*UserWhiteVo, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserWhiteVo)
+	err := c.cc.Invoke(ctx, GoUserClient_UserWhiteGet_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserWhiteList(ctx context.Context, in *UserWhiteListReq, opts ...grpc.CallOption) (*UserWhiteListResp, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserWhiteListResp)
+	err := c.cc.Invoke(ctx, GoUserClient_UserWhiteList_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserTestAdd(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserTestVo)
+	err := c.cc.Invoke(ctx, GoUserClient_UserTestAdd_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserTestUpdate(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserTestVo)
+	err := c.cc.Invoke(ctx, GoUserClient_UserTestUpdate_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserTestDel(ctx context.Context, in *Ids, opts ...grpc.CallOption) (*Empty, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(Empty)
+	err := c.cc.Invoke(ctx, GoUserClient_UserTestDel_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserTestGet(ctx context.Context, in *UserTestVo, opts ...grpc.CallOption) (*UserTestVo, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserTestVo)
+	err := c.cc.Invoke(ctx, GoUserClient_UserTestGet_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *goUserClientClient) UserTestList(ctx context.Context, in *UserTestListReq, opts ...grpc.CallOption) (*UserTestListResp, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(UserTestListResp)
+	err := c.cc.Invoke(ctx, GoUserClient_UserTestList_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // GoUserClientServer is the server API for GoUserClient service.
 // All implementations must embed UnimplementedGoUserClientServer
 // for forward compatibility.
@@ -9296,6 +9418,18 @@ type GoUserClientServer interface {
 	AccountDeviceDel(context.Context, *Ids) (*Empty, error)
 	AccountDeviceGet(context.Context, *AccountDeviceVo) (*AccountDeviceVo, error)
 	AccountDeviceList(context.Context, *AccountDeviceListReq) (*AccountDeviceListResp, error)
+	// 用户白名单管理
+	UserWhiteAdd(context.Context, *UserWhiteVo) (*UserWhiteVo, error)
+	UserWhiteUpdate(context.Context, *UserWhiteVo) (*UserWhiteVo, error)
+	UserWhiteDel(context.Context, *Ids) (*Empty, error)
+	UserWhiteGet(context.Context, *UserWhiteVo) (*UserWhiteVo, error)
+	UserWhiteList(context.Context, *UserWhiteListReq) (*UserWhiteListResp, error)
+	// 测试用户管理
+	UserTestAdd(context.Context, *UserTestVo) (*UserTestVo, error)
+	UserTestUpdate(context.Context, *UserTestVo) (*UserTestVo, error)
+	UserTestDel(context.Context, *Ids) (*Empty, error)
+	UserTestGet(context.Context, *UserTestVo) (*UserTestVo, error)
+	UserTestList(context.Context, *UserTestListReq) (*UserTestListResp, error)
 	mustEmbedUnimplementedGoUserClientServer()
 }
 
@@ -9369,6 +9503,36 @@ func (UnimplementedGoUserClientServer) AccountDeviceGet(context.Context, *Accoun
 func (UnimplementedGoUserClientServer) AccountDeviceList(context.Context, *AccountDeviceListReq) (*AccountDeviceListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AccountDeviceList not implemented")
 }
+func (UnimplementedGoUserClientServer) UserWhiteAdd(context.Context, *UserWhiteVo) (*UserWhiteVo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserWhiteAdd not implemented")
+}
+func (UnimplementedGoUserClientServer) UserWhiteUpdate(context.Context, *UserWhiteVo) (*UserWhiteVo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserWhiteUpdate not implemented")
+}
+func (UnimplementedGoUserClientServer) UserWhiteDel(context.Context, *Ids) (*Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserWhiteDel not implemented")
+}
+func (UnimplementedGoUserClientServer) UserWhiteGet(context.Context, *UserWhiteVo) (*UserWhiteVo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserWhiteGet not implemented")
+}
+func (UnimplementedGoUserClientServer) UserWhiteList(context.Context, *UserWhiteListReq) (*UserWhiteListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserWhiteList not implemented")
+}
+func (UnimplementedGoUserClientServer) UserTestAdd(context.Context, *UserTestVo) (*UserTestVo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserTestAdd not implemented")
+}
+func (UnimplementedGoUserClientServer) UserTestUpdate(context.Context, *UserTestVo) (*UserTestVo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserTestUpdate not implemented")
+}
+func (UnimplementedGoUserClientServer) UserTestDel(context.Context, *Ids) (*Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserTestDel not implemented")
+}
+func (UnimplementedGoUserClientServer) UserTestGet(context.Context, *UserTestVo) (*UserTestVo, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserTestGet not implemented")
+}
+func (UnimplementedGoUserClientServer) UserTestList(context.Context, *UserTestListReq) (*UserTestListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method UserTestList not implemented")
+}
 func (UnimplementedGoUserClientServer) mustEmbedUnimplementedGoUserClientServer() {}
 func (UnimplementedGoUserClientServer) testEmbeddedByValue()                      {}
 
@@ -9768,6 +9932,186 @@ func _GoUserClient_AccountDeviceList_Handler(srv interface{}, ctx context.Contex
 	return interceptor(ctx, in, info, handler)
 }
 
+func _GoUserClient_UserWhiteAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserWhiteVo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserWhiteAdd(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserWhiteAdd_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserWhiteAdd(ctx, req.(*UserWhiteVo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserWhiteUpdate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserWhiteVo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserWhiteUpdate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserWhiteUpdate_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserWhiteUpdate(ctx, req.(*UserWhiteVo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserWhiteDel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(Ids)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserWhiteDel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserWhiteDel_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserWhiteDel(ctx, req.(*Ids))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserWhiteGet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserWhiteVo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserWhiteGet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserWhiteGet_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserWhiteGet(ctx, req.(*UserWhiteVo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserWhiteList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserWhiteListReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserWhiteList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserWhiteList_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserWhiteList(ctx, req.(*UserWhiteListReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserTestAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserTestVo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserTestAdd(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserTestAdd_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserTestAdd(ctx, req.(*UserTestVo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserTestUpdate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserTestVo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserTestUpdate(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserTestUpdate_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserTestUpdate(ctx, req.(*UserTestVo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserTestDel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(Ids)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserTestDel(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserTestDel_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserTestDel(ctx, req.(*Ids))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserTestGet_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserTestVo)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserTestGet(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserTestGet_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserTestGet(ctx, req.(*UserTestVo))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GoUserClient_UserTestList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(UserTestListReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GoUserClientServer).UserTestList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GoUserClient_UserTestList_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GoUserClientServer).UserTestList(ctx, req.(*UserTestListReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // GoUserClient_ServiceDesc is the grpc.ServiceDesc for GoUserClient service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -9859,6 +10203,46 @@ var GoUserClient_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "AccountDeviceList",
 			Handler:    _GoUserClient_AccountDeviceList_Handler,
 		},
+		{
+			MethodName: "UserWhiteAdd",
+			Handler:    _GoUserClient_UserWhiteAdd_Handler,
+		},
+		{
+			MethodName: "UserWhiteUpdate",
+			Handler:    _GoUserClient_UserWhiteUpdate_Handler,
+		},
+		{
+			MethodName: "UserWhiteDel",
+			Handler:    _GoUserClient_UserWhiteDel_Handler,
+		},
+		{
+			MethodName: "UserWhiteGet",
+			Handler:    _GoUserClient_UserWhiteGet_Handler,
+		},
+		{
+			MethodName: "UserWhiteList",
+			Handler:    _GoUserClient_UserWhiteList_Handler,
+		},
+		{
+			MethodName: "UserTestAdd",
+			Handler:    _GoUserClient_UserTestAdd_Handler,
+		},
+		{
+			MethodName: "UserTestUpdate",
+			Handler:    _GoUserClient_UserTestUpdate_Handler,
+		},
+		{
+			MethodName: "UserTestDel",
+			Handler:    _GoUserClient_UserTestDel_Handler,
+		},
+		{
+			MethodName: "UserTestGet",
+			Handler:    _GoUserClient_UserTestGet_Handler,
+		},
+		{
+			MethodName: "UserTestList",
+			Handler:    _GoUserClient_UserTestList_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "gorpc.proto",

+ 38 - 2
pb/user.proto

@@ -6,7 +6,7 @@ option go_package = "code.clickto.dev/nomo-server/go-service-pb/client";
 import "pb/common.proto";
 
 //白名单表
-message UserWhite{
+message UserWhiteVo{
   int64 id = 1;                // 主键ID
   int64 userId = 2;            // 用户
   UserType userType = 3;       //用户类型 1 设备 2 账号
@@ -16,7 +16,7 @@ message UserWhite{
 }
 
 //测试用户表
-message UserTest{
+message UserTestVo{
   int64 id = 1;                 // 主键ID
   int64 userId = 2;             // 用户
   UserType userType = 3;        //用户类型 1 设备 2 账号
@@ -102,6 +102,28 @@ message AccountDeviceListResp {
   repeated AccountDeviceVo list = 2;
 }
 
+message UserWhiteListReq {
+  Page page = 1;
+  UserWhiteVo vo = 2;
+  repeated int64 excludeIds = 3; // 排除的ID
+}
+
+message UserWhiteListResp {
+  int64 total = 1;
+  repeated UserWhiteVo list = 2;
+}
+
+message UserTestListReq {
+  Page page = 1;
+  UserTestVo vo = 2;
+  repeated int64 excludeIds = 3; // 排除的ID
+}
+
+message UserTestListResp {
+  int64 total = 1;
+  repeated UserTestVo list = 2;
+}
+
 message DeviceVo {
   int64 id = 1;
   string userUuid = 2;
@@ -198,4 +220,18 @@ service GoUserClient {
   rpc AccountDeviceDel(Ids) returns (Empty);
   rpc AccountDeviceGet(AccountDeviceVo) returns (AccountDeviceVo);
   rpc AccountDeviceList(AccountDeviceListReq) returns (AccountDeviceListResp);
+
+  // 用户白名单管理
+  rpc UserWhiteAdd(UserWhiteVo) returns (UserWhiteVo);
+  rpc UserWhiteUpdate(UserWhiteVo) returns (UserWhiteVo);
+  rpc UserWhiteDel(Ids) returns (Empty);
+  rpc UserWhiteGet(UserWhiteVo) returns (UserWhiteVo);
+  rpc UserWhiteList(UserWhiteListReq) returns (UserWhiteListResp);
+
+  // 测试用户管理
+  rpc UserTestAdd(UserTestVo) returns (UserTestVo);
+  rpc UserTestUpdate(UserTestVo) returns (UserTestVo);
+  rpc UserTestDel(Ids) returns (Empty);
+  rpc UserTestGet(UserTestVo) returns (UserTestVo);
+  rpc UserTestList(UserTestListReq) returns (UserTestListResp);
 }

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.