From 99acf99a48b38013bd71a395c9174adb436dedf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Wed, 22 Feb 2023 19:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=9B=B8=E5=85=B3=E5=92=8C?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/rpc.json | 4 +-- pkg/rpc/pb/model_authority_key.pb.go | 26 ++++++++++++++++--- pkg/rpc/pb/service_http_web.pb.go | 2 +- .../protos/models/model_authority_key.proto | 2 ++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/build/rpc.json b/build/rpc.json index 7d37ba8..c7a19f8 100644 --- a/build/rpc.json +++ b/build/rpc.json @@ -13035,7 +13035,7 @@ }, { "name": "AuthorityKey", - "code": "message AuthorityKey {\n\tstring value = 1;\n\tstring dayFrom = 2;\n\tstring dayTo = 3;\n\tstring hostname = 4;\n\trepeated string macAddresses = 5;\n\tint64 updatedAt = 6;\n\tstring company = 7;\n\tint32 nodes = 8;\n\trepeated string components = 9;\n}", + "code": "message AuthorityKey {\n\tstring value = 1;\n\tstring dayFrom = 2;\n\tstring dayTo = 3;\n\tstring hostname = 4;\n\trepeated string macAddresses = 5;\n\tint64 updatedAt = 6;\n\tstring company = 7;\n\tint32 nodes = 8;\n\trepeated string components = 9;\n\tstring edition = 10;\n\tstring requestCode = 11;\n}", "doc": "版本认证" }, { @@ -14320,7 +14320,7 @@ }, { "name": "CreateHTTPWebRequest", - "code": "message CreateHTTPWebRequest {\n\tbytes rootJSON = 1;\n}", + "code": "message CreateHTTPWebRequest {\n\tbytes rootJSON = 1; // 可选，静态分发配置\n}", "doc": "创建Web配置" }, { diff --git a/pkg/rpc/pb/model_authority_key.pb.go b/pkg/rpc/pb/model_authority_key.pb.go index 6a345a2..3c12749 100644 --- a/pkg/rpc/pb/model_authority_key.pb.go +++ b/pkg/rpc/pb/model_authority_key.pb.go @@ -40,6 +40,8 @@ type AuthorityKey struct { Company string `protobuf:"bytes,7,opt,name=company,proto3" json:"company,omitempty"` Nodes int32 `protobuf:"varint,8,opt,name=nodes,proto3" json:"nodes,omitempty"` Components []string `protobuf:"bytes,9,rep,name=components,proto3" json:"components,omitempty"` + Edition string `protobuf:"bytes,10,opt,name=edition,proto3" json:"edition,omitempty"` + RequestCode string `protobuf:"bytes,11,opt,name=requestCode,proto3" json:"requestCode,omitempty"` } func (x *AuthorityKey) Reset() { @@ -137,12 +139,26 @@ func (x *AuthorityKey) GetComponents() []string { return nil } +func (x *AuthorityKey) GetEdition() string { + if x != nil { + return x.Edition + } + return "" +} + +func (x *AuthorityKey) GetRequestCode() string { + if x != nil { + return x.RequestCode + } + return "" +} + var File_models_model_authority_key_proto protoreflect.FileDescriptor var file_models_model_authority_key_proto_rawDesc = []byte{ 0x0a, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x82, 0x02, 0x0a, 0x0c, 0x41, 0x75, 0x74, 0x68, 0x6f, + 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xbe, 0x02, 0x0a, 0x0c, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x61, 0x79, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, @@ -158,8 +174,12 @@ var file_models_model_authority_key_proto_rawDesc = []byte{ 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, + 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x43, 0x6f, 0x64, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x72, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/rpc/pb/service_http_web.pb.go b/pkg/rpc/pb/service_http_web.pb.go index 90176fd..d87a709 100644 --- a/pkg/rpc/pb/service_http_web.pb.go +++ b/pkg/rpc/pb/service_http_web.pb.go @@ -35,7 +35,7 @@ type CreateHTTPWebRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RootJSON []byte `protobuf:"bytes,1,opt,name=rootJSON,proto3" json:"rootJSON,omitempty"` + RootJSON []byte `protobuf:"bytes,1,opt,name=rootJSON,proto3" json:"rootJSON,omitempty"` // 可选，静态分发配置 } func (x *CreateHTTPWebRequest) Reset() { diff --git a/pkg/rpc/protos/models/model_authority_key.proto b/pkg/rpc/protos/models/model_authority_key.proto index aebb53a..1709f3b 100644 --- a/pkg/rpc/protos/models/model_authority_key.proto +++ b/pkg/rpc/protos/models/model_authority_key.proto @@ -14,4 +14,6 @@ message AuthorityKey { string company = 7; int32 nodes = 8; repeated string components = 9; + string edition = 10; + string requestCode = 11; }