xg

api/internal/logic/exportchargeaccountlogic.go

@@ -27,7 +27,7 @@ func NewExportChargeAccountLogic(ctx context.Context, svcCtx *svc.ServiceContext
 func (l *ExportChargeAccountLogic) ExportChargeAccount(req *types.ChargeAccountReq) (resp *types.ChargeResp, err error) {
 	var (
 		lsi      = l.svcCtx.ResourcesCenter
-		respData *resourcesCenterclient.ChargeAccountResp
+		respData *resourcesCenterclient.ChargeResp
 	)
 	respData, err = lsi.JyExportChargeAmount(l.ctx, &resourcesCenterclient.ChargeAccountReq{
 		EntId:  req.EntId,

api/internal/logic/exportchargelogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenterclient"
 	"context"
 
 	"app.yhyue.com/moapp/jyResourcesCenter/api/internal/svc"
@@ -24,7 +25,19 @@ func NewExportChargeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Expo
 }
 
 func (l *ExportChargeLogic) ExportCharge(req *types.ChargeReq) (resp *types.ChargeResp, err error) {
-	// todo: add your logic here and delete this line
+	var (
+		lsi      = l.svcCtx.ResourcesCenter
+		respData *resourcesCenterclient.ChargeResp
+	)
+	respData, err = lsi.JyExportCharge(l.ctx, &resourcesCenterclient.ChargeReq{
+		EntId:  req.EntId,
+		UserId: req.UserId,
+	})
+	return &types.ChargeResp{
+		Code:    respData.Code,
+		Message: respData.Message,
+		Data:    respData.Data,
+	}, nil
 
 	return
 }

go.mod

@@ -13,3 +13,97 @@ require (
 	google.golang.org/grpc v1.63.2
 	google.golang.org/protobuf v1.33.0
 )
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.15.15 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/openzipkin/zipkin-go v0.4.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
+	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.9 // indirect
+	go.mongodb.org/mongo-driver v1.12.1 // indirect
+	go.opentelemetry.io/otel v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.14.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
+	go.opentelemetry.io/otel/trace v1.14.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/automaxprocs v1.5.3 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/oauth2 v0.17.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/term v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/api v0.26.3 // indirect
+	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
+	k8s.io/client-go v0.26.3 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230307230338-69ee2d25a840 // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+	xorm.io/builder v0.3.6 // indirect
+	xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb // indirect
+)

rpc/internal/logic/findresourcesauthlogic.go

@@ -1,13 +1,11 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
 	"app.yhyue.com/moapp/jyResourcesCenter/service"
 	"context"
 	"errors"
-
-	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
-	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenter"
-
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

rpc/internal/logic/jyexportchargeamountlogic.go

@@ -25,7 +25,7 @@ func NewJyExportChargeAmountLogic(ctx context.Context, svcCtx *svc.ServiceContex
 }
 
 // 剑鱼定制导出扣费方式
-func (l *JyExportChargeAmountLogic) JyExportChargeAmount(in *resourcesCenter.ChargeAccountReq) (*resourcesCenter.ChargeAccountResp, error) {
+func (l *JyExportChargeAmountLogic) JyExportChargeAmount(in *resourcesCenter.ChargeAccountReq) (*resourcesCenter.ChargeResp, error) {
 	resp := service.ChargeAccount(in)
 	return resp, nil
 }

rpc/internal/logic/jyexportchargelogic.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"app.yhyue.com/moapp/jyResourcesCenter/service"
 	"context"
 
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/internal/svc"
@@ -24,8 +25,7 @@ func NewJyExportChargeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Jy
 }
 
 // 剑鱼定制导出数据扣费
-func (l *JyExportChargeLogic) JyExportCharge(in *resourcesCenter.ChargeReq) (*resourcesCenter.Response, error) {
-	// todo: add your logic here and delete this line
-
-	return &resourcesCenter.Response{}, nil
+func (l *JyExportChargeLogic) JyExportCharge(in *resourcesCenter.ChargeReq) (*resourcesCenter.ChargeResp, error) {
+	resp := service.ChargeFunc(in)
+	return resp, nil
 }

rpc/internal/server/resourcescenterserver.go

@@ -95,7 +95,7 @@ func (s *ResourcesCenterServer) EntAccountRecovery(ctx context.Context, in *reso
 }
 
 // 剑鱼定制导出扣费方式
-func (s *ResourcesCenterServer) JyExportChargeAmount(ctx context.Context, in *resourcesCenter.ChargeAccountReq) (*resourcesCenter.ChargeAccountResp, error) {
+func (s *ResourcesCenterServer) JyExportChargeAmount(ctx context.Context, in *resourcesCenter.ChargeAccountReq) (*resourcesCenter.ChargeResp, error) {
 	l := logic.NewJyExportChargeAmountLogic(ctx, s.svcCtx)
 	return l.JyExportChargeAmount(in)
 }

rpc/resourcesCenter.proto

@@ -202,12 +202,6 @@ message ChargeAccountReq {
   int64 UserId = 2;
 }
 
-message ChargeAccountResp {
-  int64 code = 1;
-  string message = 2;
-  SomeInfo data = 3;
-}
-
 message ChargeReq {
   int64 entId = 1;
   int64 userId = 2;
@@ -267,7 +261,7 @@ service ResourcesCenter {
   rpc entAccountRecovery (EntOperateReq) returns (Response);
 
   // 剑鱼定制导出扣费方式
-  rpc jyExportChargeAmount(ChargeAccountReq) returns(ChargeAccountResp);
+  rpc jyExportChargeAmount(ChargeAccountReq) returns(ChargeResp);
   // 剑鱼定制导出数据扣费
   rpc jyExportCharge (ChargeReq) returns (ChargeResp);
 }

rpc/resourcesCenter/resourcesCenter.pb.go

@@ -1962,69 +1962,6 @@ func (x *ChargeAccountReq) GetUserId() int64 {
 	return 0
 }
 
-type ChargeAccountResp struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Code    int64     `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
-	Message string    `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
-	Data    *SomeInfo `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
-}
-
-func (x *ChargeAccountResp) Reset() {
-	*x = ChargeAccountResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[21]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ChargeAccountResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ChargeAccountResp) ProtoMessage() {}
-
-func (x *ChargeAccountResp) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[21]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ChargeAccountResp.ProtoReflect.Descriptor instead.
-func (*ChargeAccountResp) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{21}
-}
-
-func (x *ChargeAccountResp) GetCode() int64 {
-	if x != nil {
-		return x.Code
-	}
-	return 0
-}
-
-func (x *ChargeAccountResp) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
-func (x *ChargeAccountResp) GetData() *SomeInfo {
-	if x != nil {
-		return x.Data
-	}
-	return nil
-}
-
 type ChargeReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2039,13 +1976,13 @@ type ChargeReq struct {
 	Filter      string `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"` // 数据筛选条件
 	PositionId  string `protobuf:"bytes,8,opt,name=positionId,proto3" json:"positionId,omitempty"`
 	AccountId   string `protobuf:"bytes,9,opt,name=accountId,proto3" json:"accountId,omitempty"`
-	ChargeType  int32  `protobuf:"varint,10,opt,name=chargeType,proto3" json:"chargeType,omitempty"` //扣费方式
+	ChargeType  int32  `protobuf:"varint,10,opt,name=chargeType,proto3" json:"chargeType,omitempty"` //扣费方式，0: 企业，1: 个人
 }
 
 func (x *ChargeReq) Reset() {
 	*x = ChargeReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[22]
+		mi := &file_resourcesCenter_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2058,7 +1995,7 @@ func (x *ChargeReq) String() string {
 func (*ChargeReq) ProtoMessage() {}
 
 func (x *ChargeReq) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[22]
+	mi := &file_resourcesCenter_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2071,7 +2008,7 @@ func (x *ChargeReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChargeReq.ProtoReflect.Descriptor instead.
 func (*ChargeReq) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{22}
+	return file_resourcesCenter_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *ChargeReq) GetEntId() int64 {
@@ -2157,7 +2094,7 @@ type ChargeResp struct {
 func (x *ChargeResp) Reset() {
 	*x = ChargeResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[23]
+		mi := &file_resourcesCenter_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2170,7 +2107,7 @@ func (x *ChargeResp) String() string {
 func (*ChargeResp) ProtoMessage() {}
 
 func (x *ChargeResp) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[23]
+	mi := &file_resourcesCenter_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2183,7 +2120,7 @@ func (x *ChargeResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChargeResp.ProtoReflect.Descriptor instead.
 func (*ChargeResp) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{23}
+	return file_resourcesCenter_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *ChargeResp) GetCode() int64 {
@@ -2225,7 +2162,7 @@ type SomeInfo struct {
 func (x *SomeInfo) Reset() {
 	*x = SomeInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_resourcesCenter_proto_msgTypes[24]
+		mi := &file_resourcesCenter_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2238,7 +2175,7 @@ func (x *SomeInfo) String() string {
 func (*SomeInfo) ProtoMessage() {}
 
 func (x *SomeInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_resourcesCenter_proto_msgTypes[24]
+	mi := &file_resourcesCenter_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2251,7 +2188,7 @@ func (x *SomeInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SomeInfo.ProtoReflect.Descriptor instead.
 func (*SomeInfo) Descriptor() ([]byte, []int) {
-	return file_resourcesCenter_proto_rawDescGZIP(), []int{24}
+	return file_resourcesCenter_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *SomeInfo) GetChargeType() int32 {
@@ -2581,126 +2518,118 @@ var file_resourcesCenter_proto_rawDesc = []byte{
 	0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71,
 	0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
 	0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x70,
-	0x0a, 0x11, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x12, 0x2d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65,
-	0x72, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
-	0x22, 0xab, 0x02, 0x0a, 0x09, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14,
-	0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65,
-	0x6e, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09,
-	0x65, 0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x09, 0x65, 0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78,
-	0x70, 0x6f, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65,
-	0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x64, 0x75,
-	0x63, 0x74, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x64,
-	0x75, 0x63, 0x74, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f,
-	0x61, 0x64, 0x55, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x6f, 0x77,
-	0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64,
-	0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1e,
-	0x0a, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x69,
-	0x0a, 0x0a, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04,
-	0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xcc, 0x01, 0x0a, 0x08, 0x53, 0x6f,
-	0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65,
-	0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x68, 0x61, 0x72,
-	0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65,
-	0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x68,
-	0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61,
-	0x69, 0x6c, 0x4d, 0x73, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x61, 0x69,
-	0x6c, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x31, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x04, 0x6e, 0x75, 0x6d, 0x31, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x32,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x6e, 0x75, 0x6d, 0x32, 0x12, 0x12, 0x0a, 0x04,
-	0x6e, 0x75, 0x6d, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x6e, 0x75, 0x6d, 0x33,
-	0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04,
-	0x6e, 0x75, 0x6d, 0x34, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x35, 0x18, 0x08, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x04, 0x6e, 0x75, 0x6d, 0x35, 0x32, 0xf2, 0x08, 0x0a, 0x0f, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x56, 0x0a, 0x11,
-	0x66, 0x69, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x41, 0x75, 0x74,
-	0x68, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e,
-	0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71,
-	0x1a, 0x22, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74,
-	0x65, 0x72, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x65, 0x52, 0x65, 0x73, 0x12, 0x57, 0x0a, 0x12, 0x66, 0x69, 0x6e, 0x64, 0x41, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x41, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x12, 0x52, 0x0a,
-	0x11, 0x66, 0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65,
-	0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x21,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0xab,
+	0x02, 0x0a, 0x09, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
+	0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x6e, 0x74,
+	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6e,
+	0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65,
+	0x6e, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x70, 0x6f,
+	0x72, 0x74, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x65, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x4e, 0x75, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x65, 0x64, 0x75, 0x63, 0x74,
+	0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x64, 0x65, 0x64, 0x75, 0x63,
+	0x74, 0x4e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64,
+	0x55, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c,
+	0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x1e,
+	0x0a, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1c,
+	0x0a, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a,
+	0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x69, 0x0a, 0x0a,
+	0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f,
+	0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x2d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x53, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xcc, 0x01, 0x0a, 0x08, 0x53, 0x6f, 0x6d, 0x65,
+	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x68, 0x61, 0x72,
+	0x67, 0x65, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x69, 0x6c,
+	0x4d, 0x73, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x61, 0x69, 0x6c, 0x4d,
+	0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x31, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x04, 0x6e, 0x75, 0x6d, 0x31, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x32, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x6e, 0x75, 0x6d, 0x32, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75,
+	0x6d, 0x33, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x6e, 0x75, 0x6d, 0x33, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x6e, 0x75,
+	0x6d, 0x34, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x75, 0x6d, 0x35, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x04, 0x6e, 0x75, 0x6d, 0x35, 0x32, 0xeb, 0x08, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x56, 0x0a, 0x11, 0x66, 0x69,
+	0x6e, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x41, 0x75, 0x74, 0x68, 0x12,
+	0x1d, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65,
+	0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x22,
 	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65,
-	0x73, 0x12, 0x4c, 0x0a, 0x13, 0x70, 0x75, 0x72, 0x63, 0x68, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65,
-	0x72, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
+	0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52,
+	0x65, 0x73, 0x12, 0x57, 0x0a, 0x12, 0x66, 0x69, 0x6e, 0x64, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
 	0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x73, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x4f, 0x0a, 0x0f, 0x75, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c,
-	0x65, 0x64, 0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65,
-	0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x1a, 0x20,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x2e, 0x55, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x47, 0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x64, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12,
-	0x1b, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65,
-	0x72, 0x2e, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x50,
-	0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x52, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x09, 0x75, 0x73, 0x65,
-	0x72, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x49, 0x6e,
-	0x66, 0x6f, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65,
-	0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a,
-	0x0d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x70, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x17,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x2e, 0x56, 0x69, 0x70, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x51, 0x0a, 0x0f, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e,
-	0x75, 0x6d, 0x41, 0x64, 0x64, 0x12, 0x23, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x4e, 0x75, 0x6d, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x0d, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x12, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4c, 0x0a, 0x0f, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x47, 0x69, 0x76, 0x65, 0x6e, 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x4f, 0x70, 0x65,
-	0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x4f, 0x0a, 0x12, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x4f, 0x70,
-	0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x22, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x12, 0x52, 0x0a, 0x11, 0x66,
+	0x69, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
+	0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43,
+	0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x12,
+	0x4c, 0x0a, 0x13, 0x70, 0x75, 0x72, 0x63, 0x68, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x42,
+	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65,
+	0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4f, 0x0a,
+	0x0f, 0x75, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64,
+	0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x1a, 0x20, 0x2e, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x55,
+	0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47,
+	0x0a, 0x0b, 0x66, 0x69, 0x6e, 0x64, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x12, 0x1b, 0x2e,
+	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e,
+	0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x72, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x65,
+	0x76, 0x69, 0x65, 0x77, 0x52, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x72, 0x4d,
+	0x65, 0x72, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+	0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x0d, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x70, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x17, 0x2e, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x56,
+	0x69, 0x70, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x51, 0x0a, 0x0f, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x75, 0x6d,
+	0x41, 0x64, 0x64, 0x12, 0x23, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43,
+	0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e,
+	0x75, 0x6d, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75,
 	0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x14, 0x6a, 0x79, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x43,
-	0x68, 0x61, 0x72, 0x67, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x2e, 0x72, 0x65,
+	0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x0d, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x41, 0x64, 0x64, 0x12, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
+	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x4c, 0x0a, 0x0f, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x47, 0x69, 0x76, 0x65, 0x6e, 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x4f, 0x70, 0x65, 0x72, 0x61,
+	0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x4f, 0x0a, 0x12, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65,
+	0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x45, 0x6e, 0x74, 0x4f, 0x70, 0x65, 0x72,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x56, 0x0a, 0x14, 0x6a, 0x79, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x68, 0x61,
+	0x72, 0x67, 0x65, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x21, 0x2e, 0x72, 0x65, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x68, 0x61, 0x72,
+	0x67, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x72,
+	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43,
+	0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x49, 0x0a, 0x0e, 0x6a, 0x79, 0x45,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x72, 0x65,
 	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x68,
-	0x61, 0x72, 0x67, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x22,
-	0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x2e, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x49, 0x0a, 0x0e, 0x6a, 0x79, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x68,
-	0x61, 0x72, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73,
-	0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71,
-	0x1a, 0x1b, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74,
-	0x65, 0x72, 0x2e, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x12, 0x5a,
-	0x10, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72,
-	0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x43, 0x68, 0x61, 0x72, 0x67, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x42, 0x12, 0x5a, 0x10, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x73, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2715,7 +2644,7 @@ func file_resourcesCenter_proto_rawDescGZIP() []byte {
 	return file_resourcesCenter_proto_rawDescData
 }
 
-var file_resourcesCenter_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
+var file_resourcesCenter_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
 var file_resourcesCenter_proto_goTypes = []interface{}{
 	(*Response)(nil),           // 0: resourcesCenter.Response
 	(*UseUserResponse)(nil),    // 1: resourcesCenter.UseUserResponse
@@ -2738,50 +2667,48 @@ var file_resourcesCenter_proto_goTypes = []interface{}{
 	(*EntSourceNumAddReq)(nil), // 18: resourcesCenter.EntSourceNumAddReq
 	(*EntOperateReq)(nil),      // 19: resourcesCenter.EntOperateReq
 	(*ChargeAccountReq)(nil),   // 20: resourcesCenter.ChargeAccountReq
-	(*ChargeAccountResp)(nil),  // 21: resourcesCenter.ChargeAccountResp
-	(*ChargeReq)(nil),          // 22: resourcesCenter.ChargeReq
-	(*ChargeResp)(nil),         // 23: resourcesCenter.ChargeResp
-	(*SomeInfo)(nil),           // 24: resourcesCenter.SomeInfo
+	(*ChargeReq)(nil),          // 21: resourcesCenter.ChargeReq
+	(*ChargeResp)(nil),         // 22: resourcesCenter.ChargeResp
+	(*SomeInfo)(nil),           // 23: resourcesCenter.SomeInfo
 }
 var file_resourcesCenter_proto_depIdxs = []int32{
 	6,  // 0: resourcesCenter.ResourcesAuthRes.data:type_name -> resourcesCenter.ResourcesAuth
 	7,  // 1: resourcesCenter.AccountBalanceRes.data:type_name -> resourcesCenter.ResourceBalance
 	8,  // 2: resourcesCenter.ConsumeRecordRes.data:type_name -> resourcesCenter.ConsumeRecord
-	24, // 3: resourcesCenter.ChargeAccountResp.data:type_name -> resourcesCenter.SomeInfo
-	24, // 4: resourcesCenter.ChargeResp.data:type_name -> resourcesCenter.SomeInfo
-	9,  // 5: resourcesCenter.ResourcesCenter.findResourcesAuth:input_type -> resourcesCenter.ResourcesReq
-	9,  // 6: resourcesCenter.ResourcesCenter.findAccountBalance:input_type -> resourcesCenter.ResourcesReq
-	14, // 7: resourcesCenter.ResourcesCenter.findConsumeRecord:input_type -> resourcesCenter.RecordReq
-	4,  // 8: resourcesCenter.ResourcesCenter.purchaseUserBalance:input_type -> resourcesCenter.Resources
-	4,  // 9: resourcesCenter.ResourcesCenter.useUserDetailed:input_type -> resourcesCenter.Resources
-	10, // 10: resourcesCenter.ResourcesCenter.findPreview:input_type -> resourcesCenter.PreviewReq
-	16, // 11: resourcesCenter.ResourcesCenter.userMerge:input_type -> resourcesCenter.mergeInfo
-	3,  // 12: resourcesCenter.ResourcesCenter.updateVipTime:input_type -> resourcesCenter.VipReq
-	18, // 13: resourcesCenter.ResourcesCenter.entSourceNumAdd:input_type -> resourcesCenter.EntSourceNumAddReq
-	17, // 14: resourcesCenter.ResourcesCenter.entAccountAdd:input_type -> resourcesCenter.EntAccountAddReq
-	19, // 15: resourcesCenter.ResourcesCenter.entAccountGiven:input_type -> resourcesCenter.EntOperateReq
-	19, // 16: resourcesCenter.ResourcesCenter.entAccountRecovery:input_type -> resourcesCenter.EntOperateReq
-	20, // 17: resourcesCenter.ResourcesCenter.jyExportChargeAmount:input_type -> resourcesCenter.ChargeAccountReq
-	22, // 18: resourcesCenter.ResourcesCenter.jyExportCharge:input_type -> resourcesCenter.ChargeReq
-	13, // 19: resourcesCenter.ResourcesCenter.findResourcesAuth:output_type -> resourcesCenter.AccountBalanceRes
-	13, // 20: resourcesCenter.ResourcesCenter.findAccountBalance:output_type -> resourcesCenter.AccountBalanceRes
-	15, // 21: resourcesCenter.ResourcesCenter.findConsumeRecord:output_type -> resourcesCenter.ConsumeRecordRes
-	0,  // 22: resourcesCenter.ResourcesCenter.purchaseUserBalance:output_type -> resourcesCenter.Response
-	1,  // 23: resourcesCenter.ResourcesCenter.useUserDetailed:output_type -> resourcesCenter.UseUserResponse
-	11, // 24: resourcesCenter.ResourcesCenter.findPreview:output_type -> resourcesCenter.PreviewRes
-	0,  // 25: resourcesCenter.ResourcesCenter.userMerge:output_type -> resourcesCenter.Response
-	0,  // 26: resourcesCenter.ResourcesCenter.updateVipTime:output_type -> resourcesCenter.Response
-	0,  // 27: resourcesCenter.ResourcesCenter.entSourceNumAdd:output_type -> resourcesCenter.Response
-	0,  // 28: resourcesCenter.ResourcesCenter.entAccountAdd:output_type -> resourcesCenter.Response
-	0,  // 29: resourcesCenter.ResourcesCenter.entAccountGiven:output_type -> resourcesCenter.Response
-	0,  // 30: resourcesCenter.ResourcesCenter.entAccountRecovery:output_type -> resourcesCenter.Response
-	21, // 31: resourcesCenter.ResourcesCenter.jyExportChargeAmount:output_type -> resourcesCenter.ChargeAccountResp
-	23, // 32: resourcesCenter.ResourcesCenter.jyExportCharge:output_type -> resourcesCenter.ChargeResp
-	19, // [19:33] is the sub-list for method output_type
-	5,  // [5:19] is the sub-list for method input_type
-	5,  // [5:5] is the sub-list for extension type_name
-	5,  // [5:5] is the sub-list for extension extendee
-	0,  // [0:5] is the sub-list for field type_name
+	23, // 3: resourcesCenter.ChargeResp.data:type_name -> resourcesCenter.SomeInfo
+	9,  // 4: resourcesCenter.ResourcesCenter.findResourcesAuth:input_type -> resourcesCenter.ResourcesReq
+	9,  // 5: resourcesCenter.ResourcesCenter.findAccountBalance:input_type -> resourcesCenter.ResourcesReq
+	14, // 6: resourcesCenter.ResourcesCenter.findConsumeRecord:input_type -> resourcesCenter.RecordReq
+	4,  // 7: resourcesCenter.ResourcesCenter.purchaseUserBalance:input_type -> resourcesCenter.Resources
+	4,  // 8: resourcesCenter.ResourcesCenter.useUserDetailed:input_type -> resourcesCenter.Resources
+	10, // 9: resourcesCenter.ResourcesCenter.findPreview:input_type -> resourcesCenter.PreviewReq
+	16, // 10: resourcesCenter.ResourcesCenter.userMerge:input_type -> resourcesCenter.mergeInfo
+	3,  // 11: resourcesCenter.ResourcesCenter.updateVipTime:input_type -> resourcesCenter.VipReq
+	18, // 12: resourcesCenter.ResourcesCenter.entSourceNumAdd:input_type -> resourcesCenter.EntSourceNumAddReq
+	17, // 13: resourcesCenter.ResourcesCenter.entAccountAdd:input_type -> resourcesCenter.EntAccountAddReq
+	19, // 14: resourcesCenter.ResourcesCenter.entAccountGiven:input_type -> resourcesCenter.EntOperateReq
+	19, // 15: resourcesCenter.ResourcesCenter.entAccountRecovery:input_type -> resourcesCenter.EntOperateReq
+	20, // 16: resourcesCenter.ResourcesCenter.jyExportChargeAmount:input_type -> resourcesCenter.ChargeAccountReq
+	21, // 17: resourcesCenter.ResourcesCenter.jyExportCharge:input_type -> resourcesCenter.ChargeReq
+	13, // 18: resourcesCenter.ResourcesCenter.findResourcesAuth:output_type -> resourcesCenter.AccountBalanceRes
+	13, // 19: resourcesCenter.ResourcesCenter.findAccountBalance:output_type -> resourcesCenter.AccountBalanceRes
+	15, // 20: resourcesCenter.ResourcesCenter.findConsumeRecord:output_type -> resourcesCenter.ConsumeRecordRes
+	0,  // 21: resourcesCenter.ResourcesCenter.purchaseUserBalance:output_type -> resourcesCenter.Response
+	1,  // 22: resourcesCenter.ResourcesCenter.useUserDetailed:output_type -> resourcesCenter.UseUserResponse
+	11, // 23: resourcesCenter.ResourcesCenter.findPreview:output_type -> resourcesCenter.PreviewRes
+	0,  // 24: resourcesCenter.ResourcesCenter.userMerge:output_type -> resourcesCenter.Response
+	0,  // 25: resourcesCenter.ResourcesCenter.updateVipTime:output_type -> resourcesCenter.Response
+	0,  // 26: resourcesCenter.ResourcesCenter.entSourceNumAdd:output_type -> resourcesCenter.Response
+	0,  // 27: resourcesCenter.ResourcesCenter.entAccountAdd:output_type -> resourcesCenter.Response
+	0,  // 28: resourcesCenter.ResourcesCenter.entAccountGiven:output_type -> resourcesCenter.Response
+	0,  // 29: resourcesCenter.ResourcesCenter.entAccountRecovery:output_type -> resourcesCenter.Response
+	22, // 30: resourcesCenter.ResourcesCenter.jyExportChargeAmount:output_type -> resourcesCenter.ChargeResp
+	22, // 31: resourcesCenter.ResourcesCenter.jyExportCharge:output_type -> resourcesCenter.ChargeResp
+	18, // [18:32] is the sub-list for method output_type
+	4,  // [4:18] is the sub-list for method input_type
+	4,  // [4:4] is the sub-list for extension type_name
+	4,  // [4:4] is the sub-list for extension extendee
+	0,  // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_resourcesCenter_proto_init() }
@@ -3043,18 +2970,6 @@ func file_resourcesCenter_proto_init() {
 			}
 		}
 		file_resourcesCenter_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ChargeAccountResp); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_resourcesCenter_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChargeReq); i {
 			case 0:
 				return &v.state
@@ -3066,7 +2981,7 @@ func file_resourcesCenter_proto_init() {
 				return nil
 			}
 		}
-		file_resourcesCenter_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_resourcesCenter_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChargeResp); i {
 			case 0:
 				return &v.state
@@ -3078,7 +2993,7 @@ func file_resourcesCenter_proto_init() {
 				return nil
 			}
 		}
-		file_resourcesCenter_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_resourcesCenter_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SomeInfo); i {
 			case 0:
 				return &v.state
@@ -3097,7 +3012,7 @@ func file_resourcesCenter_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_resourcesCenter_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   25,
+			NumMessages:   24,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

rpc/resourcesCenter/resourcesCenter_grpc.pb.go

@@ -64,7 +64,7 @@ type ResourcesCenterClient interface {
 	// 权益收回
 	EntAccountRecovery(ctx context.Context, in *EntOperateReq, opts ...grpc.CallOption) (*Response, error)
 	// 剑鱼定制导出扣费方式
-	JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeAccountResp, error)
+	JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeResp, error)
 	// 剑鱼定制导出数据扣费
 	JyExportCharge(ctx context.Context, in *ChargeReq, opts ...grpc.CallOption) (*ChargeResp, error)
 }
@@ -185,8 +185,8 @@ func (c *resourcesCenterClient) EntAccountRecovery(ctx context.Context, in *EntO
 	return out, nil
 }
 
-func (c *resourcesCenterClient) JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeAccountResp, error) {
-	out := new(ChargeAccountResp)
+func (c *resourcesCenterClient) JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeResp, error) {
+	out := new(ChargeResp)
 	err := c.cc.Invoke(ctx, ResourcesCenter_JyExportChargeAmount_FullMethodName, in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -232,7 +232,7 @@ type ResourcesCenterServer interface {
 	// 权益收回
 	EntAccountRecovery(context.Context, *EntOperateReq) (*Response, error)
 	// 剑鱼定制导出扣费方式
-	JyExportChargeAmount(context.Context, *ChargeAccountReq) (*ChargeAccountResp, error)
+	JyExportChargeAmount(context.Context, *ChargeAccountReq) (*ChargeResp, error)
 	// 剑鱼定制导出数据扣费
 	JyExportCharge(context.Context, *ChargeReq) (*ChargeResp, error)
 	mustEmbedUnimplementedResourcesCenterServer()
@@ -278,7 +278,7 @@ func (UnimplementedResourcesCenterServer) EntAccountGiven(context.Context, *EntO
 func (UnimplementedResourcesCenterServer) EntAccountRecovery(context.Context, *EntOperateReq) (*Response, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method EntAccountRecovery not implemented")
 }
-func (UnimplementedResourcesCenterServer) JyExportChargeAmount(context.Context, *ChargeAccountReq) (*ChargeAccountResp, error) {
+func (UnimplementedResourcesCenterServer) JyExportChargeAmount(context.Context, *ChargeAccountReq) (*ChargeResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method JyExportChargeAmount not implemented")
 }
 func (UnimplementedResourcesCenterServer) JyExportCharge(context.Context, *ChargeReq) (*ChargeResp, error) {

rpc/resourcesCenterclient/resourcescenter.go

@@ -1,7 +1,7 @@
 // Code generated by goctl. DO NOT EDIT.
 // Source: resourcesCenter.proto
 
-package resourcescenterclient
+package resourcesCenterclient
 
 import (
 	"context"
@@ -16,7 +16,6 @@ type (
 	AccountBalanceRes  = resourcesCenter.AccountBalanceRes
 	Balance            = resourcesCenter.Balance
 	ChargeAccountReq   = resourcesCenter.ChargeAccountReq
-	ChargeAccountResp  = resourcesCenter.ChargeAccountResp
 	ChargeReq          = resourcesCenter.ChargeReq
 	ChargeResp         = resourcesCenter.ChargeResp
 	ConsumeRecord      = resourcesCenter.ConsumeRecord
@@ -65,7 +64,7 @@ type (
 		// 权益收回
 		EntAccountRecovery(ctx context.Context, in *EntOperateReq, opts ...grpc.CallOption) (*Response, error)
 		// 剑鱼定制导出扣费方式
-		JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeAccountResp, error)
+		JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeResp, error)
 		// 剑鱼定制导出数据扣费
 		JyExportCharge(ctx context.Context, in *ChargeReq, opts ...grpc.CallOption) (*ChargeResp, error)
 	}
@@ -154,7 +153,7 @@ func (m *defaultResourcesCenter) EntAccountRecovery(ctx context.Context, in *Ent
 }
 
 // 剑鱼定制导出扣费方式
-func (m *defaultResourcesCenter) JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeAccountResp, error) {
+func (m *defaultResourcesCenter) JyExportChargeAmount(ctx context.Context, in *ChargeAccountReq, opts ...grpc.CallOption) (*ChargeResp, error) {
 	client := resourcesCenter.NewResourcesCenterClient(m.cli.Conn())
 	return client.JyExportChargeAmount(ctx, in, opts...)
 }

service/exportChargeService.go

@@ -11,31 +11,31 @@ import (
 // @Author jianghan
 // @Date 2025/2/7
 // @Description 查询可扣费方式
-func ChargeAccount(data *resourcesCenter.ChargeAccountReq) (resp *resourcesCenter.ChargeAccountResp) {
+func ChargeAccount(data *resourcesCenter.ChargeAccountReq) (resp *resourcesCenter.ChargeResp) {
 	now := time.Now().Format("2006-01-02")
 	jyOrm := entity.JyEngine.NewSession()
-	souceOrm := entity.Engine.NewSession()
+	centerOrm := entity.Engine.NewSession()
 	var exportPower int
 	has, _ := jyOrm.Table("entniche_user").Cols("export_power").Where("id = ?", data.UserId).Get(&exportPower)
 	if has && exportPower == 0 {
-		return &resourcesCenter.ChargeAccountResp{Code: entity.ErrorCode, Message: "该人员没有数据定制导出权限"}
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "该人员没有数据定制导出权限"}
 	}
 	entInfo, b := entity.Mgo.FindOne("user", map[string]interface{}{"entid": data.EntId})
 	var entNums int64
 	if b && len(*entInfo) > 0 && (*entInfo)["plan"] != nil {
 		entNums = common.Int64All((*entInfo)["current"])
 	} else {
-		return &resourcesCenter.ChargeAccountResp{Code: entity.ErrorCode, Message: "未查询到企业数据流量"}
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "未查询到企业数据流量"}
 	}
 	var personNums int64
-	_ = souceOrm.Table("account_resources").Cols("SUM(number) AS totalNum").
+	_ = centerOrm.Table("account_resources").Cols("SUM(number) AS totalNum").
 		Where("accountId = ? and endTime >= ? and resourceType = ?", data.EntId, now, "高级字段包").Find(&personNums)
 	if exportPower == 1 && (entNums > 0 || personNums == 0) {
 		// 企业流量包扣除
 		var personLimit *entity.PersonLimit
 		_ = jyOrm.Table("entniche_export_limit").Select("*").
 			Where("ent_id = ? and user_id =  ?", data.EntId, data.UserId).Find(&personLimit)
-		return &resourcesCenter.ChargeAccountResp{
+		return &resourcesCenter.ChargeResp{
 			Code: entity.SuccessCode,
 			Data: &resourcesCenter.SomeInfo{
 				ChargeType: 0,
@@ -48,7 +48,7 @@ func ChargeAccount(data *resourcesCenter.ChargeAccountReq) (resp *resourcesCente
 		}
 	} else {
 		// 个人高级字段包扣除
-		return &resourcesCenter.ChargeAccountResp{
+		return &resourcesCenter.ChargeResp{
 			Code: entity.SuccessCode,
 			Data: &resourcesCenter.SomeInfo{
 				ChargeType: 1,
@@ -189,10 +189,10 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 		UserId:      data.UserId,
 		Filter:      data.Filter,
 	}
-	_, err = jyOrm.Table("entniche_export_log").Insert(&exportLog)
-	if err != nil {
+	updateNum, err = jyOrm.Table("entniche_export_log").Insert(&exportLog)
+	if err != nil || updateNum <= 0 {
 		_ = jyOrm.Rollback()
-		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "操作失败"}
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "导出日志保存失败"}
 	}
 	//保存账号使用明细
 	detailed := entity.Detailed{
@@ -208,10 +208,10 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 		AccountType:  1,
 		EntId:        data.EntId,
 	}
-	_, err = souceOrm.Table(ConsumeRecord).Insert(&detailed)
-	if err != nil {
+	updateNum, err = souceOrm.Table(ConsumeRecord).Insert(&detailed)
+	if err != nil || updateNum <= 0 {
 		_ = jyOrm.Rollback()
-		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "操作失败"}
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "账号使用明细保存失败"}
 	}
 	err = jyOrm.Commit()
 	if err != nil {
@@ -234,5 +234,104 @@ func entCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeRes
 }
 
 func personCharge(data *resourcesCenter.ChargeReq) (resp *resourcesCenter.ChargeResp) {
-	return nil
+	now := time.Now().Format("2006-01-02")
+	jyOrm := entity.Engine.NewSession()
+	centerOrm := entity.Engine.NewSession()
+	var personNums int64
+	err := centerOrm.Table("account_resources").Cols("SUM(number) AS totalNum").
+		Where("accountId = ? and endTime >= ? and resourceType = ?", data.EntId, now, "高级字段包").Find(&personNums)
+	if err != nil {
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "查询失败"}
+	}
+	if personNums == 0 || personNums < data.DeductNum {
+		return &resourcesCenter.ChargeResp{Code: entity.SuccessCode, Message: "个人数据流量包（高级字段包）余额不足"}
+	}
+	var updateNum int64
+	err = centerOrm.Begin()
+	if err != nil {
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "操作失败"}
+	}
+	//修改个人账户资源
+	balanceList := []entity.Balance{}
+	err = centerOrm.Table(AccountResources).
+		Select("*").
+		Where("accountId= ? and number > 0 and resourceType= ? and endTime >= ?", data.AccountId, "高级字段包", now).
+		OrderBy("endTime").
+		Find(&balanceList)
+	if err != nil {
+		_ = centerOrm.Rollback()
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "个人账号资源查询失败"}
+	}
+	for _, value := range balanceList {
+		if value.Number > data.DeductNum {
+			value.Number = value.Number - data.DeductNum
+			data.DeductNum = 0
+		} else {
+			data.DeductNum = data.DeductNum - value.Number
+			value.Number = 0
+		}
+		updateNum, err = centerOrm.Table(AccountResources).
+			Cols("number").ID(value.Id).
+			Update(&value)
+		if err != nil || updateNum <= 0 {
+			_ = centerOrm.Rollback()
+			return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "修改账户失败"}
+		}
+		if data.DeductNum == 0 {
+			break
+		}
+	}
+	//保存账号使用明细
+	detailed := entity.Detailed{
+		AccountId:    data.AccountId,
+		CompanyId:    data.EntId,
+		ResourceType: "高级字段包",
+		Number:       data.DeductNum,
+		Name:         "数据流包",
+		CreateTime:   time.Now().Local(),
+		Remarks:      "",
+		UserType:     0,
+		UserId:       data.PositionId,
+		AccountType:  1,
+		EntId:        data.EntId,
+	}
+	updateNum, err = centerOrm.Table(ConsumeRecord).Insert(&detailed)
+	if err != nil || updateNum <= 0 {
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "账号使用明细保存失败"}
+	}
+	err = centerOrm.Commit()
+	if err != nil {
+		_ = jyOrm.Rollback()
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "事务提交失败"}
+	}
+	//保存导出日志
+	var username, phone string
+	_ = jyOrm.Table("entniche_user").Cols("name, phone").
+		Where("id = ?", data.UserId).Find(&username, &phone)
+	exportLog := &entity.ExportLog{
+		UserName:    username,
+		ExportTime:  now,
+		DataSource:  "3",
+		ExportNum:   data.ExportNum,
+		DeductNum:   data.ExportNum, //去重
+		DownloadUrl: data.DownloadUrl,
+		EntId:       data.EntId,
+		Phone:       phone,
+		UserId:      data.UserId,
+		Filter:      data.Filter,
+	}
+	updateNum, err = jyOrm.Table("entniche_export_log").Insert(&exportLog)
+	if err != nil || updateNum <= 0 {
+		_ = jyOrm.Rollback()
+		return &resourcesCenter.ChargeResp{Code: entity.ErrorCode, Message: "导出日志保存失败"}
+	}
+	return &resourcesCenter.ChargeResp{
+		Code:    entity.SuccessCode,
+		Message: "",
+		Data: &resourcesCenter.SomeInfo{
+			ChargeType:   1,
+			ChargeResult: 1,
+			Num1:         personNums,
+		},
+	}
 }