diff --git a/cmd.pb.go b/cmd.pb.go index 0197efd..b57867a 100644 --- a/cmd.pb.go +++ b/cmd.pb.go @@ -489,6 +489,9 @@ type SaasReq struct { // *SaasReq_ScriptUse // *SaasReq_ExpList // *SaasReq_ExpGet + // *SaasReq_ExpGrantList + // *SaasReq_ExpGrantAdd + // *SaasReq_ExpGrantDelete Cmd isSaasReq_Cmd `protobuf_oneof:"cmd"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -756,6 +759,33 @@ func (x *SaasReq) GetExpGet() *ExpGet { return nil } +func (x *SaasReq) GetExpGrantList() *ExpGrantList { + if x != nil { + if x, ok := x.Cmd.(*SaasReq_ExpGrantList); ok { + return x.ExpGrantList + } + } + return nil +} + +func (x *SaasReq) GetExpGrantAdd() *ExpGrant { + if x != nil { + if x, ok := x.Cmd.(*SaasReq_ExpGrantAdd); ok { + return x.ExpGrantAdd + } + } + return nil +} + +func (x *SaasReq) GetExpGrantDelete() *ExpGrant { + if x != nil { + if x, ok := x.Cmd.(*SaasReq_ExpGrantDelete); ok { + return x.ExpGrantDelete + } + } + return nil +} + type isSaasReq_Cmd interface { isSaasReq_Cmd() } @@ -860,6 +890,18 @@ type SaasReq_ExpGet struct { ExpGet *ExpGet `protobuf:"bytes,101,opt,name=exp_get,json=expGet,proto3,oneof"` // 获取实验报表 } +type SaasReq_ExpGrantList struct { + ExpGrantList *ExpGrantList `protobuf:"bytes,102,opt,name=exp_grant_list,json=expGrantList,proto3,oneof"` // 列出访问实验报表授权 +} + +type SaasReq_ExpGrantAdd struct { + ExpGrantAdd *ExpGrant `protobuf:"bytes,103,opt,name=exp_grant_add,json=expGrantAdd,proto3,oneof"` // 授权他人访问实验报表 +} + +type SaasReq_ExpGrantDelete struct { + ExpGrantDelete *ExpGrant `protobuf:"bytes,104,opt,name=exp_grant_delete,json=expGrantDelete,proto3,oneof"` // 取消他人访问实验报表 +} + func (*SaasReq_Info) isSaasReq_Cmd() {} func (*SaasReq_Read) isSaasReq_Cmd() {} @@ -910,6 +952,12 @@ func (*SaasReq_ExpList) isSaasReq_Cmd() {} func (*SaasReq_ExpGet) isSaasReq_Cmd() {} +func (*SaasReq_ExpGrantList) isSaasReq_Cmd() {} + +func (*SaasReq_ExpGrantAdd) isSaasReq_Cmd() {} + +func (*SaasReq_ExpGrantDelete) isSaasReq_Cmd() {} + // Info 获取账号信息 type Info struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -2726,6 +2774,86 @@ func (x *ExpGet) GetTotalFlag() uint32 { return 0 } +type ExpGrantList struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ExpGrantList) Reset() { + *x = ExpGrantList{} + mi := &file_cmd_proto_msgTypes[33] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ExpGrantList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ExpGrantList) ProtoMessage() {} + +func (x *ExpGrantList) ProtoReflect() protoreflect.Message { + mi := &file_cmd_proto_msgTypes[33] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ExpGrantList.ProtoReflect.Descriptor instead. +func (*ExpGrantList) Descriptor() ([]byte, []int) { + return file_cmd_proto_rawDescGZIP(), []int{33} +} + +type ExpGrant struct { + state protoimpl.MessageState `protogen:"open.v1"` + TargetAccountId uint32 `protobuf:"varint,1,opt,name=target_account_id,json=targetAccountId,proto3" json:"target_account_id,omitempty"` // sRTA授权目标账号ID + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ExpGrant) Reset() { + *x = ExpGrant{} + mi := &file_cmd_proto_msgTypes[34] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ExpGrant) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ExpGrant) ProtoMessage() {} + +func (x *ExpGrant) ProtoReflect() protoreflect.Message { + mi := &file_cmd_proto_msgTypes[34] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ExpGrant.ProtoReflect.Descriptor instead. +func (*ExpGrant) Descriptor() ([]byte, []int) { + return file_cmd_proto_rawDescGZIP(), []int{34} +} + +func (x *ExpGrant) GetTargetAccountId() uint32 { + if x != nil { + return x.TargetAccountId + } + return 0 +} + // SaasRes 命令返回 type SaasRes struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -2757,6 +2885,9 @@ type SaasRes struct { // *SaasRes_ScriptUseRes // *SaasRes_ExpListRes // *SaasRes_ExpGetRes + // *SaasRes_ExpGrantListRes + // *SaasRes_ExpGrantAddRes + // *SaasRes_ExpGrantDeleteRes Res isSaasRes_Res `protobuf_oneof:"res"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -2764,7 +2895,7 @@ type SaasRes struct { func (x *SaasRes) Reset() { *x = SaasRes{} - mi := &file_cmd_proto_msgTypes[33] + mi := &file_cmd_proto_msgTypes[35] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2776,7 +2907,7 @@ func (x *SaasRes) String() string { func (*SaasRes) ProtoMessage() {} func (x *SaasRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[33] + mi := &file_cmd_proto_msgTypes[35] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2789,7 +2920,7 @@ func (x *SaasRes) ProtoReflect() protoreflect.Message { // Deprecated: Use SaasRes.ProtoReflect.Descriptor instead. func (*SaasRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{33} + return file_cmd_proto_rawDescGZIP(), []int{35} } func (x *SaasRes) GetCode() ErrorCode { @@ -3029,6 +3160,33 @@ func (x *SaasRes) GetExpGetRes() *ExpGetRes { return nil } +func (x *SaasRes) GetExpGrantListRes() *ExpGrantListRes { + if x != nil { + if x, ok := x.Res.(*SaasRes_ExpGrantListRes); ok { + return x.ExpGrantListRes + } + } + return nil +} + +func (x *SaasRes) GetExpGrantAddRes() *ExpGrant { + if x != nil { + if x, ok := x.Res.(*SaasRes_ExpGrantAddRes); ok { + return x.ExpGrantAddRes + } + } + return nil +} + +func (x *SaasRes) GetExpGrantDeleteRes() *ExpGrant { + if x != nil { + if x, ok := x.Res.(*SaasRes_ExpGrantDeleteRes); ok { + return x.ExpGrantDeleteRes + } + } + return nil +} + type isSaasRes_Res interface { isSaasRes_Res() } @@ -3129,6 +3287,18 @@ type SaasRes_ExpGetRes struct { ExpGetRes *ExpGetRes `protobuf:"bytes,101,opt,name=exp_get_res,json=expGetRes,proto3,oneof"` // 实验报表返回 } +type SaasRes_ExpGrantListRes struct { + ExpGrantListRes *ExpGrantListRes `protobuf:"bytes,102,opt,name=exp_grant_list_res,json=expGrantListRes,proto3,oneof"` // 实验授权列表返回 +} + +type SaasRes_ExpGrantAddRes struct { + ExpGrantAddRes *ExpGrant `protobuf:"bytes,103,opt,name=exp_grant_add_res,json=expGrantAddRes,proto3,oneof"` // 增加实验授权返回 +} + +type SaasRes_ExpGrantDeleteRes struct { + ExpGrantDeleteRes *ExpGrant `protobuf:"bytes,104,opt,name=exp_grant_delete_res,json=expGrantDeleteRes,proto3,oneof"` // 实验解除授权返回 +} + func (*SaasRes_InfoRes) isSaasRes_Res() {} func (*SaasRes_ReadRes) isSaasRes_Res() {} @@ -3177,17 +3347,24 @@ func (*SaasRes_ExpListRes) isSaasRes_Res() {} func (*SaasRes_ExpGetRes) isSaasRes_Res() {} +func (*SaasRes_ExpGrantListRes) isSaasRes_Res() {} + +func (*SaasRes_ExpGrantAddRes) isSaasRes_Res() {} + +func (*SaasRes_ExpGrantDeleteRes) isSaasRes_Res() {} + type DataSpace struct { state protoimpl.MessageState `protogen:"open.v1"` Did []string `protobuf:"bytes,1,rep,name=did,proto3" json:"did,omitempty"` // 设备ID区 Wuid []string `protobuf:"bytes,2,rep,name=wuid,proto3" json:"wuid,omitempty"` // OpenID区 + Geo []string `protobuf:"bytes,7,rep,name=geo,proto3" json:"geo,omitempty"` // GEO区 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } func (x *DataSpace) Reset() { *x = DataSpace{} - mi := &file_cmd_proto_msgTypes[34] + mi := &file_cmd_proto_msgTypes[36] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3199,7 +3376,7 @@ func (x *DataSpace) String() string { func (*DataSpace) ProtoMessage() {} func (x *DataSpace) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[34] + mi := &file_cmd_proto_msgTypes[36] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3212,7 +3389,7 @@ func (x *DataSpace) ProtoReflect() protoreflect.Message { // Deprecated: Use DataSpace.ProtoReflect.Descriptor instead. func (*DataSpace) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{34} + return file_cmd_proto_rawDescGZIP(), []int{36} } func (x *DataSpace) GetDid() []string { @@ -3229,6 +3406,13 @@ func (x *DataSpace) GetWuid() []string { return nil } +func (x *DataSpace) GetGeo() []string { + if x != nil { + return x.Geo + } + return nil +} + // InfoRes 账号信息返回 type InfoRes struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -3240,7 +3424,7 @@ type InfoRes struct { func (x *InfoRes) Reset() { *x = InfoRes{} - mi := &file_cmd_proto_msgTypes[35] + mi := &file_cmd_proto_msgTypes[37] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3252,7 +3436,7 @@ func (x *InfoRes) String() string { func (*InfoRes) ProtoMessage() {} func (x *InfoRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[35] + mi := &file_cmd_proto_msgTypes[37] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3265,7 +3449,7 @@ func (x *InfoRes) ProtoReflect() protoreflect.Message { // Deprecated: Use InfoRes.ProtoReflect.Descriptor instead. func (*InfoRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{35} + return file_cmd_proto_rawDescGZIP(), []int{37} } func (x *InfoRes) GetDataspace() *DataSpace { @@ -3294,7 +3478,7 @@ type ReadRes struct { func (x *ReadRes) Reset() { *x = ReadRes{} - mi := &file_cmd_proto_msgTypes[36] + mi := &file_cmd_proto_msgTypes[38] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3306,7 +3490,7 @@ func (x *ReadRes) String() string { func (*ReadRes) ProtoMessage() {} func (x *ReadRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[36] + mi := &file_cmd_proto_msgTypes[38] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3319,7 +3503,7 @@ func (x *ReadRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ReadRes.ProtoReflect.Descriptor instead. func (*ReadRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{36} + return file_cmd_proto_rawDescGZIP(), []int{38} } func (x *ReadRes) GetSuccCmdCount() uint32 { @@ -3355,7 +3539,7 @@ type WriteRes struct { func (x *WriteRes) Reset() { *x = WriteRes{} - mi := &file_cmd_proto_msgTypes[37] + mi := &file_cmd_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3367,7 +3551,7 @@ func (x *WriteRes) String() string { func (*WriteRes) ProtoMessage() {} func (x *WriteRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[37] + mi := &file_cmd_proto_msgTypes[39] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3380,7 +3564,7 @@ func (x *WriteRes) ProtoReflect() protoreflect.Message { // Deprecated: Use WriteRes.ProtoReflect.Descriptor instead. func (*WriteRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{37} + return file_cmd_proto_rawDescGZIP(), []int{39} } func (x *WriteRes) GetFailedUserid() []string { @@ -3406,7 +3590,7 @@ type ValueItem struct { func (x *ValueItem) Reset() { *x = ValueItem{} - mi := &file_cmd_proto_msgTypes[38] + mi := &file_cmd_proto_msgTypes[40] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3418,7 +3602,7 @@ func (x *ValueItem) String() string { func (*ValueItem) ProtoMessage() {} func (x *ValueItem) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[38] + mi := &file_cmd_proto_msgTypes[40] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3431,7 +3615,7 @@ func (x *ValueItem) ProtoReflect() protoreflect.Message { // Deprecated: Use ValueItem.ProtoReflect.Descriptor instead. func (*ValueItem) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{38} + return file_cmd_proto_rawDescGZIP(), []int{40} } func (x *ValueItem) GetCmdIndex() uint32 { @@ -3493,7 +3677,7 @@ type TaskListRes struct { func (x *TaskListRes) Reset() { *x = TaskListRes{} - mi := &file_cmd_proto_msgTypes[39] + mi := &file_cmd_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3505,7 +3689,7 @@ func (x *TaskListRes) String() string { func (*TaskListRes) ProtoMessage() {} func (x *TaskListRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[39] + mi := &file_cmd_proto_msgTypes[41] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3518,7 +3702,7 @@ func (x *TaskListRes) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskListRes.ProtoReflect.Descriptor instead. func (*TaskListRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{39} + return file_cmd_proto_rawDescGZIP(), []int{41} } func (x *TaskListRes) GetTasks() []*Task { @@ -3538,7 +3722,7 @@ type TargetListRes struct { func (x *TargetListRes) Reset() { *x = TargetListRes{} - mi := &file_cmd_proto_msgTypes[40] + mi := &file_cmd_proto_msgTypes[42] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3550,7 +3734,7 @@ func (x *TargetListRes) String() string { func (*TargetListRes) ProtoMessage() {} func (x *TargetListRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[40] + mi := &file_cmd_proto_msgTypes[42] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3563,7 +3747,7 @@ func (x *TargetListRes) ProtoReflect() protoreflect.Message { // Deprecated: Use TargetListRes.ProtoReflect.Descriptor instead. func (*TargetListRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{40} + return file_cmd_proto_rawDescGZIP(), []int{42} } func (x *TargetListRes) GetTargetList() map[string]*Binds { @@ -3584,7 +3768,7 @@ type TargetCreateRes struct { func (x *TargetCreateRes) Reset() { *x = TargetCreateRes{} - mi := &file_cmd_proto_msgTypes[41] + mi := &file_cmd_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3596,7 +3780,7 @@ func (x *TargetCreateRes) String() string { func (*TargetCreateRes) ProtoMessage() {} func (x *TargetCreateRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[41] + mi := &file_cmd_proto_msgTypes[43] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3609,7 +3793,7 @@ func (x *TargetCreateRes) ProtoReflect() protoreflect.Message { // Deprecated: Use TargetCreateRes.ProtoReflect.Descriptor instead. func (*TargetCreateRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{41} + return file_cmd_proto_rawDescGZIP(), []int{43} } func (x *TargetCreateRes) GetTargetId() string { @@ -3637,7 +3821,7 @@ type TargetDeleteRes struct { func (x *TargetDeleteRes) Reset() { *x = TargetDeleteRes{} - mi := &file_cmd_proto_msgTypes[42] + mi := &file_cmd_proto_msgTypes[44] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3649,7 +3833,7 @@ func (x *TargetDeleteRes) String() string { func (*TargetDeleteRes) ProtoMessage() {} func (x *TargetDeleteRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[42] + mi := &file_cmd_proto_msgTypes[44] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3662,7 +3846,7 @@ func (x *TargetDeleteRes) ProtoReflect() protoreflect.Message { // Deprecated: Use TargetDeleteRes.ProtoReflect.Descriptor instead. func (*TargetDeleteRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{42} + return file_cmd_proto_rawDescGZIP(), []int{44} } func (x *TargetDeleteRes) GetTargetId() string { @@ -3688,7 +3872,7 @@ type Binds struct { func (x *Binds) Reset() { *x = Binds{} - mi := &file_cmd_proto_msgTypes[43] + mi := &file_cmd_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3700,7 +3884,7 @@ func (x *Binds) String() string { func (*Binds) ProtoMessage() {} func (x *Binds) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[43] + mi := &file_cmd_proto_msgTypes[45] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3713,7 +3897,7 @@ func (x *Binds) ProtoReflect() protoreflect.Message { // Deprecated: Use Binds.ProtoReflect.Descriptor instead. func (*Binds) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{43} + return file_cmd_proto_rawDescGZIP(), []int{45} } func (x *Binds) GetBinds() []*Bind { @@ -3737,7 +3921,7 @@ type Bind struct { func (x *Bind) Reset() { *x = Bind{} - mi := &file_cmd_proto_msgTypes[44] + mi := &file_cmd_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3749,7 +3933,7 @@ func (x *Bind) String() string { func (*Bind) ProtoMessage() {} func (x *Bind) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[44] + mi := &file_cmd_proto_msgTypes[46] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3762,7 +3946,7 @@ func (x *Bind) ProtoReflect() protoreflect.Message { // Deprecated: Use Bind.ProtoReflect.Descriptor instead. func (*Bind) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{44} + return file_cmd_proto_rawDescGZIP(), []int{46} } func (x *Bind) GetBindId() int64 { @@ -3812,7 +3996,7 @@ type BindSetRes struct { func (x *BindSetRes) Reset() { *x = BindSetRes{} - mi := &file_cmd_proto_msgTypes[45] + mi := &file_cmd_proto_msgTypes[47] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3824,7 +4008,7 @@ func (x *BindSetRes) String() string { func (*BindSetRes) ProtoMessage() {} func (x *BindSetRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[45] + mi := &file_cmd_proto_msgTypes[47] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3837,7 +4021,7 @@ func (x *BindSetRes) ProtoReflect() protoreflect.Message { // Deprecated: Use BindSetRes.ProtoReflect.Descriptor instead. func (*BindSetRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{45} + return file_cmd_proto_rawDescGZIP(), []int{47} } func (x *BindSetRes) GetSuccessNum() int32 { @@ -3873,7 +4057,7 @@ type BindDeleteRes struct { func (x *BindDeleteRes) Reset() { *x = BindDeleteRes{} - mi := &file_cmd_proto_msgTypes[46] + mi := &file_cmd_proto_msgTypes[48] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3885,7 +4069,7 @@ func (x *BindDeleteRes) String() string { func (*BindDeleteRes) ProtoMessage() {} func (x *BindDeleteRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[46] + mi := &file_cmd_proto_msgTypes[48] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3898,7 +4082,7 @@ func (x *BindDeleteRes) ProtoReflect() protoreflect.Message { // Deprecated: Use BindDeleteRes.ProtoReflect.Descriptor instead. func (*BindDeleteRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{46} + return file_cmd_proto_rawDescGZIP(), []int{48} } func (x *BindDeleteRes) GetSuccessNum() int32 { @@ -3934,7 +4118,7 @@ type BindError struct { func (x *BindError) Reset() { *x = BindError{} - mi := &file_cmd_proto_msgTypes[47] + mi := &file_cmd_proto_msgTypes[49] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -3946,7 +4130,7 @@ func (x *BindError) String() string { func (*BindError) ProtoMessage() {} func (x *BindError) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[47] + mi := &file_cmd_proto_msgTypes[49] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -3959,7 +4143,7 @@ func (x *BindError) ProtoReflect() protoreflect.Message { // Deprecated: Use BindError.ProtoReflect.Descriptor instead. func (*BindError) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{47} + return file_cmd_proto_rawDescGZIP(), []int{49} } func (x *BindError) GetBindId() int64 { @@ -3994,7 +4178,7 @@ type GrantListRes struct { func (x *GrantListRes) Reset() { *x = GrantListRes{} - mi := &file_cmd_proto_msgTypes[48] + mi := &file_cmd_proto_msgTypes[50] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4006,7 +4190,7 @@ func (x *GrantListRes) String() string { func (*GrantListRes) ProtoMessage() {} func (x *GrantListRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[48] + mi := &file_cmd_proto_msgTypes[50] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4019,7 +4203,7 @@ func (x *GrantListRes) ProtoReflect() protoreflect.Message { // Deprecated: Use GrantListRes.ProtoReflect.Descriptor instead. func (*GrantListRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{48} + return file_cmd_proto_rawDescGZIP(), []int{50} } func (x *GrantListRes) GetFrom() []*Grant { @@ -4049,7 +4233,7 @@ type ScriptRunRes struct { func (x *ScriptRunRes) Reset() { *x = ScriptRunRes{} - mi := &file_cmd_proto_msgTypes[49] + mi := &file_cmd_proto_msgTypes[51] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4061,7 +4245,7 @@ func (x *ScriptRunRes) String() string { func (*ScriptRunRes) ProtoMessage() {} func (x *ScriptRunRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[49] + mi := &file_cmd_proto_msgTypes[51] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4074,7 +4258,7 @@ func (x *ScriptRunRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ScriptRunRes.ProtoReflect.Descriptor instead. func (*ScriptRunRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{49} + return file_cmd_proto_rawDescGZIP(), []int{51} } func (x *ScriptRunRes) GetPrintOutput() string { @@ -4117,7 +4301,7 @@ type ScriptInfo struct { func (x *ScriptInfo) Reset() { *x = ScriptInfo{} - mi := &file_cmd_proto_msgTypes[50] + mi := &file_cmd_proto_msgTypes[52] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4129,7 +4313,7 @@ func (x *ScriptInfo) String() string { func (*ScriptInfo) ProtoMessage() {} func (x *ScriptInfo) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[50] + mi := &file_cmd_proto_msgTypes[52] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4142,7 +4326,7 @@ func (x *ScriptInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ScriptInfo.ProtoReflect.Descriptor instead. func (*ScriptInfo) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{50} + return file_cmd_proto_rawDescGZIP(), []int{52} } func (x *ScriptInfo) GetLuaName() string { @@ -4183,7 +4367,7 @@ type ScriptCreateRes struct { func (x *ScriptCreateRes) Reset() { *x = ScriptCreateRes{} - mi := &file_cmd_proto_msgTypes[51] + mi := &file_cmd_proto_msgTypes[53] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4195,7 +4379,7 @@ func (x *ScriptCreateRes) String() string { func (*ScriptCreateRes) ProtoMessage() {} func (x *ScriptCreateRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[51] + mi := &file_cmd_proto_msgTypes[53] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4208,7 +4392,7 @@ func (x *ScriptCreateRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ScriptCreateRes.ProtoReflect.Descriptor instead. func (*ScriptCreateRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{51} + return file_cmd_proto_rawDescGZIP(), []int{53} } func (x *ScriptCreateRes) GetScriptInfo() *ScriptInfo { @@ -4228,7 +4412,7 @@ type ScriptListRes struct { func (x *ScriptListRes) Reset() { *x = ScriptListRes{} - mi := &file_cmd_proto_msgTypes[52] + mi := &file_cmd_proto_msgTypes[54] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4240,7 +4424,7 @@ func (x *ScriptListRes) String() string { func (*ScriptListRes) ProtoMessage() {} func (x *ScriptListRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[52] + mi := &file_cmd_proto_msgTypes[54] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4253,7 +4437,7 @@ func (x *ScriptListRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ScriptListRes.ProtoReflect.Descriptor instead. func (*ScriptListRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{52} + return file_cmd_proto_rawDescGZIP(), []int{54} } func (x *ScriptListRes) GetScriptInfo() []*ScriptInfo { @@ -4273,7 +4457,7 @@ type ScriptGetRes struct { func (x *ScriptGetRes) Reset() { *x = ScriptGetRes{} - mi := &file_cmd_proto_msgTypes[53] + mi := &file_cmd_proto_msgTypes[55] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4285,7 +4469,7 @@ func (x *ScriptGetRes) String() string { func (*ScriptGetRes) ProtoMessage() {} func (x *ScriptGetRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[53] + mi := &file_cmd_proto_msgTypes[55] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4298,7 +4482,7 @@ func (x *ScriptGetRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ScriptGetRes.ProtoReflect.Descriptor instead. func (*ScriptGetRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{53} + return file_cmd_proto_rawDescGZIP(), []int{55} } func (x *ScriptGetRes) GetScriptInfo() *ScriptInfo { @@ -4318,7 +4502,7 @@ type ScriptDeleteRes struct { func (x *ScriptDeleteRes) Reset() { *x = ScriptDeleteRes{} - mi := &file_cmd_proto_msgTypes[54] + mi := &file_cmd_proto_msgTypes[56] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4330,7 +4514,7 @@ func (x *ScriptDeleteRes) String() string { func (*ScriptDeleteRes) ProtoMessage() {} func (x *ScriptDeleteRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[54] + mi := &file_cmd_proto_msgTypes[56] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4343,7 +4527,7 @@ func (x *ScriptDeleteRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ScriptDeleteRes.ProtoReflect.Descriptor instead. func (*ScriptDeleteRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{54} + return file_cmd_proto_rawDescGZIP(), []int{56} } func (x *ScriptDeleteRes) GetScriptInfo() *ScriptInfo { @@ -4363,7 +4547,7 @@ type ScriptUseRes struct { func (x *ScriptUseRes) Reset() { *x = ScriptUseRes{} - mi := &file_cmd_proto_msgTypes[55] + mi := &file_cmd_proto_msgTypes[57] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4375,7 +4559,7 @@ func (x *ScriptUseRes) String() string { func (*ScriptUseRes) ProtoMessage() {} func (x *ScriptUseRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[55] + mi := &file_cmd_proto_msgTypes[57] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4388,7 +4572,7 @@ func (x *ScriptUseRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ScriptUseRes.ProtoReflect.Descriptor instead. func (*ScriptUseRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{55} + return file_cmd_proto_rawDescGZIP(), []int{57} } func (x *ScriptUseRes) GetScriptInfo() *ScriptInfo { @@ -4408,7 +4592,7 @@ type ExpListRes struct { func (x *ExpListRes) Reset() { *x = ExpListRes{} - mi := &file_cmd_proto_msgTypes[56] + mi := &file_cmd_proto_msgTypes[58] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4420,7 +4604,7 @@ func (x *ExpListRes) String() string { func (*ExpListRes) ProtoMessage() {} func (x *ExpListRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[56] + mi := &file_cmd_proto_msgTypes[58] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4433,7 +4617,7 @@ func (x *ExpListRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ExpListRes.ProtoReflect.Descriptor instead. func (*ExpListRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{56} + return file_cmd_proto_rawDescGZIP(), []int{58} } func (x *ExpListRes) GetBuckets() []*ExpBucket { @@ -4454,7 +4638,7 @@ type ExpBucket struct { func (x *ExpBucket) Reset() { *x = ExpBucket{} - mi := &file_cmd_proto_msgTypes[57] + mi := &file_cmd_proto_msgTypes[59] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4466,7 +4650,7 @@ func (x *ExpBucket) String() string { func (*ExpBucket) ProtoMessage() {} func (x *ExpBucket) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[57] + mi := &file_cmd_proto_msgTypes[59] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4479,7 +4663,7 @@ func (x *ExpBucket) ProtoReflect() protoreflect.Message { // Deprecated: Use ExpBucket.ProtoReflect.Descriptor instead. func (*ExpBucket) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{57} + return file_cmd_proto_rawDescGZIP(), []int{59} } func (x *ExpBucket) GetBucketId() uint32 { @@ -4513,7 +4697,7 @@ type ExpGetRes struct { func (x *ExpGetRes) Reset() { *x = ExpGetRes{} - mi := &file_cmd_proto_msgTypes[58] + mi := &file_cmd_proto_msgTypes[60] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4525,7 +4709,7 @@ func (x *ExpGetRes) String() string { func (*ExpGetRes) ProtoMessage() {} func (x *ExpGetRes) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[58] + mi := &file_cmd_proto_msgTypes[60] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4538,7 +4722,7 @@ func (x *ExpGetRes) ProtoReflect() protoreflect.Message { // Deprecated: Use ExpGetRes.ProtoReflect.Descriptor instead. func (*ExpGetRes) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{58} + return file_cmd_proto_rawDescGZIP(), []int{60} } func (x *ExpGetRes) GetExpData() []*ExpData { @@ -4548,6 +4732,7 @@ func (x *ExpGetRes) GetExpData() []*ExpData { return nil } +// ExpData 实验数据 type ExpData struct { state protoimpl.MessageState `protogen:"open.v1"` Time uint64 `protobuf:"varint,1,opt,name=time,proto3" json:"time,omitempty"` // 日期 @@ -4561,7 +4746,7 @@ type ExpData struct { func (x *ExpData) Reset() { *x = ExpData{} - mi := &file_cmd_proto_msgTypes[59] + mi := &file_cmd_proto_msgTypes[61] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4573,7 +4758,7 @@ func (x *ExpData) String() string { func (*ExpData) ProtoMessage() {} func (x *ExpData) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[59] + mi := &file_cmd_proto_msgTypes[61] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4586,7 +4771,7 @@ func (x *ExpData) ProtoReflect() protoreflect.Message { // Deprecated: Use ExpData.ProtoReflect.Descriptor instead. func (*ExpData) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{59} + return file_cmd_proto_rawDescGZIP(), []int{61} } func (x *ExpData) GetTime() uint64 { @@ -4624,6 +4809,7 @@ func (x *ExpData) GetGroup() map[string]uint64 { return nil } +// ExpBaseFields 基础实验字段 type ExpBaseFields struct { state protoimpl.MessageState `protogen:"open.v1"` Cost float64 `protobuf:"fixed64,1,opt,name=cost,proto3" json:"cost,omitempty"` // 花费 @@ -4643,7 +4829,7 @@ type ExpBaseFields struct { func (x *ExpBaseFields) Reset() { *x = ExpBaseFields{} - mi := &file_cmd_proto_msgTypes[60] + mi := &file_cmd_proto_msgTypes[62] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4655,7 +4841,7 @@ func (x *ExpBaseFields) String() string { func (*ExpBaseFields) ProtoMessage() {} func (x *ExpBaseFields) ProtoReflect() protoreflect.Message { - mi := &file_cmd_proto_msgTypes[60] + mi := &file_cmd_proto_msgTypes[62] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4668,7 +4854,7 @@ func (x *ExpBaseFields) ProtoReflect() protoreflect.Message { // Deprecated: Use ExpBaseFields.ProtoReflect.Descriptor instead. func (*ExpBaseFields) Descriptor() ([]byte, []int) { - return file_cmd_proto_rawDescGZIP(), []int{60} + return file_cmd_proto_rawDescGZIP(), []int{62} } func (x *ExpBaseFields) GetCost() float64 { @@ -4748,12 +4934,64 @@ func (x *ExpBaseFields) GetConversionSecond() int64 { return 0 } +// ExpGrantListRes 授权列表返回 +type ExpGrantListRes struct { + state protoimpl.MessageState `protogen:"open.v1"` + From []*ExpGrant `protobuf:"bytes,1,rep,name=from,proto3" json:"from,omitempty"` // 被授权列表 + To []*ExpGrant `protobuf:"bytes,2,rep,name=to,proto3" json:"to,omitempty"` // 向外授权列表 + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ExpGrantListRes) Reset() { + *x = ExpGrantListRes{} + mi := &file_cmd_proto_msgTypes[63] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ExpGrantListRes) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ExpGrantListRes) ProtoMessage() {} + +func (x *ExpGrantListRes) ProtoReflect() protoreflect.Message { + mi := &file_cmd_proto_msgTypes[63] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ExpGrantListRes.ProtoReflect.Descriptor instead. +func (*ExpGrantListRes) Descriptor() ([]byte, []int) { + return file_cmd_proto_rawDescGZIP(), []int{63} +} + +func (x *ExpGrantListRes) GetFrom() []*ExpGrant { + if x != nil { + return x.From + } + return nil +} + +func (x *ExpGrantListRes) GetTo() []*ExpGrant { + if x != nil { + return x.To + } + return nil +} + var File_cmd_proto protoreflect.FileDescriptor const file_cmd_proto_rawDesc = "" + "\n" + - "\tcmd.proto\x12\asaasapi\"\x9c\n" + - "\n" + + "\tcmd.proto\x12\asaasapi\"\xd3\v\n" + "\aSaasReq\x12#\n" + "\x04info\x18\x05 \x01(\v2\r.saasapi.InfoH\x00R\x04info\x12#\n" + "\x04read\x18\n" + @@ -4789,7 +5027,10 @@ const file_cmd_proto_rawDesc = "" + "\n" + "script_use\x18_ \x01(\v2\x12.saasapi.ScriptUseH\x00R\tscriptUse\x12-\n" + "\bexp_list\x18d \x01(\v2\x10.saasapi.ExpListH\x00R\aexpList\x12*\n" + - "\aexp_get\x18e \x01(\v2\x0f.saasapi.ExpGetH\x00R\x06expGetB\x05\n" + + "\aexp_get\x18e \x01(\v2\x0f.saasapi.ExpGetH\x00R\x06expGet\x12=\n" + + "\x0eexp_grant_list\x18f \x01(\v2\x15.saasapi.ExpGrantListH\x00R\fexpGrantList\x127\n" + + "\rexp_grant_add\x18g \x01(\v2\x11.saasapi.ExpGrantH\x00R\vexpGrantAdd\x12=\n" + + "\x10exp_grant_delete\x18h \x01(\v2\x11.saasapi.ExpGrantH\x00R\x0eexpGrantDeleteB\x05\n" + "\x03cmd\"\x06\n" + "\x04Info\"q\n" + "\x04Read\x12!\n" + @@ -4925,7 +5166,10 @@ const file_cmd_proto_rawDesc = "" + "\x13where_advertiser_id\x18\x0e \x03(\x04R\x11whereAdvertiserId\x12\x19\n" + "\bgroup_by\x18\x14 \x03(\tR\agroupBy\x12\x1d\n" + "\n" + - "total_flag\x18\x1e \x01(\rR\ttotalFlag\"\xf2\v\n" + + "total_flag\x18\x1e \x01(\rR\ttotalFlag\"\x0e\n" + + "\fExpGrantList\"6\n" + + "\bExpGrant\x12*\n" + + "\x11target_account_id\x18\x01 \x01(\rR\x0ftargetAccountId\"\xc1\r\n" + "\aSaasRes\x12&\n" + "\x04code\x18\x01 \x01(\x0e2\x12.saasapi.ErrorCodeR\x04code\x12\x16\n" + "\x06status\x18\x02 \x01(\tR\x06status\x12-\n" + @@ -4956,11 +5200,15 @@ const file_cmd_proto_rawDesc = "" + "\x0escript_use_res\x18_ \x01(\v2\x15.saasapi.ScriptUseResH\x00R\fscriptUseRes\x127\n" + "\fexp_list_res\x18d \x01(\v2\x13.saasapi.ExpListResH\x00R\n" + "expListRes\x124\n" + - "\vexp_get_res\x18e \x01(\v2\x12.saasapi.ExpGetResH\x00R\texpGetResB\x05\n" + - "\x03res\"1\n" + + "\vexp_get_res\x18e \x01(\v2\x12.saasapi.ExpGetResH\x00R\texpGetRes\x12G\n" + + "\x12exp_grant_list_res\x18f \x01(\v2\x18.saasapi.ExpGrantListResH\x00R\x0fexpGrantListRes\x12>\n" + + "\x11exp_grant_add_res\x18g \x01(\v2\x11.saasapi.ExpGrantH\x00R\x0eexpGrantAddRes\x12D\n" + + "\x14exp_grant_delete_res\x18h \x01(\v2\x11.saasapi.ExpGrantH\x00R\x11expGrantDeleteResB\x05\n" + + "\x03res\"C\n" + "\tDataSpace\x12\x10\n" + "\x03did\x18\x01 \x03(\tR\x03did\x12\x12\n" + - "\x04wuid\x18\x02 \x03(\tR\x04wuid\"X\n" + + "\x04wuid\x18\x02 \x03(\tR\x04wuid\x12\x10\n" + + "\x03geo\x18\a \x03(\tR\x03geo\"X\n" + "\aInfoRes\x120\n" + "\tdataspace\x18\x01 \x01(\v2\x12.saasapi.DataSpaceR\tdataspace\x12\x1b\n" + "\ttarget_id\x18\x02 \x03(\tR\btargetId\"\x82\x01\n" + @@ -5087,7 +5335,10 @@ const file_cmd_proto_rawDesc = "" + "conversion\x18\n" + " \x01(\x03R\n" + "conversion\x12+\n" + - "\x11conversion_second\x18\v \x01(\x03R\x10conversionSecond*=\n" + + "\x11conversion_second\x18\v \x01(\x03R\x10conversionSecond\"[\n" + + "\x0fExpGrantListRes\x12%\n" + + "\x04from\x18\x01 \x03(\v2\x11.saasapi.ExpGrantR\x04from\x12!\n" + + "\x02to\x18\x02 \x03(\v2\x11.saasapi.ExpGrantR\x02to*=\n" + "\bBindType\x12\x13\n" + "\x0fUnknownBindType\x10\x00\x12\r\n" + "\tAdgroupId\x10\x01\x12\r\n" + @@ -5166,7 +5417,7 @@ func file_cmd_proto_rawDescGZIP() []byte { } var file_cmd_proto_enumTypes = make([]protoimpl.EnumInfo, 7) -var file_cmd_proto_msgTypes = make([]protoimpl.MessageInfo, 64) +var file_cmd_proto_msgTypes = make([]protoimpl.MessageInfo, 67) var file_cmd_proto_goTypes = []any{ (BindType)(0), // 0: saasapi.BindType (BindSourceType)(0), // 1: saasapi.BindSourceType @@ -5208,37 +5459,40 @@ var file_cmd_proto_goTypes = []any{ (*ScriptUse)(nil), // 37: saasapi.ScriptUse (*ExpList)(nil), // 38: saasapi.ExpList (*ExpGet)(nil), // 39: saasapi.ExpGet - (*SaasRes)(nil), // 40: saasapi.SaasRes - (*DataSpace)(nil), // 41: saasapi.DataSpace - (*InfoRes)(nil), // 42: saasapi.InfoRes - (*ReadRes)(nil), // 43: saasapi.ReadRes - (*WriteRes)(nil), // 44: saasapi.WriteRes - (*ValueItem)(nil), // 45: saasapi.ValueItem - (*TaskListRes)(nil), // 46: saasapi.TaskListRes - (*TargetListRes)(nil), // 47: saasapi.TargetListRes - (*TargetCreateRes)(nil), // 48: saasapi.TargetCreateRes - (*TargetDeleteRes)(nil), // 49: saasapi.TargetDeleteRes - (*Binds)(nil), // 50: saasapi.Binds - (*Bind)(nil), // 51: saasapi.Bind - (*BindSetRes)(nil), // 52: saasapi.BindSetRes - (*BindDeleteRes)(nil), // 53: saasapi.BindDeleteRes - (*BindError)(nil), // 54: saasapi.BindError - (*GrantListRes)(nil), // 55: saasapi.GrantListRes - (*ScriptRunRes)(nil), // 56: saasapi.ScriptRunRes - (*ScriptInfo)(nil), // 57: saasapi.ScriptInfo - (*ScriptCreateRes)(nil), // 58: saasapi.ScriptCreateRes - (*ScriptListRes)(nil), // 59: saasapi.ScriptListRes - (*ScriptGetRes)(nil), // 60: saasapi.ScriptGetRes - (*ScriptDeleteRes)(nil), // 61: saasapi.ScriptDeleteRes - (*ScriptUseRes)(nil), // 62: saasapi.ScriptUseRes - (*ExpListRes)(nil), // 63: saasapi.ExpListRes - (*ExpBucket)(nil), // 64: saasapi.ExpBucket - (*ExpGetRes)(nil), // 65: saasapi.ExpGetRes - (*ExpData)(nil), // 66: saasapi.ExpData - (*ExpBaseFields)(nil), // 67: saasapi.ExpBaseFields - nil, // 68: saasapi.TargetListRes.TargetListEntry - nil, // 69: saasapi.ExpData.ExtFieldsEntry - nil, // 70: saasapi.ExpData.GroupEntry + (*ExpGrantList)(nil), // 40: saasapi.ExpGrantList + (*ExpGrant)(nil), // 41: saasapi.ExpGrant + (*SaasRes)(nil), // 42: saasapi.SaasRes + (*DataSpace)(nil), // 43: saasapi.DataSpace + (*InfoRes)(nil), // 44: saasapi.InfoRes + (*ReadRes)(nil), // 45: saasapi.ReadRes + (*WriteRes)(nil), // 46: saasapi.WriteRes + (*ValueItem)(nil), // 47: saasapi.ValueItem + (*TaskListRes)(nil), // 48: saasapi.TaskListRes + (*TargetListRes)(nil), // 49: saasapi.TargetListRes + (*TargetCreateRes)(nil), // 50: saasapi.TargetCreateRes + (*TargetDeleteRes)(nil), // 51: saasapi.TargetDeleteRes + (*Binds)(nil), // 52: saasapi.Binds + (*Bind)(nil), // 53: saasapi.Bind + (*BindSetRes)(nil), // 54: saasapi.BindSetRes + (*BindDeleteRes)(nil), // 55: saasapi.BindDeleteRes + (*BindError)(nil), // 56: saasapi.BindError + (*GrantListRes)(nil), // 57: saasapi.GrantListRes + (*ScriptRunRes)(nil), // 58: saasapi.ScriptRunRes + (*ScriptInfo)(nil), // 59: saasapi.ScriptInfo + (*ScriptCreateRes)(nil), // 60: saasapi.ScriptCreateRes + (*ScriptListRes)(nil), // 61: saasapi.ScriptListRes + (*ScriptGetRes)(nil), // 62: saasapi.ScriptGetRes + (*ScriptDeleteRes)(nil), // 63: saasapi.ScriptDeleteRes + (*ScriptUseRes)(nil), // 64: saasapi.ScriptUseRes + (*ExpListRes)(nil), // 65: saasapi.ExpListRes + (*ExpBucket)(nil), // 66: saasapi.ExpBucket + (*ExpGetRes)(nil), // 67: saasapi.ExpGetRes + (*ExpData)(nil), // 68: saasapi.ExpData + (*ExpBaseFields)(nil), // 69: saasapi.ExpBaseFields + (*ExpGrantListRes)(nil), // 70: saasapi.ExpGrantListRes + nil, // 71: saasapi.TargetListRes.TargetListEntry + nil, // 72: saasapi.ExpData.ExtFieldsEntry + nil, // 73: saasapi.ExpData.GroupEntry } var file_cmd_proto_depIdxs = []int32{ 8, // 0: saasapi.SaasReq.info:type_name -> saasapi.Info @@ -5266,76 +5520,84 @@ var file_cmd_proto_depIdxs = []int32{ 37, // 22: saasapi.SaasReq.script_use:type_name -> saasapi.ScriptUse 38, // 23: saasapi.SaasReq.exp_list:type_name -> saasapi.ExpList 39, // 24: saasapi.SaasReq.exp_get:type_name -> saasapi.ExpGet - 10, // 25: saasapi.Read.read_items:type_name -> saasapi.ReadItem - 12, // 26: saasapi.Write.write_items:type_name -> saasapi.WriteItem - 13, // 27: saasapi.WriteItem.write_bytes:type_name -> saasapi.Bytes - 14, // 28: saasapi.WriteItem.write_uint32s:type_name -> saasapi.Uint32s - 15, // 29: saasapi.WriteItem.write_flags_with_expire:type_name -> saasapi.FlagsWithExpire - 16, // 30: saasapi.FlagsWithExpire.flags_with_expire:type_name -> saasapi.FlagWithExpire - 13, // 31: saasapi.ColumnWrite.write_bytes:type_name -> saasapi.Bytes - 14, // 32: saasapi.ColumnWrite.write_uint32s:type_name -> saasapi.Uint32s - 15, // 33: saasapi.ColumnWrite.write_flags_with_expire:type_name -> saasapi.FlagsWithExpire - 23, // 34: saasapi.Task.task_file_infos:type_name -> saasapi.FileInfo - 4, // 35: saasapi.Task.status:type_name -> saasapi.TaskStatus - 4, // 36: saasapi.TaskList.status_filter:type_name -> saasapi.TaskStatus - 24, // 37: saasapi.FileInfo.file_blocks:type_name -> saasapi.FileBlock - 51, // 38: saasapi.BindSet.binds:type_name -> saasapi.Bind - 51, // 39: saasapi.BindDelete.binds:type_name -> saasapi.Bind - 5, // 40: saasapi.ScriptRun.os:type_name -> saasapi.OS - 2, // 41: saasapi.SaasRes.code:type_name -> saasapi.ErrorCode - 42, // 42: saasapi.SaasRes.info_res:type_name -> saasapi.InfoRes - 43, // 43: saasapi.SaasRes.read_res:type_name -> saasapi.ReadRes - 44, // 44: saasapi.SaasRes.write_res:type_name -> saasapi.WriteRes - 18, // 45: saasapi.SaasRes.task_create_res:type_name -> saasapi.Task - 46, // 46: saasapi.SaasRes.task_list_res:type_name -> saasapi.TaskListRes - 18, // 47: saasapi.SaasRes.task_run_res:type_name -> saasapi.Task - 18, // 48: saasapi.SaasRes.task_delete_res:type_name -> saasapi.Task - 18, // 49: saasapi.SaasRes.task_info_res:type_name -> saasapi.Task - 47, // 50: saasapi.SaasRes.target_list_res:type_name -> saasapi.TargetListRes - 48, // 51: saasapi.SaasRes.target_create_res:type_name -> saasapi.TargetCreateRes - 49, // 52: saasapi.SaasRes.target_delete_res:type_name -> saasapi.TargetDeleteRes - 52, // 53: saasapi.SaasRes.bind_set_res:type_name -> saasapi.BindSetRes - 53, // 54: saasapi.SaasRes.bind_delete_res:type_name -> saasapi.BindDeleteRes - 55, // 55: saasapi.SaasRes.grant_list_res:type_name -> saasapi.GrantListRes - 31, // 56: saasapi.SaasRes.grant_add_res:type_name -> saasapi.Grant - 31, // 57: saasapi.SaasRes.grant_delete_res:type_name -> saasapi.Grant - 56, // 58: saasapi.SaasRes.script_run_res:type_name -> saasapi.ScriptRunRes - 58, // 59: saasapi.SaasRes.script_create_res:type_name -> saasapi.ScriptCreateRes - 59, // 60: saasapi.SaasRes.script_list_res:type_name -> saasapi.ScriptListRes - 61, // 61: saasapi.SaasRes.script_delete_res:type_name -> saasapi.ScriptDeleteRes - 60, // 62: saasapi.SaasRes.script_get_res:type_name -> saasapi.ScriptGetRes - 62, // 63: saasapi.SaasRes.script_use_res:type_name -> saasapi.ScriptUseRes - 63, // 64: saasapi.SaasRes.exp_list_res:type_name -> saasapi.ExpListRes - 65, // 65: saasapi.SaasRes.exp_get_res:type_name -> saasapi.ExpGetRes - 41, // 66: saasapi.InfoRes.dataspace:type_name -> saasapi.DataSpace - 45, // 67: saasapi.ReadRes.cmd_res:type_name -> saasapi.ValueItem - 3, // 68: saasapi.ValueItem.cmd_code:type_name -> saasapi.CmdErrorCode - 16, // 69: saasapi.ValueItem.flags_with_expire:type_name -> saasapi.FlagWithExpire - 18, // 70: saasapi.TaskListRes.tasks:type_name -> saasapi.Task - 68, // 71: saasapi.TargetListRes.target_list:type_name -> saasapi.TargetListRes.TargetListEntry - 51, // 72: saasapi.Binds.binds:type_name -> saasapi.Bind - 0, // 73: saasapi.Bind.bind_type:type_name -> saasapi.BindType - 1, // 74: saasapi.Bind.bind_source:type_name -> saasapi.BindSourceType - 54, // 75: saasapi.BindSetRes.errors:type_name -> saasapi.BindError - 54, // 76: saasapi.BindDeleteRes.errors:type_name -> saasapi.BindError - 31, // 77: saasapi.GrantListRes.from:type_name -> saasapi.Grant - 31, // 78: saasapi.GrantListRes.to:type_name -> saasapi.Grant - 57, // 79: saasapi.ScriptCreateRes.script_info:type_name -> saasapi.ScriptInfo - 57, // 80: saasapi.ScriptListRes.script_info:type_name -> saasapi.ScriptInfo - 57, // 81: saasapi.ScriptGetRes.script_info:type_name -> saasapi.ScriptInfo - 57, // 82: saasapi.ScriptDeleteRes.script_info:type_name -> saasapi.ScriptInfo - 57, // 83: saasapi.ScriptUseRes.script_info:type_name -> saasapi.ScriptInfo - 64, // 84: saasapi.ExpListRes.buckets:type_name -> saasapi.ExpBucket - 66, // 85: saasapi.ExpGetRes.exp_data:type_name -> saasapi.ExpData - 67, // 86: saasapi.ExpData.base_fields:type_name -> saasapi.ExpBaseFields - 69, // 87: saasapi.ExpData.ext_fields:type_name -> saasapi.ExpData.ExtFieldsEntry - 70, // 88: saasapi.ExpData.group:type_name -> saasapi.ExpData.GroupEntry - 50, // 89: saasapi.TargetListRes.TargetListEntry.value:type_name -> saasapi.Binds - 90, // [90:90] is the sub-list for method output_type - 90, // [90:90] is the sub-list for method input_type - 90, // [90:90] is the sub-list for extension type_name - 90, // [90:90] is the sub-list for extension extendee - 0, // [0:90] is the sub-list for field type_name + 40, // 25: saasapi.SaasReq.exp_grant_list:type_name -> saasapi.ExpGrantList + 41, // 26: saasapi.SaasReq.exp_grant_add:type_name -> saasapi.ExpGrant + 41, // 27: saasapi.SaasReq.exp_grant_delete:type_name -> saasapi.ExpGrant + 10, // 28: saasapi.Read.read_items:type_name -> saasapi.ReadItem + 12, // 29: saasapi.Write.write_items:type_name -> saasapi.WriteItem + 13, // 30: saasapi.WriteItem.write_bytes:type_name -> saasapi.Bytes + 14, // 31: saasapi.WriteItem.write_uint32s:type_name -> saasapi.Uint32s + 15, // 32: saasapi.WriteItem.write_flags_with_expire:type_name -> saasapi.FlagsWithExpire + 16, // 33: saasapi.FlagsWithExpire.flags_with_expire:type_name -> saasapi.FlagWithExpire + 13, // 34: saasapi.ColumnWrite.write_bytes:type_name -> saasapi.Bytes + 14, // 35: saasapi.ColumnWrite.write_uint32s:type_name -> saasapi.Uint32s + 15, // 36: saasapi.ColumnWrite.write_flags_with_expire:type_name -> saasapi.FlagsWithExpire + 23, // 37: saasapi.Task.task_file_infos:type_name -> saasapi.FileInfo + 4, // 38: saasapi.Task.status:type_name -> saasapi.TaskStatus + 4, // 39: saasapi.TaskList.status_filter:type_name -> saasapi.TaskStatus + 24, // 40: saasapi.FileInfo.file_blocks:type_name -> saasapi.FileBlock + 53, // 41: saasapi.BindSet.binds:type_name -> saasapi.Bind + 53, // 42: saasapi.BindDelete.binds:type_name -> saasapi.Bind + 5, // 43: saasapi.ScriptRun.os:type_name -> saasapi.OS + 2, // 44: saasapi.SaasRes.code:type_name -> saasapi.ErrorCode + 44, // 45: saasapi.SaasRes.info_res:type_name -> saasapi.InfoRes + 45, // 46: saasapi.SaasRes.read_res:type_name -> saasapi.ReadRes + 46, // 47: saasapi.SaasRes.write_res:type_name -> saasapi.WriteRes + 18, // 48: saasapi.SaasRes.task_create_res:type_name -> saasapi.Task + 48, // 49: saasapi.SaasRes.task_list_res:type_name -> saasapi.TaskListRes + 18, // 50: saasapi.SaasRes.task_run_res:type_name -> saasapi.Task + 18, // 51: saasapi.SaasRes.task_delete_res:type_name -> saasapi.Task + 18, // 52: saasapi.SaasRes.task_info_res:type_name -> saasapi.Task + 49, // 53: saasapi.SaasRes.target_list_res:type_name -> saasapi.TargetListRes + 50, // 54: saasapi.SaasRes.target_create_res:type_name -> saasapi.TargetCreateRes + 51, // 55: saasapi.SaasRes.target_delete_res:type_name -> saasapi.TargetDeleteRes + 54, // 56: saasapi.SaasRes.bind_set_res:type_name -> saasapi.BindSetRes + 55, // 57: saasapi.SaasRes.bind_delete_res:type_name -> saasapi.BindDeleteRes + 57, // 58: saasapi.SaasRes.grant_list_res:type_name -> saasapi.GrantListRes + 31, // 59: saasapi.SaasRes.grant_add_res:type_name -> saasapi.Grant + 31, // 60: saasapi.SaasRes.grant_delete_res:type_name -> saasapi.Grant + 58, // 61: saasapi.SaasRes.script_run_res:type_name -> saasapi.ScriptRunRes + 60, // 62: saasapi.SaasRes.script_create_res:type_name -> saasapi.ScriptCreateRes + 61, // 63: saasapi.SaasRes.script_list_res:type_name -> saasapi.ScriptListRes + 63, // 64: saasapi.SaasRes.script_delete_res:type_name -> saasapi.ScriptDeleteRes + 62, // 65: saasapi.SaasRes.script_get_res:type_name -> saasapi.ScriptGetRes + 64, // 66: saasapi.SaasRes.script_use_res:type_name -> saasapi.ScriptUseRes + 65, // 67: saasapi.SaasRes.exp_list_res:type_name -> saasapi.ExpListRes + 67, // 68: saasapi.SaasRes.exp_get_res:type_name -> saasapi.ExpGetRes + 70, // 69: saasapi.SaasRes.exp_grant_list_res:type_name -> saasapi.ExpGrantListRes + 41, // 70: saasapi.SaasRes.exp_grant_add_res:type_name -> saasapi.ExpGrant + 41, // 71: saasapi.SaasRes.exp_grant_delete_res:type_name -> saasapi.ExpGrant + 43, // 72: saasapi.InfoRes.dataspace:type_name -> saasapi.DataSpace + 47, // 73: saasapi.ReadRes.cmd_res:type_name -> saasapi.ValueItem + 3, // 74: saasapi.ValueItem.cmd_code:type_name -> saasapi.CmdErrorCode + 16, // 75: saasapi.ValueItem.flags_with_expire:type_name -> saasapi.FlagWithExpire + 18, // 76: saasapi.TaskListRes.tasks:type_name -> saasapi.Task + 71, // 77: saasapi.TargetListRes.target_list:type_name -> saasapi.TargetListRes.TargetListEntry + 53, // 78: saasapi.Binds.binds:type_name -> saasapi.Bind + 0, // 79: saasapi.Bind.bind_type:type_name -> saasapi.BindType + 1, // 80: saasapi.Bind.bind_source:type_name -> saasapi.BindSourceType + 56, // 81: saasapi.BindSetRes.errors:type_name -> saasapi.BindError + 56, // 82: saasapi.BindDeleteRes.errors:type_name -> saasapi.BindError + 31, // 83: saasapi.GrantListRes.from:type_name -> saasapi.Grant + 31, // 84: saasapi.GrantListRes.to:type_name -> saasapi.Grant + 59, // 85: saasapi.ScriptCreateRes.script_info:type_name -> saasapi.ScriptInfo + 59, // 86: saasapi.ScriptListRes.script_info:type_name -> saasapi.ScriptInfo + 59, // 87: saasapi.ScriptGetRes.script_info:type_name -> saasapi.ScriptInfo + 59, // 88: saasapi.ScriptDeleteRes.script_info:type_name -> saasapi.ScriptInfo + 59, // 89: saasapi.ScriptUseRes.script_info:type_name -> saasapi.ScriptInfo + 66, // 90: saasapi.ExpListRes.buckets:type_name -> saasapi.ExpBucket + 68, // 91: saasapi.ExpGetRes.exp_data:type_name -> saasapi.ExpData + 69, // 92: saasapi.ExpData.base_fields:type_name -> saasapi.ExpBaseFields + 72, // 93: saasapi.ExpData.ext_fields:type_name -> saasapi.ExpData.ExtFieldsEntry + 73, // 94: saasapi.ExpData.group:type_name -> saasapi.ExpData.GroupEntry + 41, // 95: saasapi.ExpGrantListRes.from:type_name -> saasapi.ExpGrant + 41, // 96: saasapi.ExpGrantListRes.to:type_name -> saasapi.ExpGrant + 52, // 97: saasapi.TargetListRes.TargetListEntry.value:type_name -> saasapi.Binds + 98, // [98:98] is the sub-list for method output_type + 98, // [98:98] is the sub-list for method input_type + 98, // [98:98] is the sub-list for extension type_name + 98, // [98:98] is the sub-list for extension extendee + 0, // [0:98] is the sub-list for field type_name } func init() { file_cmd_proto_init() } @@ -5369,8 +5631,11 @@ func file_cmd_proto_init() { (*SaasReq_ScriptUse)(nil), (*SaasReq_ExpList)(nil), (*SaasReq_ExpGet)(nil), + (*SaasReq_ExpGrantList)(nil), + (*SaasReq_ExpGrantAdd)(nil), + (*SaasReq_ExpGrantDelete)(nil), } - file_cmd_proto_msgTypes[33].OneofWrappers = []any{ + file_cmd_proto_msgTypes[35].OneofWrappers = []any{ (*SaasRes_InfoRes)(nil), (*SaasRes_ReadRes)(nil), (*SaasRes_WriteRes)(nil), @@ -5395,6 +5660,9 @@ func file_cmd_proto_init() { (*SaasRes_ScriptUseRes)(nil), (*SaasRes_ExpListRes)(nil), (*SaasRes_ExpGetRes)(nil), + (*SaasRes_ExpGrantListRes)(nil), + (*SaasRes_ExpGrantAddRes)(nil), + (*SaasRes_ExpGrantDeleteRes)(nil), } type x struct{} out := protoimpl.TypeBuilder{ @@ -5402,7 +5670,7 @@ func file_cmd_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_cmd_proto_rawDesc), len(file_cmd_proto_rawDesc)), NumEnums: 7, - NumMessages: 64, + NumMessages: 67, NumExtensions: 0, NumServices: 0, }, diff --git a/cmd.proto b/cmd.proto index 48247b6..3f988c8 100644 --- a/cmd.proto +++ b/cmd.proto @@ -39,6 +39,9 @@ message SaasReq { ExpList exp_list = 100; // 列出实验 ExpGet exp_get = 101; // 获取实验报表 + ExpGrantList exp_grant_list = 102; // 列出访问实验报表授权 + ExpGrant exp_grant_add = 103; // 授权他人访问实验报表 + ExpGrant exp_grant_delete = 104; // 取消他人访问实验报表 } } @@ -260,6 +263,14 @@ message ExpGet { uint32 total_flag = 30; // 是否汇总,0=不汇总,1=汇总 } +message ExpGrantList { + +} + +message ExpGrant { + uint32 target_account_id = 1; // sRTA授权目标账号ID +} + // SaasRes 命令返回 message SaasRes { ErrorCode code = 1; // 返回码 @@ -296,12 +307,16 @@ message SaasRes { ExpListRes exp_list_res = 100; // 实验列表返回 ExpGetRes exp_get_res = 101; // 实验报表返回 + ExpGrantListRes exp_grant_list_res = 102; // 实验授权列表返回 + ExpGrant exp_grant_add_res = 103; // 增加实验授权返回 + ExpGrant exp_grant_delete_res = 104; // 实验解除授权返回 } } message DataSpace { repeated string did = 1; // 设备ID区 repeated string wuid = 2; // OpenID区 + repeated string geo = 7; // GEO区 } // InfoRes 账号信息返回 @@ -471,6 +486,7 @@ message ExpGetRes { repeated ExpData exp_data = 1; // 实验数据 } +// ExpData 实验数据 message ExpData { uint64 time = 1; // 日期 uint32 bucket_id = 2; // 分桶ID @@ -479,6 +495,7 @@ message ExpData { map group = 5; // 分组 } +// ExpBaseFields 基础实验字段 message ExpBaseFields { double cost = 1; // 花费 int64 exposure = 2; // 曝光量 @@ -493,6 +510,12 @@ message ExpBaseFields { int64 conversion_second = 11; // 深层转化量 } +// ExpGrantListRes 授权列表返回 +message ExpGrantListRes { + repeated ExpGrant from = 1; // 被授权列表 + repeated ExpGrant to = 2; // 向外授权列表 +} + // ErrorCode 返回码 enum ErrorCode { SUCC = 0; // 成功 diff --git a/cmd/saastool/.gitignore b/cmd/saastool/.gitignore index d82925b..b7943c5 100644 --- a/cmd/saastool/.gitignore +++ b/cmd/saastool/.gitignore @@ -3,4 +3,5 @@ saastool saastool_linux *.toml test/ -*.lua \ No newline at end of file +*.lua +test.txt \ No newline at end of file diff --git a/cmd/saastool/daemon.go b/cmd/saastool/daemon.go index 8b7f031..068a3c6 100644 --- a/cmd/saastool/daemon.go +++ b/cmd/saastool/daemon.go @@ -221,9 +221,9 @@ func (d *Daemon) parsePublicParams(r *http.Request) (*daemonPublicParams, error) params.ds = strings.ToLower(strings.TrimSpace(q.Get("ds"))) switch params.ds { - case "did", "wuid": + case "did", "wuid", "geo": default: - return nil, fmt.Errorf("ds must use did/wuid. current is %v", params.ds) + return nil, fmt.Errorf("ds must use did/wuid/geo. current is %v", params.ds) } params.appid = strings.TrimSpace(q.Get("appid")) diff --git a/cmd/saastool/exp.go b/cmd/saastool/exp.go index 1051695..b7fe463 100644 --- a/cmd/saastool/exp.go +++ b/cmd/saastool/exp.go @@ -17,6 +17,8 @@ func RunExp(args ...string) error { return RunExpList(args...) case "get": return RunExpGet(args...) + case "grant": + return RunExpGrant(args...) default: err := fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'saastool exp help' for usage`, name) fmt.Fprintln(os.Stderr, err) @@ -31,11 +33,12 @@ func RunExpHelp(args ...string) error { } const expUsage = ` -Usage: saastoola exp COMMAND [OPTIONS] +Usage: saastool exp COMMAND [OPTIONS] Commands: list List exps get Get exp report + grant Experiment authorization management "help" is the default command. diff --git a/cmd/saastool/exp_grant.go b/cmd/saastool/exp_grant.go new file mode 100644 index 0000000..b37fb6b --- /dev/null +++ b/cmd/saastool/exp_grant.go @@ -0,0 +1,40 @@ +package main + +import ( + "fmt" + "os" + "strings" +) + +func RunExpGrant(args ...string) error { + name, args := ParseCommandName(args) + + switch name { + case "", "help": + fmt.Println(strings.TrimSpace(expGrantUsage)) + return nil + case "list": + return RunExpGrantList(args...) + case "add": + return RunExpGrantAdd(args...) + case "delete": + return RunExpGrantDelete(args...) + default: + err := fmt.Errorf(`unknown command "%s"`+"\n"+`Run 'saastool exp grant help' for usage`, name) + fmt.Fprintln(os.Stderr, err) + return err + } +} + +const expGrantUsage = ` +Usage: saastool exp grant COMMAND [OPTIONS] + +Commands: + list List experiment authorization + add Add experiment authorization + delete Delete experiment authorization + +"help" is the default command. + +Use "saastool exp grant COMMAND -help" for more information about a command. +` diff --git a/cmd/saastool/exp_grant_add.go b/cmd/saastool/exp_grant_add.go new file mode 100644 index 0000000..ffe59cb --- /dev/null +++ b/cmd/saastool/exp_grant_add.go @@ -0,0 +1,81 @@ +package main + +import ( + "flag" + "fmt" + "net/http" + "os" + + "git.algo.com.cn/public/saasapi" + "git.algo.com.cn/public/saasapi/pkg/saashttp" + "google.golang.org/protobuf/encoding/protojson" +) + +type expGrantAddParams struct { + srtaAccountId uint32 + saasHttp *saashttp.SaasClient +} + +func RunExpGrantAdd(args ...string) error { + fs := flag.NewFlagSet("add", flag.ExitOnError) + cfgFile := paramConfig(fs) + srtaAccountId := paramSrtaAccountId(fs) + + if err := fs.Parse(args); err != nil { + fmt.Fprintln(os.Stderr, "command line parse error", "err", err) + return err + } + + if fs.NArg() > 0 { + fs.PrintDefaults() + return nil + } + + if *srtaAccountId == 0 { + fmt.Fprintln(os.Stderr, "Error: sRTA account ID is required") + fs.PrintDefaults() + return fmt.Errorf("sRTA account ID is required") + } + + cfg, err := LoadConfigFile(*cfgFile) + if err != nil { + fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err) + return err + } + + expGrantAddParams := expGrantAddParams{ + srtaAccountId: uint32(*srtaAccountId), + saasHttp: &saashttp.SaasClient{ + Client: &http.Client{}, + ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls), + Auth: &cfg.Auth, + }, + } + + return doExpGrantAdd(expGrantAddParams) +} + +func doExpGrantAdd(params expGrantAddParams) error { + saasReq := &saasapi.SaasReq{ + Cmd: &saasapi.SaasReq_ExpGrantAdd{ + ExpGrantAdd: &saasapi.ExpGrant{ + TargetAccountId: params.srtaAccountId, + }, + }, + } + + res, err := params.saasHttp.ExpGrantAdd(saasReq) + if err != nil { + fmt.Fprintln(os.Stderr, "submit Exp Grant Add error", "err", err) + return err + } + + if res.Code != saasapi.ErrorCode_SUCC { + fmt.Fprintln(os.Stderr, "Exp grant add failed", "code", res.Code, "status", res.Status) + return nil + } + + expGrantRes := res.GetExpGrantAddRes() + fmt.Printf("exp grant add res: %v\n", protojson.Format(expGrantRes)) + return nil +} diff --git a/cmd/saastool/exp_grant_delete.go b/cmd/saastool/exp_grant_delete.go new file mode 100644 index 0000000..d38451a --- /dev/null +++ b/cmd/saastool/exp_grant_delete.go @@ -0,0 +1,81 @@ +package main + +import ( + "flag" + "fmt" + "net/http" + "os" + + "git.algo.com.cn/public/saasapi" + "git.algo.com.cn/public/saasapi/pkg/saashttp" + "google.golang.org/protobuf/encoding/protojson" +) + +type expGrantDeleteParams struct { + srtaAccountId uint32 + saasHttp *saashttp.SaasClient +} + +func RunExpGrantDelete(args ...string) error { + fs := flag.NewFlagSet("delete", flag.ExitOnError) + cfgFile := paramConfig(fs) + srtaAccountId := paramSrtaAccountId(fs) + + if err := fs.Parse(args); err != nil { + fmt.Fprintln(os.Stderr, "command line parse error", "err", err) + return err + } + + if fs.NArg() > 0 { + fs.PrintDefaults() + return nil + } + + if *srtaAccountId == 0 { + fmt.Fprintln(os.Stderr, "Error: sRTA account ID is required") + fs.PrintDefaults() + return fmt.Errorf("sRTA account ID is required") + } + + cfg, err := LoadConfigFile(*cfgFile) + if err != nil { + fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err) + return err + } + + expGrantDeleteParams := expGrantDeleteParams{ + srtaAccountId: uint32(*srtaAccountId), + saasHttp: &saashttp.SaasClient{ + Client: &http.Client{}, + ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls), + Auth: &cfg.Auth, + }, + } + + return doExpGrantDelete(expGrantDeleteParams) +} + +func doExpGrantDelete(params expGrantDeleteParams) error { + saasReq := &saasapi.SaasReq{ + Cmd: &saasapi.SaasReq_ExpGrantDelete{ + ExpGrantDelete: &saasapi.ExpGrant{ + TargetAccountId: params.srtaAccountId, + }, + }, + } + + res, err := params.saasHttp.ExpGrantDelete(saasReq) + if err != nil { + fmt.Fprintln(os.Stderr, "submit Exp Grant Delete error", "err", err) + return err + } + + if res.Code != saasapi.ErrorCode_SUCC { + fmt.Fprintln(os.Stderr, "Exp grant delete failed", "code", res.Code, "status", res.Status) + return nil + } + + expGrantRes := res.GetExpGrantDeleteRes() + fmt.Printf("exp grant delete res: %v\n", protojson.Format(expGrantRes)) + return nil +} diff --git a/cmd/saastool/exp_grant_list.go b/cmd/saastool/exp_grant_list.go new file mode 100644 index 0000000..3c48adb --- /dev/null +++ b/cmd/saastool/exp_grant_list.go @@ -0,0 +1,70 @@ +package main + +import ( + "flag" + "fmt" + "net/http" + "os" + + "git.algo.com.cn/public/saasapi" + "git.algo.com.cn/public/saasapi/pkg/saashttp" + "google.golang.org/protobuf/encoding/protojson" +) + +type expGrantListParams struct { + saasHttp *saashttp.SaasClient +} + +func RunExpGrantList(args ...string) error { + fs := flag.NewFlagSet("list", flag.ExitOnError) + cfgFile := paramConfig(fs) + + if err := fs.Parse(args); err != nil { + fmt.Fprintln(os.Stderr, "command line parse error", "err", err) + return err + } + + if fs.NArg() > 0 { + fs.PrintDefaults() + return nil + } + + cfg, err := LoadConfigFile(*cfgFile) + if err != nil { + fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err) + return err + } + + expGrantListParams := expGrantListParams{ + saasHttp: &saashttp.SaasClient{ + Client: &http.Client{}, + ApiUrls: saashttp.InitAPIUrl(&cfg.ApiUrls), + Auth: &cfg.Auth, + }, + } + + return doExpGrantList(expGrantListParams) +} + +func doExpGrantList(params expGrantListParams) error { + saasReq := &saasapi.SaasReq{ + Cmd: &saasapi.SaasReq_ExpGrantList{ + ExpGrantList: &saasapi.ExpGrantList{}, + }, + } + + res, err := params.saasHttp.ExpGrantList(saasReq) + if err != nil { + fmt.Fprintln(os.Stderr, "submit Exp Grant List error", "err", err) + return err + } + + if res.Code != saasapi.ErrorCode_SUCC { + fmt.Fprintln(os.Stderr, "Exp grant list failed", "code", res.Code, "status", res.Status) + return nil + } + + expGrantRes := res.GetExpGrantListRes() + fmt.Printf("exp grant list res: %v\n", protojson.Format(expGrantRes)) + return nil +} diff --git a/cmd/saastool/task_make.go b/cmd/saastool/task_make.go index 9f8b02e..8c655a2 100644 --- a/cmd/saastool/task_make.go +++ b/cmd/saastool/task_make.go @@ -74,7 +74,6 @@ func RunTaskMake(args ...string) error { fmt.Fprintln(os.Stderr, "Error parsing block size", "err", err) fmt.Fprintln(os.Stderr, "Using default 200M") blockSizeNum = 200 * 1024 * 1024 - } if blockSizeNum < blockSizeMin || blockSizeNum > blockSizeMax { diff --git a/docker/build_saastool.sh b/docker/build_saastool.sh index 6509e40..e647364 100755 --- a/docker/build_saastool.sh +++ b/docker/build_saastool.sh @@ -4,7 +4,7 @@ set -e docker buildx build --platform linux/amd64 \ -t rta-docker.pkg.coding.net/public/docker/saastool:latest \ - -t rta-docker.pkg.coding.net/public/docker/saastool:2025112312 \ + -t rta-docker.pkg.coding.net/public/docker/saastool:2025121210 \ -o type=registry \ -f saastool.Dockerfile \ ../ ; diff --git a/make.sh b/make.sh index 98e043a..d2ad271 100755 --- a/make.sh +++ b/make.sh @@ -1,3 +1,8 @@ cd cmd/saastool go build -o ../../build/saastool +CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ../../build/saastool_linux_x64 +CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ../../build/saastool_win_x64 +CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ../../build/saastool_mac_x64 +CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o ../../build/saastool_mac_arm64 + cd ../../ \ No newline at end of file diff --git a/pkg/saashttp/cfg.go b/pkg/saashttp/cfg.go index adbe04c..310c609 100644 --- a/pkg/saashttp/cfg.go +++ b/pkg/saashttp/cfg.go @@ -1,34 +1,37 @@ package saashttp const ( - baseUrl = "https://api.rta.qq.com" - infoPath = "/saas/info" - writePath = "/saas/write" - readPath = "/saas/read" - columnWritePath = "/saas/column_write" - taskCreatePath = "/saas/task/create" - taskListPath = "/saas/task/list" - taskInfoPath = "/saas/task/info" - taskUploadPath = "/saas/task/upload" - taskDownloadPath = "/saas/task/download" - taskDeletePath = "/saas/task/delete" - taskRunPath = "/saas/task/run" - targetListPath = "/saas/target/list" - targetCreatePath = "/saas/target/create" - targetDeletePath = "/saas/target/delete" - bindSetPath = "/saas/bind/set" - bindDeletePath = "/saas/bind/delete" - scriptRunPath = "/saas/script/run" - scriptCreatePath = "/saas/script/create" - scriptListPath = "/saas/script/list" - scriptDeletePath = "/saas/script/delete" - scriptGetPath = "/saas/script/get" - scriptUsePath = "/saas/script/use" - expListPath = "/saas/exp/list" - expGetPath = "/saas/exp/get" - grantListPath = "/saas/grant/list" - grantAddPath = "/saas/grant/add" - grantDeletePath = "/saas/grant/delete" + baseUrl = "https://api.rta.qq.com" + infoPath = "/saas/info" + writePath = "/saas/write" + readPath = "/saas/read" + columnWritePath = "/saas/column_write" + taskCreatePath = "/saas/task/create" + taskListPath = "/saas/task/list" + taskInfoPath = "/saas/task/info" + taskUploadPath = "/saas/task/upload" + taskDownloadPath = "/saas/task/download" + taskDeletePath = "/saas/task/delete" + taskRunPath = "/saas/task/run" + targetListPath = "/saas/target/list" + targetCreatePath = "/saas/target/create" + targetDeletePath = "/saas/target/delete" + bindSetPath = "/saas/bind/set" + bindDeletePath = "/saas/bind/delete" + scriptRunPath = "/saas/script/run" + scriptCreatePath = "/saas/script/create" + scriptListPath = "/saas/script/list" + scriptDeletePath = "/saas/script/delete" + scriptGetPath = "/saas/script/get" + scriptUsePath = "/saas/script/use" + expListPath = "/saas/exp/list" + expGetPath = "/saas/exp/get" + expGrantListPath = "/saas/exp/grant/list" + expGrantAddPath = "/saas/exp/grant/add" + expGrantDeletePath = "/saas/exp/grant/delete" + grantListPath = "/saas/grant/list" + grantAddPath = "/saas/grant/add" + grantDeletePath = "/saas/grant/delete" ) type Auth struct { @@ -37,34 +40,37 @@ type Auth struct { } type ApiUrls struct { - BaseUrl string - InfoPath string - WritePath string - ReadPath string - ColumnWritePath string - TaskCreatePath string - TaskListPath string - TaskInfoPath string - TaskDeletePath string - TaskRunPath string - TaskUploadPath string - TaskDownloadPath string - TargetListPath string - TargetCreatePath string - TargetDeletePath string - BindSetPath string - BindDeletePath string - ScriptRunPath string - ScriptCreatePath string - ScriptListPath string - ScriptDeletePath string - ScriptGetPath string - ScriptUsePath string - ExpListPath string - ExpGetPath string - GrantListPath string - GrantAddPath string - GrantDeletePath string + BaseUrl string + InfoPath string + WritePath string + ReadPath string + ColumnWritePath string + TaskCreatePath string + TaskListPath string + TaskInfoPath string + TaskDeletePath string + TaskRunPath string + TaskUploadPath string + TaskDownloadPath string + TargetListPath string + TargetCreatePath string + TargetDeletePath string + BindSetPath string + BindDeletePath string + ScriptRunPath string + ScriptCreatePath string + ScriptListPath string + ScriptDeletePath string + ScriptGetPath string + ScriptUsePath string + ExpListPath string + ExpGetPath string + ExpGrantListPath string + ExpGrantAddPath string + ExpGrantDeletePath string + GrantListPath string + GrantAddPath string + GrantDeletePath string } func InitAPIUrl(c *ApiUrls) *ApiUrls { @@ -204,6 +210,24 @@ func InitAPIUrl(c *ApiUrls) *ApiUrls { r.ExpGetPath = expGetPath } + if c.ExpGrantListPath != "" { + r.ExpGrantListPath = c.ExpGrantListPath + } else { + r.ExpGrantListPath = expGrantListPath + } + + if c.ExpGrantAddPath != "" { + r.ExpGrantAddPath = c.ExpGrantAddPath + } else { + r.ExpGrantAddPath = expGrantAddPath + } + + if c.ExpGrantDeletePath != "" { + r.ExpGrantDeletePath = c.ExpGrantDeletePath + } else { + r.ExpGrantDeletePath = expGrantDeletePath + } + if c.GrantListPath != "" { r.GrantListPath = c.GrantListPath } else { diff --git a/pkg/saashttp/httpcli.go b/pkg/saashttp/httpcli.go index 79d6b1e..cc71167 100644 --- a/pkg/saashttp/httpcli.go +++ b/pkg/saashttp/httpcli.go @@ -143,6 +143,21 @@ func (c *SaasClient) GrantDelete(saasReq *saasapi.SaasReq) (saasRes *saasapi.Saa return c.post(postUrl, saasReq) } +func (c *SaasClient) ExpGrantList(saasReq *saasapi.SaasReq) (saasRes *saasapi.SaasRes, err error) { + postUrl := c.makeUrl(c.ApiUrls.BaseUrl, c.ApiUrls.ExpGrantListPath) + return c.post(postUrl, saasReq) +} + +func (c *SaasClient) ExpGrantAdd(saasReq *saasapi.SaasReq) (saasRes *saasapi.SaasRes, err error) { + postUrl := c.makeUrl(c.ApiUrls.BaseUrl, c.ApiUrls.ExpGrantAddPath) + return c.post(postUrl, saasReq) +} + +func (c *SaasClient) ExpGrantDelete(saasReq *saasapi.SaasReq) (saasRes *saasapi.SaasRes, err error) { + postUrl := c.makeUrl(c.ApiUrls.BaseUrl, c.ApiUrls.ExpGrantDeletePath) + return c.post(postUrl, saasReq) +} + func (c *SaasClient) makeUrl(baseUrl, path string, params ...string) string { url, err := url.Parse(baseUrl) if err != nil {