Merge branch 'jng' into dev

api/accountFiee/accountFiee.proto

@@ -43,6 +43,7 @@ service AccountFiee {
   rpc DecryptJwt (DecryptJwtRequest) returns (DecryptJwtResponse) {}//最好放在调用方
   rpc Info (InfoRequest) returns (UserInfoResponse) {}
   rpc JobNumGetInfo (JobNumGetInfoRequest) returns (InfoResponse) {}
+  rpc SubNumGetInfo (SubNumGetInfoRequest) returns (UserInfoResponse) {}
   rpc List (ListRequest) returns (ListResponse) {}
   rpc RandList (ListRequest) returns (ListResponse) {}
   rpc ListByIDs (ListByIDsRequest) returns (ListResponse) {}
@@ -217,6 +218,8 @@ message UserInfoResponse{
   string nickName = 17;
   string telNum = 18;
   string telAreaCode = 19;
+  string idNumber = 20;
+  string dateOfBirth = 21;
 }
 message RealNameResponse{
   uint64 id = 1;
@@ -745,6 +748,10 @@ message JobNumGetInfoRequest{
   string jobNum = 1;
   string    domain          = 2;
 }
+message SubNumGetInfoRequest{
+  string subNum = 1;
+  string    domain          = 2;
+}
 message CreateClockDeviceRequest{
   string deviceNum =1;
   string deviceName =2;

api/accountFiee/accountFiee.validator.pb.go

@@ -431,6 +431,9 @@ func (this *PositionUser) Validate() error {
 func (this *JobNumGetInfoRequest) Validate() error {
 	return nil
 }
+func (this *SubNumGetInfoRequest) Validate() error {
+	return nil
+}
 func (this *CreateClockDeviceRequest) Validate() error {
 	return nil
 }

api/accountFiee/accountFiee_triple.pb.go

@@ -47,6 +47,7 @@ type AccountFieeClient interface {
 	DecryptJwt(ctx context.Context, in *DecryptJwtRequest, opts ...grpc_go.CallOption) (*DecryptJwtResponse, common.ErrorWithAttachment)
 	Info(ctx context.Context, in *InfoRequest, opts ...grpc_go.CallOption) (*UserInfoResponse, common.ErrorWithAttachment)
 	JobNumGetInfo(ctx context.Context, in *JobNumGetInfoRequest, opts ...grpc_go.CallOption) (*InfoResponse, common.ErrorWithAttachment)
+	SubNumGetInfo(ctx context.Context, in *SubNumGetInfoRequest, opts ...grpc_go.CallOption) (*UserInfoResponse, common.ErrorWithAttachment)
 	List(ctx context.Context, in *ListRequest, opts ...grpc_go.CallOption) (*ListResponse, common.ErrorWithAttachment)
 	RandList(ctx context.Context, in *ListRequest, opts ...grpc_go.CallOption) (*ListResponse, common.ErrorWithAttachment)
 	ListByIDs(ctx context.Context, in *ListByIDsRequest, opts ...grpc_go.CallOption) (*ListResponse, common.ErrorWithAttachment)
@@ -124,6 +125,7 @@ type AccountFieeClientImpl struct {
 	DecryptJwt                    func(ctx context.Context, in *DecryptJwtRequest) (*DecryptJwtResponse, error)
 	Info                          func(ctx context.Context, in *InfoRequest) (*UserInfoResponse, error)
 	JobNumGetInfo                 func(ctx context.Context, in *JobNumGetInfoRequest) (*InfoResponse, error)
+	SubNumGetInfo                 func(ctx context.Context, in *SubNumGetInfoRequest) (*UserInfoResponse, error)
 	List                          func(ctx context.Context, in *ListRequest) (*ListResponse, error)
 	RandList                      func(ctx context.Context, in *ListRequest) (*ListResponse, error)
 	ListByIDs                     func(ctx context.Context, in *ListByIDsRequest) (*ListResponse, error)
@@ -296,6 +298,12 @@ func (c *accountFieeClient) JobNumGetInfo(ctx context.Context, in *JobNumGetInfo
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/JobNumGetInfo", in, out)
 }
 
+func (c *accountFieeClient) SubNumGetInfo(ctx context.Context, in *SubNumGetInfoRequest, opts ...grpc_go.CallOption) (*UserInfoResponse, common.ErrorWithAttachment) {
+	out := new(UserInfoResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/SubNumGetInfo", in, out)
+}
+
 func (c *accountFieeClient) List(ctx context.Context, in *ListRequest, opts ...grpc_go.CallOption) (*ListResponse, common.ErrorWithAttachment) {
 	out := new(ListResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -619,6 +627,7 @@ type AccountFieeServer interface {
 	DecryptJwt(context.Context, *DecryptJwtRequest) (*DecryptJwtResponse, error)
 	Info(context.Context, *InfoRequest) (*UserInfoResponse, error)
 	JobNumGetInfo(context.Context, *JobNumGetInfoRequest) (*InfoResponse, error)
+	SubNumGetInfo(context.Context, *SubNumGetInfoRequest) (*UserInfoResponse, error)
 	List(context.Context, *ListRequest) (*ListResponse, error)
 	RandList(context.Context, *ListRequest) (*ListResponse, error)
 	ListByIDs(context.Context, *ListByIDsRequest) (*ListResponse, error)
@@ -733,6 +742,9 @@ func (UnimplementedAccountFieeServer) Info(context.Context, *InfoRequest) (*User
 func (UnimplementedAccountFieeServer) JobNumGetInfo(context.Context, *JobNumGetInfoRequest) (*InfoResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method JobNumGetInfo not implemented")
 }
+func (UnimplementedAccountFieeServer) SubNumGetInfo(context.Context, *SubNumGetInfoRequest) (*UserInfoResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SubNumGetInfo not implemented")
+}
 func (UnimplementedAccountFieeServer) List(context.Context, *ListRequest) (*ListResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method List not implemented")
 }
@@ -1433,6 +1445,35 @@ func _AccountFiee_JobNumGetInfo_Handler(srv interface{}, ctx context.Context, de
 	return interceptor(ctx, in, info, handler)
 }
 
+func _AccountFiee_SubNumGetInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SubNumGetInfoRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("SubNumGetInfo", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _AccountFiee_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ListRequest)
 	if err := dec(in); err != nil {
@@ -2962,6 +3003,10 @@ var AccountFiee_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "JobNumGetInfo",
 			Handler:    _AccountFiee_JobNumGetInfo_Handler,
 		},
+		{
+			MethodName: "SubNumGetInfo",
+			Handler:    _AccountFiee_SubNumGetInfo_Handler,
+		},
 		{
 			MethodName: "List",
 			Handler:    _AccountFiee_List_Handler,