上传统计数据时使用ID取代名称

build/rpc.json

@@ -6672,7 +6672,9 @@
           "responseMessageName": "RPCSuccess",
           "code": "rpc deleteNodeLogs(DeleteNodeLogsRequest) returns (RPCSuccess);",
           "doc": "删除日志",
-          "roles": [],
+          "roles": [
+            "admin"
+          ],
           "isDeprecated": false
         }
       ],
@@ -21929,7 +21931,7 @@
     },
     {
       "name": "UploadServerHTTPRequestStatRequest",
-      "code": "message UploadServerHTTPRequestStatRequest {\n\tstring month = 1;\n\tstring day = 2;\n\trepeated RegionCity regionCities = 3;\n\trepeated RegionProvider regionProviders = 4;\n\trepeated System systems = 5;\n\trepeated Browser browsers = 6;\n\trepeated HTTPFirewallRuleGroup httpFirewallRuleGroups = 7;\n\n\n\tmessage RegionCity {\n\t\tint64 serverId = 1;\n\t\tstring countryName = 2;\n\t\tstring provinceName = 3;\n\t\tstring cityName = 4;\n\t\tint64 countRequests = 5;\n\t\tint64 bytes = 6;\n\t\tint64 countAttackRequests = 7;\n\t\tint64 attackBytes = 8;\n\t}\n\n\n\tmessage RegionProvider {\n\t\tint64 serverId = 1;\n\t\tstring name = 2;\n\t\tint64 count = 3;\n\t}\n\n\n\tmessage System {\n\t\tint64 serverId = 1;\n\t\tstring name = 2;\n\t\tstring version = 3;\n\t\tint64 count = 4;\n\t}\n\n\n\tmessage Browser {\n\t\tint64 serverId = 1;\n\t\tstring name = 2;\n\t\tstring version = 3;\n\t\tint64 count = 4;\n\t}\n\n\n\tmessage HTTPFirewallRuleGroup {\n\t\tint64 serverId = 1;\n\t\tint64 httpFirewallRuleGroupId = 2;\n\t\tstring action = 3;\n\t\tint64 count = 4;\n\t}\n}",
+      "code": "message UploadServerHTTPRequestStatRequest {\n\tstring month = 1;\n\tstring day = 2;\n\trepeated RegionCity regionCities = 3;\n\trepeated RegionProvider regionProviders = 4;\n\trepeated System systems = 5;\n\trepeated Browser browsers = 6;\n\trepeated HTTPFirewallRuleGroup httpFirewallRuleGroups = 7;\n\n\n\tmessage RegionCity {\n\t\tint64 serverId = 1;\n\t\tint64 countRequests = 5;\n\t\tint64 bytes = 6;\n\t\tint64 countAttackRequests = 7;\n\t\tint64 attackBytes = 8;\n\t\tint64 countryId = 9;\n\t\tint64 provinceId = 10;\n\t\tint64 cityId = 11;\n\t}\n\n\n\tmessage RegionProvider {\n\t\tint64 serverId = 1;\n\t\tint64 count = 3;\n\t\tint64 providerId = 4;\n\t}\n\n\n\tmessage System {\n\t\tint64 serverId = 1;\n\t\tstring name = 2;\n\t\tstring version = 3;\n\t\tint64 count = 4;\n\t}\n\n\n\tmessage Browser {\n\t\tint64 serverId = 1;\n\t\tstring name = 2;\n\t\tstring version = 3;\n\t\tint64 count = 4;\n\t}\n\n\n\tmessage HTTPFirewallRuleGroup {\n\t\tint64 serverId = 1;\n\t\tint64 httpFirewallRuleGroupId = 2;\n\t\tstring action = 3;\n\t\tint64 count = 4;\n\t}\n}",
       "doc": "上传HTTP请求待统计数据"
     },
     {

pkg/rpc/pb/service_server.pb.go

@@ -4442,13 +4442,13 @@ type UploadServerHTTPRequestStatRequest_RegionCity struct {
 	unknownFields protoimpl.UnknownFields
 
 	ServerId            int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"`
-	CountryName         string `protobuf:"bytes,2,opt,name=countryName,proto3" json:"countryName,omitempty"`
-	ProvinceName        string `protobuf:"bytes,3,opt,name=provinceName,proto3" json:"provinceName,omitempty"`
-	CityName            string `protobuf:"bytes,4,opt,name=cityName,proto3" json:"cityName,omitempty"`
 	CountRequests       int64 `protobuf:"varint,5,opt,name=countRequests,proto3" json:"countRequests,omitempty"`
 	Bytes               int64 `protobuf:"varint,6,opt,name=bytes,proto3" json:"bytes,omitempty"`
 	CountAttackRequests int64 `protobuf:"varint,7,opt,name=countAttackRequests,proto3" json:"countAttackRequests,omitempty"`
 	AttackBytes         int64 `protobuf:"varint,8,opt,name=attackBytes,proto3" json:"attackBytes,omitempty"`
+	CountryId           int64 `protobuf:"varint,9,opt,name=countryId,proto3" json:"countryId,omitempty"`
+	ProvinceId          int64 `protobuf:"varint,10,opt,name=provinceId,proto3" json:"provinceId,omitempty"`
+	CityId              int64 `protobuf:"varint,11,opt,name=cityId,proto3" json:"cityId,omitempty"`
 }
 
 func (x *UploadServerHTTPRequestStatRequest_RegionCity) Reset() {
@@ -4490,27 +4490,6 @@ func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetServerId() int64 {
 	return 0
 }
 
-func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetCountryName() string {
-	if x != nil {
-		return x.CountryName
-	}
-	return ""
-}
-
-func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetProvinceName() string {
-	if x != nil {
-		return x.ProvinceName
-	}
-	return ""
-}
-
-func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetCityName() string {
-	if x != nil {
-		return x.CityName
-	}
-	return ""
-}
-
 func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetCountRequests() int64 {
 	if x != nil {
 		return x.CountRequests
@@ -4539,14 +4518,35 @@ func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetAttackBytes() int64 {
 	return 0
 }
 
+func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetCountryId() int64 {
+	if x != nil {
+		return x.CountryId
+	}
+	return 0
+}
+
+func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetProvinceId() int64 {
+	if x != nil {
+		return x.ProvinceId
+	}
+	return 0
+}
+
+func (x *UploadServerHTTPRequestStatRequest_RegionCity) GetCityId() int64 {
+	if x != nil {
+		return x.CityId
+	}
+	return 0
+}
+
 type UploadServerHTTPRequestStatRequest_RegionProvider struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	ServerId   int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"`
-	Name     string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
 	Count      int64 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"`
+	ProviderId int64 `protobuf:"varint,4,opt,name=providerId,proto3" json:"providerId,omitempty"`
 }
 
 func (x *UploadServerHTTPRequestStatRequest_RegionProvider) Reset() {
@@ -4588,13 +4588,6 @@ func (x *UploadServerHTTPRequestStatRequest_RegionProvider) GetServerId() int64
 	return 0
 }
 
-func (x *UploadServerHTTPRequestStatRequest_RegionProvider) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
 func (x *UploadServerHTTPRequestStatRequest_RegionProvider) GetCount() int64 {
 	if x != nil {
 		return x.Count
@@ -4602,6 +4595,13 @@ func (x *UploadServerHTTPRequestStatRequest_RegionProvider) GetCount() int64 {
 	return 0
 }
 
+func (x *UploadServerHTTPRequestStatRequest_RegionProvider) GetProviderId() int64 {
+	if x != nil {
+		return x.ProviderId
+	}
+	return 0
+}
+
 type UploadServerHTTPRequestStatRequest_System struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5286,31 +5286,31 @@ var file_service_server_proto_rawDesc = []byte{
 	0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x48,
 	0x54, 0x54, 0x50, 0x46, 0x69, 0x72, 0x65, 0x77, 0x61, 0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x47,
 	0x72, 0x6f, 0x75, 0x70, 0x52, 0x16, 0x68, 0x74, 0x74, 0x70, 0x46, 0x69, 0x72, 0x65, 0x77, 0x61,
-	0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x9a, 0x02, 0x0a,
+	0x6c, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x1a, 0x8e, 0x02, 0x0a,
 	0x0a, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x69, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x73,
 	0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d,
-	0x75, 0x6e, 0x74, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x70, 0x72, 0x6f,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x14, 0x0a,
-	0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x62, 0x79,
-	0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a,
+	0x74, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x13, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x61,
-	0x08, 0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03,
-	0x08, 0x63, 0x69, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x75,
+	0x52, 0x13, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71,
-	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
+	0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x42,
-	0x52, 0x0d, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12,
+	0x79, 0x74, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x61, 0x74, 0x74, 0x61,
-	0x14, 0x0a, 0x05, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+	0x63, 0x6b, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x62, 0x79, 0x74, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x13, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x74,
+	0x72, 0x79, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01,
+	0x74, 0x72, 0x79, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x6e, 0x63,
-	0x28, 0x03, 0x52, 0x13, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x6b, 0x52,
+	0x65, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63,
+	0x6e, 0x63, 0x65, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x69, 0x74, 0x79, 0x49, 0x64, 0x18,
-	0x6b, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x61, 0x74,
+	0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x69, 0x74, 0x79, 0x49, 0x64, 0x1a, 0x62, 0x0a,
-	0x74, 0x61, 0x63, 0x6b, 0x42, 0x79, 0x74, 0x65, 0x73, 0x1a, 0x56, 0x0a, 0x0e, 0x52, 0x65, 0x67,
+	0x0e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12,
-	0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73,
+	0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73,
+	0x03, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63,
-	0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63,
 	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x1a, 0x68, 0x0a, 0x06, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x73,
+	0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49, 0x64, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x49,
+	0x64, 0x1a, 0x68, 0x0a, 0x06, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x73,
 	0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73,
 	0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76,

pkg/rpc/protos/service_server.proto

@@ -518,19 +518,19 @@ message UploadServerHTTPRequestStatRequest {
 
 	message RegionCity {
 		int64 serverId = 1;
-		string countryName = 2;
-		string provinceName = 3;
-		string cityName = 4;
 		int64 countRequests = 5;
 		int64 bytes = 6;
 		int64 countAttackRequests = 7;
 		int64 attackBytes = 8;
+		int64 countryId = 9;
+		int64 provinceId = 10;
+		int64 cityId = 11;
 	}
 
 	message RegionProvider {
 		int64 serverId = 1;
-		string name = 2;
 		int64 count = 3;
+		int64 providerId = 4;
 	}
 
 	message System {