From cde22cad93c14e42c334c6de7ef28175a4d80160 Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Wed, 6 Dec 2023 14:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 730d24000a3764d3982e0e369c94f625dd114251 --- api/desc/core/pcm-core.api | 66 +++-- api/internal/types/types.go | 26 ++ pkg/models/thashcat.go | 13 + .../participantservice/participantservice.go | 10 + rpc/client/pcmcore/pcmcore.go | 2 + .../participantserviceserver.go | 6 + rpc/pb/pcmCore.proto | 12 + rpc/pcmCore/pcmCore.pb.go | 262 +++++++++++++----- rpc/pcmCore/pcmCore_grpc.pb.go | 39 +++ 9 files changed, 351 insertions(+), 85 deletions(-) diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index 73bcc53b..e9c24114 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -534,6 +534,19 @@ type SaveHashcatReq { CrackResult string `json:"crackResult"` // 结果 Started string `json:"started"` // 开始时间 Stopped string `json:"stopped"` // 结束时间 + KernelFeature string `json:"kernelFeature"` + HashMode string `json:"hashMode"` + Rejected string `json:"rejected"` + Session string `json:"session"` + HashTarget string `json:"hashTarget"` + Speed string `json:"speed"` + Candidates string `json:"candidates"` + RestorePoint string `json:"restorePoint"` + Recovered string `json:"recovered"` + GuessQueue string `json:"guessQueue"` + CandidateEngine string `json:"candidateEngine"` + GuessMask string `json:"guessMask"` + RestoreSub string `json:"restoreSub"` } type getHashcatHandlerReq { @@ -554,6 +567,19 @@ type HashCat { CrackResult string `json:"crackResult"` // 结果 Started string `json:"started"` // 开始时间 Stopped string `json:"stopped"` // 结束时间 + KernelFeature string `json:"kernelFeature"` + HashMode string `json:"hashMode"` + Rejected string `json:"rejected"` + Session string `json:"session"` + HashTarget string `json:"hashTarget"` + Speed string `json:"speed"` + Candidates string `json:"candidates"` + RestorePoint string `json:"restorePoint"` + Recovered string `json:"recovered"` + GuessQueue string `json:"guessQueue"` + CandidateEngine string `json:"candidateEngine"` + GuessMask string `json:"guessMask"` + RestoreSub string `json:"restoreSub"` } type participantListResp { @@ -576,24 +602,24 @@ type ( } AppListResp { TotalCount int64 `json:"totalCount"` // 任务总数 - Apps []App `json:"apps"` //应用列表 + Apps []App `json:"apps"` //应用列表 } Replica { - ClusterName string `json:"clusterName"` - Replica int32 `json:"replica"` + ClusterName string `json:"clusterName"` + Replica int32 `json:"replica"` } App { - Id int64 `json:"id"` - Name string `json:"name"` - Status string `json:"status"` - TaskType string `json:"taskType"` - StartTime string `json:"startTime"` - EndTime string `json:"endTime"` + Id int64 `json:"id"` + Name string `json:"name"` + Status string `json:"status"` + TaskType string `json:"taskType"` + StartTime string `json:"startTime"` + EndTime string `json:"endTime"` ParticipantStatus string `json:"participantStatus"` - ParticipantId int64 `json:"participantId"` - ParticipantName string `json:"participantName"` - Storage string `json:"storage"` - CreateTime string `json:"createTime"` + ParticipantId int64 `json:"participantId"` + ParticipantName string `json:"participantName"` + Storage string `json:"storage"` + CreateTime string `json:"createTime"` Replicas []Replica `json:"replicas"` } ) @@ -605,14 +631,14 @@ type ( NsID string `form:"nsID"` } AppDetailResp { - CpuCores float64 `json:"cpuCores"` - CpuRate float64 `json:"cpuRate"` - CpuLimit float64 `json:"cpuLimit"` - GpuCores float64 `json:"gpuCores"` - GpuRate float64 `json:"gpuRate"` - GpuLimit float64 `json:"gpuLimit"` + CpuCores float64 `json:"cpuCores"` + CpuRate float64 `json:"cpuRate"` + CpuLimit float64 `json:"cpuLimit"` + GpuCores float64 `json:"gpuCores"` + GpuRate float64 `json:"gpuRate"` + GpuLimit float64 `json:"gpuLimit"` MemoryTotal float64 `json:"memoryTotal"` - MemoryRate float64 `json:"memoryRate"` + MemoryRate float64 `json:"memoryRate"` MemoryLimit float64 `json:"memoryLimit"` } diff --git a/api/internal/types/types.go b/api/internal/types/types.go index dc4dc25f..38845aa1 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -498,6 +498,19 @@ type SaveHashcatReq struct { CrackResult string `json:"crackResult"` // 结果 Started string `json:"started"` // 开始时间 Stopped string `json:"stopped"` // 结束时间 + KernelFeature string `json:"kernelFeature"` + HashMode string `json:"hashMode"` + Rejected string `json:"rejected"` + Session string `json:"session"` + HashTarget string `json:"hashTarget"` + Speed string `json:"speed"` + Candidates string `json:"candidates"` + RestorePoint string `json:"restorePoint"` + Recovered string `json:"recovered"` + GuessQueue string `json:"guessQueue"` + CandidateEngine string `json:"candidateEngine"` + GuessMask string `json:"guessMask"` + RestoreSub string `json:"restoreSub"` } type GetHashcatHandlerReq struct { @@ -518,6 +531,19 @@ type HashCat struct { CrackResult string `json:"crackResult"` // 结果 Started string `json:"started"` // 开始时间 Stopped string `json:"stopped"` // 结束时间 + KernelFeature string `json:"kernelFeature"` + HashMode string `json:"hashMode"` + Rejected string `json:"rejected"` + Session string `json:"session"` + HashTarget string `json:"hashTarget"` + Speed string `json:"speed"` + Candidates string `json:"candidates"` + RestorePoint string `json:"restorePoint"` + Recovered string `json:"recovered"` + GuessQueue string `json:"guessQueue"` + CandidateEngine string `json:"candidateEngine"` + GuessMask string `json:"guessMask"` + RestoreSub string `json:"restoreSub"` } type ParticipantListResp struct { diff --git a/pkg/models/thashcat.go b/pkg/models/thashcat.go index 7fd58f90..ce3f4944 100644 --- a/pkg/models/thashcat.go +++ b/pkg/models/thashcat.go @@ -26,6 +26,19 @@ type ( CreatedBy int64 `db:"created_by"` // 创建人 UpdatedBy int64 `db:"updated_by"` // 更新人 DeletedFlag int64 `db:"deleted_flag"` // 是否删除（0-否，1-是） + KernelFeature string `db:"kernel_feature"` + HashMode string `db:"hash_mode"` + Rejected string `db:"rejected"` + Session string `db:"session"` + HashTarget string `db:"hash_target"` + Speed string `db:"speed"` + Candidates string `db:"candidates"` + RestorePoint string `db:"restore_point"` + Recovered string `db:"recovered"` + GuessQueue string `db:"guess_queue"` + CandidateEngine string `db:"candidate_engine"` + GuessMask string `db:"guess_mask"` + RestoreSub string `db:"restore_sub"` } ) diff --git a/rpc/client/participantservice/participantservice.go b/rpc/client/participantservice/participantservice.go index cb2e61df..f1c08dc5 100644 --- a/rpc/client/participantservice/participantservice.go +++ b/rpc/client/participantservice/participantservice.go @@ -14,6 +14,8 @@ import ( type ( AiInfo = pcmCore.AiInfo + ApplyListReq = pcmCore.ApplyListReq + ApplyListResp = pcmCore.ApplyListResp ClientInfo = pcmCore.ClientInfo CloudInfo = pcmCore.CloudInfo HealthCheckResp = pcmCore.HealthCheckResp @@ -57,6 +59,8 @@ type ( RegisterTenant(ctx context.Context, in *TenantInfo, opts ...grpc.CallOption) (*TenantResp, error) // listTenant 租户列表信息 ListTenant(ctx context.Context, in *TenantInfo, opts ...grpc.CallOption) (*ListTenantResp, error) + // applyList 执行任务列表 + ApplyList(ctx context.Context, in *ApplyListReq, opts ...grpc.CallOption) (*ApplyListResp, error) } defaultParticipantService struct { @@ -117,3 +121,9 @@ func (m *defaultParticipantService) ListTenant(ctx context.Context, in *TenantIn client := pcmCore.NewParticipantServiceClient(m.cli.Conn()) return client.ListTenant(ctx, in, opts...) } + +// applyList 执行任务列表 +func (m *defaultParticipantService) ApplyList(ctx context.Context, in *ApplyListReq, opts ...grpc.CallOption) (*ApplyListResp, error) { + client := pcmCore.NewParticipantServiceClient(m.cli.Conn()) + return client.ApplyList(ctx, in, opts...) +} diff --git a/rpc/client/pcmcore/pcmcore.go b/rpc/client/pcmcore/pcmcore.go index 5740a26b..3f38e354 100644 --- a/rpc/client/pcmcore/pcmcore.go +++ b/rpc/client/pcmcore/pcmcore.go @@ -14,6 +14,8 @@ import ( type ( AiInfo = pcmCore.AiInfo + ApplyListReq = pcmCore.ApplyListReq + ApplyListResp = pcmCore.ApplyListResp ClientInfo = pcmCore.ClientInfo CloudInfo = pcmCore.CloudInfo HealthCheckResp = pcmCore.HealthCheckResp diff --git a/rpc/internal/server/participantservice/participantserviceserver.go b/rpc/internal/server/participantservice/participantserviceserver.go index 146f010f..f7bf739f 100644 --- a/rpc/internal/server/participantservice/participantserviceserver.go +++ b/rpc/internal/server/participantservice/participantserviceserver.go @@ -69,3 +69,9 @@ func (s *ParticipantServiceServer) ListTenant(ctx context.Context, in *pcmCore.T l := participantservicelogic.NewListTenantLogic(ctx, s.svcCtx) return l.ListTenant(in) } + +// applyList 执行任务列表 +func (s *ParticipantServiceServer) ApplyList(ctx context.Context, in *pcmCore.ApplyListReq) (*pcmCore.ApplyListResp, error) { + l := participantservicelogic.NewApplyListLogic(ctx, s.svcCtx) + return l.ApplyList(in) +} diff --git a/rpc/pb/pcmCore.proto b/rpc/pb/pcmCore.proto index 55f3414b..d1728357 100644 --- a/rpc/pb/pcmCore.proto +++ b/rpc/pb/pcmCore.proto @@ -284,6 +284,15 @@ message ListTenantResp { repeated TenantInfo tenantInfos = 3; } +message ApplyListReq{ + +} + +message ApplyListResp{ + int64 participantId = 1; + string yamlString = 2; +} + // participant 参与者 service participantService { @@ -310,4 +319,7 @@ service participantService { // listTenant 租户列表信息 rpc listTenant(TenantInfo) returns (ListTenantResp) {}; + + // applyList 执行任务列表 + rpc applyList(ApplyListReq) returns (ApplyListResp) {}; } \ No newline at end of file diff --git a/rpc/pcmCore/pcmCore.pb.go b/rpc/pcmCore/pcmCore.pb.go index 70004cfb..e3179d27 100644 --- a/rpc/pcmCore/pcmCore.pb.go +++ b/rpc/pcmCore/pcmCore.pb.go @@ -2509,6 +2509,99 @@ func (x *ListTenantResp) GetTenantInfos() []*TenantInfo { return nil } +type ApplyListReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *ApplyListReq) Reset() { + *x = ApplyListReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pcmCore_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ApplyListReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApplyListReq) ProtoMessage() {} + +func (x *ApplyListReq) ProtoReflect() protoreflect.Message { + mi := &file_pcmCore_proto_msgTypes[26] + 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 ApplyListReq.ProtoReflect.Descriptor instead. +func (*ApplyListReq) Descriptor() ([]byte, []int) { + return file_pcmCore_proto_rawDescGZIP(), []int{26} +} + +type ApplyListResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ParticipantId int64 `protobuf:"varint,1,opt,name=participantId,proto3" json:"participantId,omitempty"` + YamlString string `protobuf:"bytes,2,opt,name=yamlString,proto3" json:"yamlString,omitempty"` +} + +func (x *ApplyListResp) Reset() { + *x = ApplyListResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pcmCore_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ApplyListResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ApplyListResp) ProtoMessage() {} + +func (x *ApplyListResp) ProtoReflect() protoreflect.Message { + mi := &file_pcmCore_proto_msgTypes[27] + 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 ApplyListResp.ProtoReflect.Descriptor instead. +func (*ApplyListResp) Descriptor() ([]byte, []int) { + return file_pcmCore_proto_rawDescGZIP(), []int{27} +} + +func (x *ApplyListResp) GetParticipantId() int64 { + if x != nil { + return x.ParticipantId + } + return 0 +} + +func (x *ApplyListResp) GetYamlString() string { + if x != nil { + return x.YamlString + } + return "" +} + var File_pcmCore_proto protoreflect.FileDescriptor var file_pcmCore_proto_rawDesc = []byte{ @@ -2883,59 +2976,70 @@ var file_pcmCore_proto_rawDesc = []byte{ 0x73, 0x67, 0x12, 0x35, 0x0a, 0x0b, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x74, 0x65, - 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x2a, 0x33, 0x0a, 0x0d, 0x4d, 0x65, 0x73, - 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x41, - 0x49, 0x4c, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, - 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x32, 0x7b, - 0x0a, 0x07, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x12, 0x37, 0x0a, 0x08, 0x53, 0x79, 0x6e, - 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, - 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x63, - 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x37, 0x0a, 0x08, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, - 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x49, - 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x32, 0xfc, 0x04, 0x0a, 0x12, - 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x50, 0x0a, 0x13, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, - 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x12, 0x1a, 0x2e, 0x70, 0x63, 0x6d, 0x43, - 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x50, - 0x68, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, - 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x50, 0x68, 0x79, 0x52, 0x65, - 0x73, 0x70, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x48, 0x65, - 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x20, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, - 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x48, 0x65, 0x61, - 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x63, 0x6d, 0x43, - 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, - 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0f, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x41, - 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1c, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, - 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x41, 0x76, - 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, - 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0f, 0x6c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, - 0x69, 0x70, 0x61, 0x6e, 0x74, 0x12, 0x1a, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, - 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x54, 0x65, 0x6e, 0x61, 0x6e, - 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, - 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x10, 0x6c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x79, 0x41, - 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1a, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, - 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x54, 0x65, - 0x6e, 0x61, 0x6e, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x41, 0x76, - 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x12, 0x6c, 0x69, 0x73, - 0x74, 0x50, 0x68, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, + 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x73, 0x22, 0x0e, 0x0a, 0x0c, 0x41, 0x70, 0x70, + 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x55, 0x0a, 0x0d, 0x41, 0x70, 0x70, + 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x61, + 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x49, 0x64, + 0x12, 0x1e, 0x0a, 0x0a, 0x79, 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x79, 0x61, 0x6d, 0x6c, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, + 0x2a, 0x33, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x41, 0x49, 0x4c, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x53, + 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, + 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x32, 0x7b, 0x0a, 0x07, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, + 0x12, 0x37, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x2e, 0x70, + 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x79, 0x6e, + 0x63, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x37, 0x0a, 0x08, 0x49, 0x6e, 0x66, + 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, + 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x15, 0x2e, 0x70, 0x63, + 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x49, 0x6e, 0x66, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x32, 0xba, 0x05, 0x0a, 0x12, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, + 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x50, 0x0a, 0x13, 0x72, 0x65, 0x67, + 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, + 0x12, 0x1a, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, + 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x50, 0x68, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x70, + 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, + 0x6e, 0x74, 0x50, 0x68, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0f, 0x72, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x20, + 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, + 0x70, 0x61, 0x6e, 0x74, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x52, 0x65, 0x71, + 0x1a, 0x18, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, + 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0f, + 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x12, + 0x1c, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, + 0x69, 0x70, 0x61, 0x6e, 0x74, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, + 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, + 0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0f, 0x6c, 0x69, 0x73, + 0x74, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x12, 0x1a, 0x2e, 0x70, + 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, + 0x6e, 0x74, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, + 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x10, 0x6c, + 0x69, 0x73, 0x74, 0x50, 0x68, 0x79, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1a, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, - 0x69, 0x70, 0x61, 0x6e, 0x74, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x63, + 0x69, 0x70, 0x61, 0x6e, 0x74, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x1a, 0x21, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, - 0x69, 0x70, 0x61, 0x6e, 0x74, 0x50, 0x68, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x3c, - 0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, - 0x12, 0x13, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, - 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x1a, 0x13, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, - 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x3c, 0x0a, 0x0a, - 0x6c, 0x69, 0x73, 0x74, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x12, 0x13, 0x2e, 0x70, 0x63, 0x6d, - 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x1a, - 0x17, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x65, - 0x6e, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x42, 0x0a, 0x5a, 0x08, 0x2f, 0x70, - 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x70, 0x61, 0x6e, 0x74, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, + 0x12, 0x53, 0x0a, 0x12, 0x6c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, + 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x54, 0x65, 0x6e, 0x61, + 0x6e, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x50, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x50, 0x68, 0x79, 0x52, + 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x3c, 0x0a, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, + 0x72, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x12, 0x13, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, + 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x1a, 0x13, 0x2e, 0x70, + 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x22, 0x00, 0x12, 0x3c, 0x0a, 0x0a, 0x6c, 0x69, 0x73, 0x74, 0x54, 0x65, 0x6e, 0x61, 0x6e, + 0x74, 0x12, 0x13, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x65, 0x6e, 0x61, + 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x1a, 0x17, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, + 0x00, 0x12, 0x3c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x15, + 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x2e, + 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x42, + 0x0a, 0x5a, 0x08, 0x2f, 0x70, 0x63, 0x6d, 0x43, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -2951,7 +3055,7 @@ func file_pcmCore_proto_rawDescGZIP() []byte { } var file_pcmCore_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_pcmCore_proto_msgTypes = make([]protoimpl.MessageInfo, 26) +var file_pcmCore_proto_msgTypes = make([]protoimpl.MessageInfo, 28) var file_pcmCore_proto_goTypes = []interface{}{ (MessageStatus)(0), // 0: pcmCore.MessageStatus (*SyncInfoReq)(nil), // 1: pcmCore.SyncInfoReq @@ -2980,6 +3084,8 @@ var file_pcmCore_proto_goTypes = []interface{}{ (*TenantInfo)(nil), // 24: pcmCore.TenantInfo (*TenantResp)(nil), // 25: pcmCore.TenantResp (*ListTenantResp)(nil), // 26: pcmCore.ListTenantResp + (*ApplyListReq)(nil), // 27: pcmCore.ApplyListReq + (*ApplyListResp)(nil), // 28: pcmCore.ApplyListResp } var file_pcmCore_proto_depIdxs = []int32{ 5, // 0: pcmCore.SyncInfoReq.HpcInfoList:type_name -> pcmCore.HpcInfo @@ -3008,18 +3114,20 @@ var file_pcmCore_proto_depIdxs = []int32{ 9, // 23: pcmCore.participantService.listPhyInformation:input_type -> pcmCore.ParticipantTenant 24, // 24: pcmCore.participantService.registerTenant:input_type -> pcmCore.TenantInfo 24, // 25: pcmCore.participantService.listTenant:input_type -> pcmCore.TenantInfo - 6, // 26: pcmCore.pcmCore.SyncInfo:output_type -> pcmCore.SyncInfoResp - 8, // 27: pcmCore.pcmCore.InfoList:output_type -> pcmCore.InfoListResp - 12, // 28: pcmCore.participantService.registerParticipant:output_type -> pcmCore.ParticipantPhyResp - 11, // 29: pcmCore.participantService.reportHeartbeat:output_type -> pcmCore.HealthCheckResp - 21, // 30: pcmCore.participantService.reportAvailable:output_type -> pcmCore.ParticipantResp - 22, // 31: pcmCore.participantService.listParticipant:output_type -> pcmCore.ParticipantServiceResp - 20, // 32: pcmCore.participantService.listPhyAvailable:output_type -> pcmCore.ListParticipantAvailResp - 13, // 33: pcmCore.participantService.listPhyInformation:output_type -> pcmCore.ListParticipantPhyResp - 25, // 34: pcmCore.participantService.registerTenant:output_type -> pcmCore.TenantResp - 26, // 35: pcmCore.participantService.listTenant:output_type -> pcmCore.ListTenantResp - 26, // [26:36] is the sub-list for method output_type - 16, // [16:26] is the sub-list for method input_type + 27, // 26: pcmCore.participantService.applyList:input_type -> pcmCore.ApplyListReq + 6, // 27: pcmCore.pcmCore.SyncInfo:output_type -> pcmCore.SyncInfoResp + 8, // 28: pcmCore.pcmCore.InfoList:output_type -> pcmCore.InfoListResp + 12, // 29: pcmCore.participantService.registerParticipant:output_type -> pcmCore.ParticipantPhyResp + 11, // 30: pcmCore.participantService.reportHeartbeat:output_type -> pcmCore.HealthCheckResp + 21, // 31: pcmCore.participantService.reportAvailable:output_type -> pcmCore.ParticipantResp + 22, // 32: pcmCore.participantService.listParticipant:output_type -> pcmCore.ParticipantServiceResp + 20, // 33: pcmCore.participantService.listPhyAvailable:output_type -> pcmCore.ListParticipantAvailResp + 13, // 34: pcmCore.participantService.listPhyInformation:output_type -> pcmCore.ListParticipantPhyResp + 25, // 35: pcmCore.participantService.registerTenant:output_type -> pcmCore.TenantResp + 26, // 36: pcmCore.participantService.listTenant:output_type -> pcmCore.ListTenantResp + 28, // 37: pcmCore.participantService.applyList:output_type -> pcmCore.ApplyListResp + 27, // [27:38] is the sub-list for method output_type + 16, // [16:27] is the sub-list for method input_type 16, // [16:16] is the sub-list for extension type_name 16, // [16:16] is the sub-list for extension extendee 0, // [0:16] is the sub-list for field type_name @@ -3343,6 +3451,30 @@ func file_pcmCore_proto_init() { return nil } } + file_pcmCore_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ApplyListReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pcmCore_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ApplyListResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -3350,7 +3482,7 @@ func file_pcmCore_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pcmCore_proto_rawDesc, NumEnums: 1, - NumMessages: 26, + NumMessages: 28, NumExtensions: 0, NumServices: 2, }, diff --git a/rpc/pcmCore/pcmCore_grpc.pb.go b/rpc/pcmCore/pcmCore_grpc.pb.go index 5547283e..62bfc08f 100644 --- a/rpc/pcmCore/pcmCore_grpc.pb.go +++ b/rpc/pcmCore/pcmCore_grpc.pb.go @@ -158,6 +158,7 @@ const ( ParticipantService_ListPhyInformation_FullMethodName = "/pcmCore.participantService/listPhyInformation" ParticipantService_RegisterTenant_FullMethodName = "/pcmCore.participantService/registerTenant" ParticipantService_ListTenant_FullMethodName = "/pcmCore.participantService/listTenant" + ParticipantService_ApplyList_FullMethodName = "/pcmCore.participantService/applyList" ) // ParticipantServiceClient is the client API for ParticipantService service. @@ -180,6 +181,8 @@ type ParticipantServiceClient interface { RegisterTenant(ctx context.Context, in *TenantInfo, opts ...grpc.CallOption) (*TenantResp, error) // listTenant 租户列表信息 ListTenant(ctx context.Context, in *TenantInfo, opts ...grpc.CallOption) (*ListTenantResp, error) + // applyList 执行任务列表 + ApplyList(ctx context.Context, in *ApplyListReq, opts ...grpc.CallOption) (*ApplyListResp, error) } type participantServiceClient struct { @@ -262,6 +265,15 @@ func (c *participantServiceClient) ListTenant(ctx context.Context, in *TenantInf return out, nil } +func (c *participantServiceClient) ApplyList(ctx context.Context, in *ApplyListReq, opts ...grpc.CallOption) (*ApplyListResp, error) { + out := new(ApplyListResp) + err := c.cc.Invoke(ctx, ParticipantService_ApplyList_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // ParticipantServiceServer is the server API for ParticipantService service. // All implementations must embed UnimplementedParticipantServiceServer // for forward compatibility @@ -282,6 +294,8 @@ type ParticipantServiceServer interface { RegisterTenant(context.Context, *TenantInfo) (*TenantResp, error) // listTenant 租户列表信息 ListTenant(context.Context, *TenantInfo) (*ListTenantResp, error) + // applyList 执行任务列表 + ApplyList(context.Context, *ApplyListReq) (*ApplyListResp, error) mustEmbedUnimplementedParticipantServiceServer() } @@ -313,6 +327,9 @@ func (UnimplementedParticipantServiceServer) RegisterTenant(context.Context, *Te func (UnimplementedParticipantServiceServer) ListTenant(context.Context, *TenantInfo) (*ListTenantResp, error) { return nil, status.Errorf(codes.Unimplemented, "method ListTenant not implemented") } +func (UnimplementedParticipantServiceServer) ApplyList(context.Context, *ApplyListReq) (*ApplyListResp, error) { + return nil, status.Errorf(codes.Unimplemented, "method ApplyList not implemented") +} func (UnimplementedParticipantServiceServer) mustEmbedUnimplementedParticipantServiceServer() {} // UnsafeParticipantServiceServer may be embedded to opt out of forward compatibility for this service. @@ -470,6 +487,24 @@ func _ParticipantService_ListTenant_Handler(srv interface{}, ctx context.Context return interceptor(ctx, in, info, handler) } +func _ParticipantService_ApplyList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ApplyListReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ParticipantServiceServer).ApplyList(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ParticipantService_ApplyList_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ParticipantServiceServer).ApplyList(ctx, req.(*ApplyListReq)) + } + return interceptor(ctx, in, info, handler) +} + // ParticipantService_ServiceDesc is the grpc.ServiceDesc for ParticipantService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -509,6 +544,10 @@ var ParticipantService_ServiceDesc = grpc.ServiceDesc{ MethodName: "listTenant", Handler: _ParticipantService_ListTenant_Handler, }, + { + MethodName: "applyList", + Handler: _ParticipantService_ApplyList_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "pcmCore.proto",