diff --git a/build/rpc.json b/build/rpc.json index be79175..64154c7 100644 --- a/build/rpc.json +++ b/build/rpc.json @@ -13827,7 +13827,7 @@ }, { "name": "CheckUserServerRequest", - "code": "message CheckUserServerRequest {\n\tint64 serverId = 1;\n}", + "code": "message CheckUserServerRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "检查网站是否属于某个用户" }, { @@ -13942,7 +13942,7 @@ }, { "name": "ComposeServerConfigRequest", - "code": "message ComposeServerConfigRequest {\n\tint64 serverId = 1;\n}", + "code": "message ComposeServerConfigRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "获取网站配置" }, { @@ -15332,7 +15332,7 @@ }, { "name": "CreateOriginRequest", - "code": "message CreateOriginRequest {\n\tstring name = 1; // 名称,为可选项\n\tNetworkAddress addr = 2; // 源站网络地址\n\tbytes ossJSON = 15; // OSS配置信息,源站网络地址中protocol为oss:开头时需要设置此项\n\tstring description = 3; // 描述,为可选项\n\tint32 weight = 4; // 权重,不小于0,一般设置为10\n\tbool isOn = 5; // 是否启用\n\tbytes connTimeoutJSON = 6; // 可选项\n\tbytes readTimeoutJSON = 7; // 可选项\n\tbytes idleTimeoutJSON = 8; // 可选项\n\tint32 maxConns = 9; // 可选项\n\tint32 maxIdleConns = 10; // 可选项\n\trepeated string domains = 11; // 可选项\n\tbytes certRefJSON = 12; // 可选项\n\tstring host = 13; // 可选项\n\tbool followPort = 14; // 可选项\n}", + "code": "message CreateOriginRequest {\n\tstring name = 1; // 名称,为可选项\n\tNetworkAddress addr = 2; // 源站网络地址\n\tbytes ossJSON = 15; // OSS配置信息,源站网络地址中protocol为oss:开头时需要设置此项\n\tstring description = 3; // 描述,为可选项\n\tint32 weight = 4; // 权重,不小于0,一般设置为10\n\tbool isOn = 5; // 是否启用\n\tbytes connTimeoutJSON = 6; // 可选项,连接超时时间\n\tbytes readTimeoutJSON = 7; // 可选项,读取超时时间\n\tbytes idleTimeoutJSON = 8; // 可选项,空闲超时时间\n\tint32 maxConns = 9; // 可选项,最大连接数\n\tint32 maxIdleConns = 10; // 可选项,最大空闲连接数\n\trepeated string domains = 11; // 可选项,专属域名列表\n\tbytes certRefJSON = 12; // 可选项,证书设置\n\tstring host = 13; // 可选项,回源主机名\n\tbool followPort = 14; // 可选项,是否跟随端口\n\tbool http2Enabled = 16; // 可选项,是否支持HTTP/2,只在HTTPS源站时生效\n}", "doc": "创建源站" }, { @@ -15432,7 +15432,7 @@ }, { "name": "CreateServerRequest", - "code": "message CreateServerRequest {\n\tint64 userId = 1; // 可选项,用户ID,如果不想指定用户,此值可以为0\n\tint64 adminId = 2; // 可选项,管理员ID\n\tstring type = 3; // 类型:httpProxy(HTTP反向代理,一般CDN服务都选这个)、httpWeb(静态文件服务,只会从服务器上读取文件内容,不会转发到源站)、tcpProxy(TCP反向代理)、udpProxy(UDP反向代理)\n\tstring name = 4; // 网站名称,通常可以是一个域名\n\tstring description = 5; // 可选项,网站描述\n\n\t// 配置相关\n\tbytes serverNamesJSON = 8; // 域名列表 @link json:server_names\n\tbytes serverNamesJON = 19 [deprecated = true]; // 已过期,请使用 serverNamesJSON 代替\n\tbytes httpJSON = 9; // HTTP协议,当type为httpProxy或者httpWeb时填写 @link json:http_protocol\n\tbytes httpsJSON = 10; // HTTPS协议,当type为httpProxy或者httpWeb时填写 @link json:https_protocol\n\tbytes tcpJSON = 11; // TCP协议,当type为tcpProxy时填写 @link json:tcp_protocol\n\tbytes tlsJSON = 12; // TLS协议,当type为tcpProxy时填写 @link json:tls_protocol\n\tbytes unixJSON = 13; // 备用参数,不用填写\n\tbytes udpJSON = 14; // UDP协议,当type为udpProxy时填写 @link json:udp_protocol\n\tint64 webId = 15; // 可选项,Web配置ID,当type为httpProxy或者httpWeb时填写,可以通过 /HTTPWebService/createHTTPWeb 接口创建;如果你需要配置缓存等信息时需要在 HTTPWebService 接口操作\n\tbytes reverseProxyJSON = 16; // 反向代理(包含源站)配置引用,此项可以在创建网站后再设置 @link json:reverse_proxy_ref\n\trepeated int64 serverGroupIds = 17; // 可选项,所属网站分组ID列表\n\tint64 userPlanId = 18; // 可选项,套餐ID\n\n\tint64 nodeClusterId = 30; // 所部署的集群ID\n\tbytes includeNodesJSON = 31; // 备用参数,不用填写\n\tbytes excludeNodesJSON = 32; // 备用参数,不用填写\n}", + "code": "message CreateServerRequest {\n\tint64 userId = 1; // 可选项,用户ID,如果不想指定用户,此值可以为0\n\tint64 adminId = 2; // 可选项,管理员ID\n\tstring type = 3; // 类型:httpProxy(HTTP反向代理,一般CDN服务都选这个)、httpWeb(静态文件服务,只会从服务器上读取文件内容,不会转发到源站)、tcpProxy(TCP反向代理)、udpProxy(UDP反向代理)\n\tstring name = 4; // 网站名称,通常可以是一个域名\n\tstring description = 5; // 可选项,网站描述\n\n\t// 配置相关\n\tbytes serverNamesJSON = 8; // 域名列表 @link json:server_names\n\tbytes serverNamesJON = 19 [deprecated = true]; // 已过期,请使用 serverNamesJSON 代替\n\tbytes httpJSON = 9; // HTTP协议设置,当type为httpProxy或者httpWeb时填写 @link json:http_protocol\n\tbytes httpsJSON = 10; // HTTPS协议设置,当type为httpProxy或者httpWeb时填写 @link json:https_protocol\n\tbytes tcpJSON = 11; // TCP协议设置,当type为tcpProxy时填写 @link json:tcp_protocol\n\tbytes tlsJSON = 12; // TLS协议设置,当type为tcpProxy时填写 @link json:tls_protocol\n\tbytes unixJSON = 13; // 备用参数,不用填写\n\tbytes udpJSON = 14; // UDP协议设置,当type为udpProxy时填写 @link json:udp_protocol\n\tint64 webId = 15; // 可选项,Web配置ID,当type为httpProxy或者httpWeb时填写,可以通过 /HTTPWebService/createHTTPWeb 接口创建;如果你需要配置缓存等信息时需要在 HTTPWebService 接口操作\n\tbytes reverseProxyJSON = 16; // 反向代理(包含源站)配置引用,此项可以在创建网站后再设置 @link json:reverse_proxy_ref\n\trepeated int64 serverGroupIds = 17; // 可选项,所属网站分组ID列表\n\tint64 userPlanId = 18; // 可选项,套餐ID\n\n\tint64 nodeClusterId = 30; // 所部署的集群ID\n\tbytes includeNodesJSON = 31; // 备用参数,不用填写\n\tbytes excludeNodesJSON = 32; // 备用参数,不用填写\n}", "doc": "创建网站" }, { @@ -15967,7 +15967,7 @@ }, { "name": "DeleteServerRequest", - "code": "message DeleteServerRequest {\n\tint64 serverId = 1;\n}", + "code": "message DeleteServerRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "禁用网站" }, { @@ -17427,7 +17427,7 @@ }, { "name": "FindAndInitServerReverseProxyConfigRequest", - "code": "message FindAndInitServerReverseProxyConfigRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindAndInitServerReverseProxyConfigRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找反向代理设置" }, { @@ -17437,7 +17437,7 @@ }, { "name": "FindAndInitServerWebConfigRequest", - "code": "message FindAndInitServerWebConfigRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindAndInitServerWebConfigRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "初始化Web设置" }, { @@ -18312,7 +18312,7 @@ }, { "name": "FindEnabledServerConfigRequest", - "code": "message FindEnabledServerConfigRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindEnabledServerConfigRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找网站配置" }, { @@ -18322,7 +18322,7 @@ }, { "name": "FindEnabledServerDNSRequest", - "code": "message FindEnabledServerDNSRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindEnabledServerDNSRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找单个网站的DNS信息" }, { @@ -18362,7 +18362,7 @@ }, { "name": "FindEnabledServerTrafficLimitRequest", - "code": "message FindEnabledServerTrafficLimitRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindEnabledServerTrafficLimitRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找流量限制" }, { @@ -18372,7 +18372,7 @@ }, { "name": "FindEnabledServerTypeRequest", - "code": "message FindEnabledServerTypeRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindEnabledServerTypeRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找网站的网站类型" }, { @@ -18382,7 +18382,7 @@ }, { "name": "FindEnabledServerUAMRequest", - "code": "message FindEnabledServerUAMRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindEnabledServerUAMRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找网站UAM设置" }, { @@ -18472,7 +18472,7 @@ }, { "name": "FindEnabledUserServerBasicRequest", - "code": "message FindEnabledUserServerBasicRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindEnabledUserServerBasicRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找用户网站基本信息" }, { @@ -19102,7 +19102,7 @@ }, { "name": "FindNearbyServersRequest", - "code": "message FindNearbyServersRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindNearbyServersRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找某个网站附近的网站" }, { @@ -19442,22 +19442,22 @@ }, { "name": "FindServerIdWithDNSNameResponse", - "code": "message FindServerIdWithDNSNameResponse {\n\tint64 serverId = 1;\n}", + "code": "message FindServerIdWithDNSNameResponse {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "" }, { "name": "FindServerNamesRequest", - "code": "message FindServerNamesRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindServerNamesRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "查找网站的域名设置" }, { "name": "FindServerNamesResponse", - "code": "message FindServerNamesResponse {\n\tbytes serverNamesJSON = 1;\n\tbool isAuditing = 2;\n\tint64 auditingAt = 5;\n\tbytes auditingServerNamesJSON = 3;\n\tServerNameAuditingResult auditingResult = 4;\n}", + "code": "message FindServerNamesResponse {\n\tbytes serverNamesJSON = 1; // 域名列表 @link json:server_names\n\tbool isAuditing = 2;\n\tint64 auditingAt = 5;\n\tbytes auditingServerNamesJSON = 3;\n\tServerNameAuditingResult auditingResult = 4;\n}", "doc": "" }, { "name": "FindServerUserPlanRequest", - "code": "message FindServerUserPlanRequest {\n\tint64 serverId = 1;\n}", + "code": "message FindServerUserPlanRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "获取网站套餐信息" }, { @@ -20962,7 +20962,7 @@ }, { "name": "Origin", - "code": "message Origin {\n\tint64 id = 1;\n\tbool isOn = 2;\n\tstring name = 3;\n\tNetworkAddress addr = 4; // 源站网络地址\n\tbytes ossJSON = 9; // 源站网络地址为oss:开头时有此内容\n\tstring description = 5;\n\trepeated string domains = 6;\n\tstring host = 7;\n\tbool followPort = 8;\n}", + "code": "message Origin {\n\tint64 id = 1;\n\tbool isOn = 2;\n\tstring name = 3;\n\tNetworkAddress addr = 4; // 源站网络地址\n\tbytes ossJSON = 9; // 源站网络地址为oss:开头时有此内容\n\tstring description = 5;\n\trepeated string domains = 6;\n\tstring host = 7;\n\tbool followPort = 8;\n\tbool http2Enabled = 10; // 是否支持HTTP/2,只在HTTPS源站时生效\n}", "doc": "" }, { @@ -21037,7 +21037,7 @@ }, { "name": "RegenerateServerDNSNameRequest", - "code": "message RegenerateServerDNSNameRequest {\n\tint64 serverId = 1;\n}", + "code": "message RegenerateServerDNSNameRequest {\n\tint64 serverId = 1; // 网站ID\n}", "doc": "重新生成CNAME" }, { @@ -21562,7 +21562,7 @@ }, { "name": "UpdateEnabledUserServerBasicRequest", - "code": "message UpdateEnabledUserServerBasicRequest {\n\tint64 serverId = 1;\n\tstring name = 2;\n}", + "code": "message UpdateEnabledUserServerBasicRequest {\n\tint64 serverId = 1; // 网站ID\n\tstring name = 2;\n}", "doc": "修改用户网站基本信息" }, { @@ -22347,7 +22347,7 @@ }, { "name": "UpdateOriginRequest", - "code": "message UpdateOriginRequest {\n\tint64 originId = 1; // 源站ID\n\tstring name = 2; // 可选项\n\tNetworkAddress addr = 3; // 源站网络地址\n\tbytes ossJSON = 16; // OSS配置信息,源站网络地址中protocol为oss:开头时需要设置此项\n\tstring description = 4; // 可选项\n\tint32 weight = 5; // 权重,不小于0,一般设置为10\n\tbool isOn = 6; // 是否启用\n\tbytes connTimeoutJSON = 7; // 可选项\n\tbytes readTimeoutJSON = 8; // 可选项\n\tbytes idleTimeoutJSON = 9; // 可选项\n\tint32 maxConns = 10; // 可选项\n\tint32 maxIdleConns = 11; // 可选项\n\trepeated string domains = 12; // 可选项\n\tbytes certRefJSON = 13; // 可选项\n\tstring host = 14; // 可选项\n\tbool followPort = 15; // 可选项\n}", + "code": "message UpdateOriginRequest {\n\tint64 originId = 1; // 源站ID\n\tstring name = 2; // 可选项\n\tNetworkAddress addr = 3; // 源站网络地址\n\tbytes ossJSON = 16; // OSS配置信息,源站网络地址中protocol为oss:开头时需要设置此项\n\tstring description = 4; // 可选项\n\tint32 weight = 5; // 权重,不小于0,一般设置为10\n\tbool isOn = 6; // 是否启用\n\tbytes connTimeoutJSON = 7; // 可选项\n\tbytes readTimeoutJSON = 8; // 可选项\n\tbytes idleTimeoutJSON = 9; // 可选项\n\tint32 maxConns = 10; // 可选项\n\tint32 maxIdleConns = 11; // 可选项\n\trepeated string domains = 12; // 可选项\n\tbytes certRefJSON = 13; // 可选项\n\tstring host = 14; // 可选项\n\tbool followPort = 15; // 可选项\n\tbool http2Enabled = 17; // 可选项,是否支持HTTP/2,只在HTTPS源站时生效\n}", "doc": "修改源站" }, { @@ -22447,12 +22447,12 @@ }, { "name": "UpdateServerDNSNameRequest", - "code": "message UpdateServerDNSNameRequest {\n\tint64 serverId = 1;\n\tstring dnsName = 2;\n}", + "code": "message UpdateServerDNSNameRequest {\n\tint64 serverId = 1; // 网站ID\n\tstring dnsName = 2;\n}", "doc": "修改网站的CNAME" }, { "name": "UpdateServerDNSRequest", - "code": "message UpdateServerDNSRequest {\n\tint64 serverId = 1;\n\tbool supportCNAME = 2;\n}", + "code": "message UpdateServerDNSRequest {\n\tint64 serverId = 1; // 网站ID\n\tbool supportCNAME = 2;\n}", "doc": "修改网站的DNS相关设置" }, { @@ -22462,7 +22462,7 @@ }, { "name": "UpdateServerGroupIdsRequest", - "code": "message UpdateServerGroupIdsRequest {\n\tint64 serverId = 1;\n\trepeated int64 serverGroupIds = 2;\n}", + "code": "message UpdateServerGroupIdsRequest {\n\tint64 serverId = 1; // 网站ID\n\trepeated int64 serverGroupIds = 2;\n}", "doc": "修改网站所在分组" }, { @@ -22487,17 +22487,17 @@ }, { "name": "UpdateServerHTTPRequest", - "code": "message UpdateServerHTTPRequest {\n\tint64 serverId = 1;\n\tbytes httpJSON = 2;\n}", + "code": "message UpdateServerHTTPRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes httpJSON = 2; // HTTP协议设置,当type为httpProxy或者httpWeb时填写 @link json:http_protocol\n}", "doc": "修改网站的HTTP等设置" }, { "name": "UpdateServerHTTPSRequest", - "code": "message UpdateServerHTTPSRequest {\n\tint64 serverId = 1;\n\tbytes httpsJSON = 2;\n}", + "code": "message UpdateServerHTTPSRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes httpsJSON = 2; // HTTPS协议设置,当type为httpProxy或者httpWeb时填写 @link json:https_protocol\n}", "doc": "" }, { "name": "UpdateServerIsOnRequest", - "code": "message UpdateServerIsOnRequest {\n\tint64 serverId = 1;\n\tbool isOn = 2;\n}", + "code": "message UpdateServerIsOnRequest {\n\tint64 serverId = 1; // 网站ID\n\tbool isOn = 2;\n}", "doc": "修改网站启是否启用" }, { @@ -22507,62 +22507,62 @@ }, { "name": "UpdateServerNamesAuditingRequest", - "code": "message UpdateServerNamesAuditingRequest {\n\tint64 serverId = 1;\n\tServerNameAuditingResult auditingResult = 2;\n}", + "code": "message UpdateServerNamesAuditingRequest {\n\tint64 serverId = 1; // 网站ID\n\tServerNameAuditingResult auditingResult = 2;\n}", "doc": "审核网站的域名设置" }, { "name": "UpdateServerNamesRequest", - "code": "message UpdateServerNamesRequest {\n\tint64 serverId = 1;\n\tbytes serverNamesJSON = 2;\n}", + "code": "message UpdateServerNamesRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes serverNamesJSON = 2; // 域名列表 @link json:server_names\n}", "doc": "修改网站的域名设置" }, { "name": "UpdateServerReverseProxyRequest", - "code": "message UpdateServerReverseProxyRequest {\n\tint64 serverId = 1;\n\tbytes reverseProxyJSON = 2;\n}", + "code": "message UpdateServerReverseProxyRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes reverseProxyJSON = 2; // 反向代理(包含源站)配置引用,此项可以在创建网站后再设置 @link json:reverse_proxy_ref\n}", "doc": "修改网站的反向代理设置" }, { "name": "UpdateServerTCPRequest", - "code": "message UpdateServerTCPRequest {\n\tint64 serverId = 1;\n\tbytes tcpJSON = 2;\n}", + "code": "message UpdateServerTCPRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes tcpJSON = 2; // TCP协议设置,当type为tcpProxy时填写 @link json:tcp_protocol\n}", "doc": "" }, { "name": "UpdateServerTLSRequest", - "code": "message UpdateServerTLSRequest {\n\tint64 serverId = 1;\n\tbytes tlsJSON = 2;\n}", + "code": "message UpdateServerTLSRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes tlsJSON = 2; // TLS协议设置,当type为tcpProxy时填写 @link json:tls_protocol\n}", "doc": "" }, { "name": "UpdateServerTrafficLimitRequest", - "code": "message UpdateServerTrafficLimitRequest {\n\tint64 serverId = 1;\n\tbytes trafficLimitJSON = 2;\n}", + "code": "message UpdateServerTrafficLimitRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes trafficLimitJSON = 2;\n}", "doc": "设置流量限制" }, { "name": "UpdateServerUAMRequest", - "code": "message UpdateServerUAMRequest {\n\tint64 serverId = 1;\n\tbytes uamJSON = 2;\n}", + "code": "message UpdateServerUAMRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes uamJSON = 2;\n}", "doc": "修改网站UAM设置" }, { "name": "UpdateServerUDPRequest", - "code": "message UpdateServerUDPRequest {\n\tint64 serverId = 1;\n\tbytes udpJSON = 2;\n}", + "code": "message UpdateServerUDPRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes udpJSON = 2; // UDP协议设置,当type为udpProxy时填写 @link json:udp_protocol\n}", "doc": "" }, { "name": "UpdateServerUnixRequest", - "code": "message UpdateServerUnixRequest {\n\tint64 serverId = 1;\n\tbytes unixJSON = 2;\n}", + "code": "message UpdateServerUnixRequest {\n\tint64 serverId = 1; // 网站ID\n\tbytes unixJSON = 2;\n}", "doc": "" }, { "name": "UpdateServerUserPlanRequest", - "code": "message UpdateServerUserPlanRequest {\n\tint64 serverId = 1;\n\tint64 userPlanId = 2;\n}", + "code": "message UpdateServerUserPlanRequest {\n\tint64 serverId = 1; // 网站ID\n\tint64 userPlanId = 2;\n}", "doc": "修改网站套餐" }, { "name": "UpdateServerUserRequest", - "code": "message UpdateServerUserRequest {\n\tint64 serverId = 1;\n\tint64 userId = 2;\n}", + "code": "message UpdateServerUserRequest {\n\tint64 serverId = 1; // 网站ID\n\tint64 userId = 2;\n}", "doc": "修改网站所属用户" }, { "name": "UpdateServerWebRequest", - "code": "message UpdateServerWebRequest {\n\tint64 serverId = 1;\n\tint64 webId = 2;\n}", + "code": "message UpdateServerWebRequest {\n\tint64 serverId = 1; // 网站ID\n\tint64 webId = 2;\n}", "doc": "" }, { @@ -22702,7 +22702,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\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}", + "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; // 网站ID\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; // 网站ID\n\t\tint64 count = 3;\n\t\tint64 providerId = 4;\n\t}\n\n\n\tmessage System {\n\t\tint64 serverId = 1; // 网站ID\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; // 网站ID\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; // 网站ID\n\t\tint64 httpFirewallRuleGroupId = 2;\n\t\tstring action = 3;\n\t\tint64 count = 4;\n\t}\n}", "doc": "上传HTTP请求待统计数据" }, { diff --git a/pkg/rpc/pb/model_origin.pb.go b/pkg/rpc/pb/model_origin.pb.go index cc77cb0..103c013 100644 --- a/pkg/rpc/pb/model_origin.pb.go +++ b/pkg/rpc/pb/model_origin.pb.go @@ -30,15 +30,16 @@ type Origin struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - IsOn bool `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Addr *NetworkAddress `protobuf:"bytes,4,opt,name=addr,proto3" json:"addr,omitempty"` // 源站网络地址 - OssJSON []byte `protobuf:"bytes,9,opt,name=ossJSON,proto3" json:"ossJSON,omitempty"` // 源站网络地址为oss:开头时有此内容 - Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"` - Domains []string `protobuf:"bytes,6,rep,name=domains,proto3" json:"domains,omitempty"` - Host string `protobuf:"bytes,7,opt,name=host,proto3" json:"host,omitempty"` - FollowPort bool `protobuf:"varint,8,opt,name=followPort,proto3" json:"followPort,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + IsOn bool `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Addr *NetworkAddress `protobuf:"bytes,4,opt,name=addr,proto3" json:"addr,omitempty"` // 源站网络地址 + OssJSON []byte `protobuf:"bytes,9,opt,name=ossJSON,proto3" json:"ossJSON,omitempty"` // 源站网络地址为oss:开头时有此内容 + Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"` + Domains []string `protobuf:"bytes,6,rep,name=domains,proto3" json:"domains,omitempty"` + Host string `protobuf:"bytes,7,opt,name=host,proto3" json:"host,omitempty"` + FollowPort bool `protobuf:"varint,8,opt,name=followPort,proto3" json:"followPort,omitempty"` + Http2Enabled bool `protobuf:"varint,10,opt,name=http2Enabled,proto3" json:"http2Enabled,omitempty"` // 是否支持HTTP/2,只在HTTPS源站时生效 } func (x *Origin) Reset() { @@ -136,6 +137,13 @@ func (x *Origin) GetFollowPort() bool { return false } +func (x *Origin) GetHttp2Enabled() bool { + if x != nil { + return x.Http2Enabled + } + return false +} + var File_models_model_origin_proto protoreflect.FileDescriptor var file_models_model_origin_proto_rawDesc = []byte{ @@ -143,7 +151,7 @@ var file_models_model_origin_proto_rawDesc = []byte{ 0x72, 0x69, 0x67, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0xf2, 0x01, 0x0a, 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x0e, + 0x6f, 0x74, 0x6f, 0x22, 0x96, 0x02, 0x0a, 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, @@ -158,8 +166,10 @@ var file_models_model_origin_proto_rawDesc = []byte{ 0x61, 0x69, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x66, 0x6f, - 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x74, 0x74, 0x70, + 0x32, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, + 0x68, 0x74, 0x74, 0x70, 0x32, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/rpc/pb/service_origin.pb.go b/pkg/rpc/pb/service_origin.pb.go index cea54df..176faf4 100644 --- a/pkg/rpc/pb/service_origin.pb.go +++ b/pkg/rpc/pb/service_origin.pb.go @@ -41,15 +41,16 @@ type CreateOriginRequest struct { Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` // 描述,为可选项 Weight int32 `protobuf:"varint,4,opt,name=weight,proto3" json:"weight,omitempty"` // 权重,不小于0,一般设置为10 IsOn bool `protobuf:"varint,5,opt,name=isOn,proto3" json:"isOn,omitempty"` // 是否启用 - ConnTimeoutJSON []byte `protobuf:"bytes,6,opt,name=connTimeoutJSON,proto3" json:"connTimeoutJSON,omitempty"` // 可选项 - ReadTimeoutJSON []byte `protobuf:"bytes,7,opt,name=readTimeoutJSON,proto3" json:"readTimeoutJSON,omitempty"` // 可选项 - IdleTimeoutJSON []byte `protobuf:"bytes,8,opt,name=idleTimeoutJSON,proto3" json:"idleTimeoutJSON,omitempty"` // 可选项 - MaxConns int32 `protobuf:"varint,9,opt,name=maxConns,proto3" json:"maxConns,omitempty"` // 可选项 - MaxIdleConns int32 `protobuf:"varint,10,opt,name=maxIdleConns,proto3" json:"maxIdleConns,omitempty"` // 可选项 - Domains []string `protobuf:"bytes,11,rep,name=domains,proto3" json:"domains,omitempty"` // 可选项 - CertRefJSON []byte `protobuf:"bytes,12,opt,name=certRefJSON,proto3" json:"certRefJSON,omitempty"` // 可选项 - Host string `protobuf:"bytes,13,opt,name=host,proto3" json:"host,omitempty"` // 可选项 - FollowPort bool `protobuf:"varint,14,opt,name=followPort,proto3" json:"followPort,omitempty"` // 可选项 + ConnTimeoutJSON []byte `protobuf:"bytes,6,opt,name=connTimeoutJSON,proto3" json:"connTimeoutJSON,omitempty"` // 可选项,连接超时时间 + ReadTimeoutJSON []byte `protobuf:"bytes,7,opt,name=readTimeoutJSON,proto3" json:"readTimeoutJSON,omitempty"` // 可选项,读取超时时间 + IdleTimeoutJSON []byte `protobuf:"bytes,8,opt,name=idleTimeoutJSON,proto3" json:"idleTimeoutJSON,omitempty"` // 可选项,空闲超时时间 + MaxConns int32 `protobuf:"varint,9,opt,name=maxConns,proto3" json:"maxConns,omitempty"` // 可选项,最大连接数 + MaxIdleConns int32 `protobuf:"varint,10,opt,name=maxIdleConns,proto3" json:"maxIdleConns,omitempty"` // 可选项,最大空闲连接数 + Domains []string `protobuf:"bytes,11,rep,name=domains,proto3" json:"domains,omitempty"` // 可选项,专属域名列表 + CertRefJSON []byte `protobuf:"bytes,12,opt,name=certRefJSON,proto3" json:"certRefJSON,omitempty"` // 可选项,证书设置 + Host string `protobuf:"bytes,13,opt,name=host,proto3" json:"host,omitempty"` // 可选项,回源主机名 + FollowPort bool `protobuf:"varint,14,opt,name=followPort,proto3" json:"followPort,omitempty"` // 可选项,是否跟随端口 + Http2Enabled bool `protobuf:"varint,16,opt,name=http2Enabled,proto3" json:"http2Enabled,omitempty"` // 可选项,是否支持HTTP/2,只在HTTPS源站时生效 } func (x *CreateOriginRequest) Reset() { @@ -189,6 +190,13 @@ func (x *CreateOriginRequest) GetFollowPort() bool { return false } +func (x *CreateOriginRequest) GetHttp2Enabled() bool { + if x != nil { + return x.Http2Enabled + } + return false +} + type CreateOriginResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -258,6 +266,7 @@ type UpdateOriginRequest struct { CertRefJSON []byte `protobuf:"bytes,13,opt,name=certRefJSON,proto3" json:"certRefJSON,omitempty"` // 可选项 Host string `protobuf:"bytes,14,opt,name=host,proto3" json:"host,omitempty"` // 可选项 FollowPort bool `protobuf:"varint,15,opt,name=followPort,proto3" json:"followPort,omitempty"` // 可选项 + Http2Enabled bool `protobuf:"varint,17,opt,name=http2Enabled,proto3" json:"http2Enabled,omitempty"` // 可选项,是否支持HTTP/2,只在HTTPS源站时生效 } func (x *UpdateOriginRequest) Reset() { @@ -404,6 +413,13 @@ func (x *UpdateOriginRequest) GetFollowPort() bool { return false } +func (x *UpdateOriginRequest) GetHttp2Enabled() bool { + if x != nil { + return x.Http2Enabled + } + return false +} + // 查找单个源站信息 type FindEnabledOriginRequest struct { state protoimpl.MessageState @@ -604,7 +620,7 @@ var file_service_origin_proto_rawDesc = []byte{ 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x03, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8b, 0x04, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, @@ -634,80 +650,84 @@ var file_service_origin_proto_rawDesc = []byte{ 0x65, 0x72, 0x74, 0x52, 0x65, 0x66, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x0e, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0a, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x22, 0x32, - 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, - 0x49, 0x64, 0x22, 0x83, 0x04, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, - 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, + 0x28, 0x08, 0x52, 0x0a, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x22, + 0x0a, 0x0c, 0x68, 0x74, 0x74, 0x70, 0x32, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x10, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x68, 0x74, 0x74, 0x70, 0x32, 0x45, 0x6e, 0x61, 0x62, 0x6c, + 0x65, 0x64, 0x22, 0x32, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, + 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, - 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x61, 0x64, - 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x61, 0x64, - 0x64, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x73, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x10, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x07, 0x6f, 0x73, 0x73, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x20, 0x0a, 0x0b, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, - 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x28, 0x0a, 0x0f, 0x63, 0x6f, - 0x6e, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x72, - 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x28, - 0x0a, 0x0f, 0x69, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, - 0x4e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x69, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x61, 0x78, 0x43, - 0x6f, 0x6e, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x43, - 0x6f, 0x6e, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x49, 0x64, 0x6c, 0x65, 0x43, - 0x6f, 0x6e, 0x6e, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x49, - 0x64, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x64, 0x6f, 0x6d, 0x61, 0x69, - 0x6e, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x65, 0x72, 0x74, 0x52, 0x65, 0x66, 0x4a, 0x53, 0x4f, - 0x4e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x63, 0x65, 0x72, 0x74, 0x52, 0x65, 0x66, - 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x0e, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x66, 0x6f, 0x6c, 0x6c, - 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x66, 0x6f, - 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x22, 0x36, 0x0a, 0x18, 0x46, 0x69, 0x6e, 0x64, - 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, - 0x22, 0x3f, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, - 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, - 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, - 0x70, 0x62, 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, - 0x6e, 0x22, 0x3c, 0x0a, 0x1e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, - 0x41, 0x0a, 0x1f, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, - 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x4a, 0x53, 0x4f, 0x4e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x4a, 0x53, - 0x4f, 0x4e, 0x32, 0xc1, 0x02, 0x0a, 0x0d, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x0c, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, - 0x69, 0x67, 0x69, 0x6e, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, - 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x12, 0x50, 0x0a, 0x11, 0x66, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, - 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, - 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, - 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x62, 0x0a, 0x17, 0x66, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, - 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x22, 0x2e, + 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, 0xa7, 0x04, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, + 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, + 0x0a, 0x04, 0x61, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, + 0x62, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x52, 0x04, 0x61, 0x64, 0x64, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x73, 0x73, 0x4a, 0x53, 0x4f, + 0x4e, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x6f, 0x73, 0x73, 0x4a, 0x53, 0x4f, 0x4e, + 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, + 0x4f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x28, + 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, + 0x4e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x6e, 0x54, 0x69, 0x6d, + 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x28, 0x0a, 0x0f, 0x72, 0x65, 0x61, 0x64, + 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x0f, 0x72, 0x65, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, + 0x4f, 0x4e, 0x12, 0x28, 0x0a, 0x0f, 0x69, 0x64, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, + 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0f, 0x69, 0x64, 0x6c, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x1a, 0x0a, 0x08, + 0x6d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x6d, 0x61, 0x78, 0x43, 0x6f, 0x6e, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x49, + 0x64, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, + 0x6d, 0x61, 0x78, 0x49, 0x64, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x64, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x65, 0x72, 0x74, 0x52, 0x65, + 0x66, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x63, 0x65, 0x72, + 0x74, 0x52, 0x65, 0x66, 0x4a, 0x53, 0x4f, 0x4e, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, + 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, + 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0a, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x22, 0x0a, 0x0c, + 0x68, 0x74, 0x74, 0x70, 0x32, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x11, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0c, 0x68, 0x74, 0x74, 0x70, 0x32, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x22, 0x36, 0x0a, 0x18, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, + 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, + 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, + 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x19, 0x46, 0x69, 0x6e, 0x64, + 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x4f, 0x72, 0x69, 0x67, 0x69, + 0x6e, 0x52, 0x06, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x22, 0x3c, 0x0a, 0x1e, 0x46, 0x69, 0x6e, + 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x6f, + 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, + 0x72, 0x69, 0x67, 0x69, 0x6e, 0x49, 0x64, 0x22, 0x41, 0x0a, 0x1f, 0x46, 0x69, 0x6e, 0x64, 0x45, + 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x72, + 0x69, 0x67, 0x69, 0x6e, 0x4a, 0x53, 0x4f, 0x4e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, + 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x4a, 0x53, 0x4f, 0x4e, 0x32, 0xc1, 0x02, 0x0a, 0x0d, 0x4f, + 0x72, 0x69, 0x67, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x0c, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x17, 0x2e, 0x70, + 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x37, 0x0a, 0x0c, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, + 0x17, 0x2e, 0x70, 0x62, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x69, 0x67, 0x69, + 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0e, 0x2e, 0x70, 0x62, 0x2e, 0x52, 0x50, + 0x43, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x50, 0x0a, 0x11, 0x66, 0x69, 0x6e, 0x64, + 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, - 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, - 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x62, + 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, + 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x62, 0x0a, 0x17, 0x66, 0x69, + 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x22, 0x2e, 0x70, 0x62, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x45, + 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x62, 0x2e, 0x46, + 0x69, 0x6e, 0x64, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x4f, 0x72, 0x69, 0x67, 0x69, 0x6e, + 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 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_server.pb.go b/pkg/rpc/pb/service_server.pb.go index 2b203cf..fb084ad 100644 --- a/pkg/rpc/pb/service_server.pb.go +++ b/pkg/rpc/pb/service_server.pb.go @@ -44,12 +44,12 @@ type CreateServerRequest struct { ServerNamesJSON []byte `protobuf:"bytes,8,opt,name=serverNamesJSON,proto3" json:"serverNamesJSON,omitempty"` // 域名列表 @link json:server_names // Deprecated: Do not use. ServerNamesJON []byte `protobuf:"bytes,19,opt,name=serverNamesJON,proto3" json:"serverNamesJON,omitempty"` // 已过期,请使用 serverNamesJSON 代替 - HttpJSON []byte `protobuf:"bytes,9,opt,name=httpJSON,proto3" json:"httpJSON,omitempty"` // HTTP协议,当type为httpProxy或者httpWeb时填写 @link json:http_protocol - HttpsJSON []byte `protobuf:"bytes,10,opt,name=httpsJSON,proto3" json:"httpsJSON,omitempty"` // HTTPS协议,当type为httpProxy或者httpWeb时填写 @link json:https_protocol - TcpJSON []byte `protobuf:"bytes,11,opt,name=tcpJSON,proto3" json:"tcpJSON,omitempty"` // TCP协议,当type为tcpProxy时填写 @link json:tcp_protocol - TlsJSON []byte `protobuf:"bytes,12,opt,name=tlsJSON,proto3" json:"tlsJSON,omitempty"` // TLS协议,当type为tcpProxy时填写 @link json:tls_protocol + HttpJSON []byte `protobuf:"bytes,9,opt,name=httpJSON,proto3" json:"httpJSON,omitempty"` // HTTP协议设置,当type为httpProxy或者httpWeb时填写 @link json:http_protocol + HttpsJSON []byte `protobuf:"bytes,10,opt,name=httpsJSON,proto3" json:"httpsJSON,omitempty"` // HTTPS协议设置,当type为httpProxy或者httpWeb时填写 @link json:https_protocol + TcpJSON []byte `protobuf:"bytes,11,opt,name=tcpJSON,proto3" json:"tcpJSON,omitempty"` // TCP协议设置,当type为tcpProxy时填写 @link json:tcp_protocol + TlsJSON []byte `protobuf:"bytes,12,opt,name=tlsJSON,proto3" json:"tlsJSON,omitempty"` // TLS协议设置,当type为tcpProxy时填写 @link json:tls_protocol UnixJSON []byte `protobuf:"bytes,13,opt,name=unixJSON,proto3" json:"unixJSON,omitempty"` // 备用参数,不用填写 - UdpJSON []byte `protobuf:"bytes,14,opt,name=udpJSON,proto3" json:"udpJSON,omitempty"` // UDP协议,当type为udpProxy时填写 @link json:udp_protocol + UdpJSON []byte `protobuf:"bytes,14,opt,name=udpJSON,proto3" json:"udpJSON,omitempty"` // UDP协议设置,当type为udpProxy时填写 @link json:udp_protocol WebId int64 `protobuf:"varint,15,opt,name=webId,proto3" json:"webId,omitempty"` // 可选项,Web配置ID,当type为httpProxy或者httpWeb时填写,可以通过 /HTTPWebService/createHTTPWeb 接口创建;如果你需要配置缓存等信息时需要在 HTTPWebService 接口操作 ReverseProxyJSON []byte `protobuf:"bytes,16,opt,name=reverseProxyJSON,proto3" json:"reverseProxyJSON,omitempty"` // 反向代理(包含源站)配置引用,此项可以在创建网站后再设置 @link json:reverse_proxy_ref ServerGroupIds []int64 `protobuf:"varint,17,rep,packed,name=serverGroupIds,proto3" json:"serverGroupIds,omitempty"` // 可选项,所属网站分组ID列表 @@ -651,7 +651,7 @@ type UpdateServerGroupIdsRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID ServerGroupIds []int64 `protobuf:"varint,2,rep,packed,name=serverGroupIds,proto3" json:"serverGroupIds,omitempty"` } @@ -707,7 +707,7 @@ type UpdateServerIsOnRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID IsOn bool `protobuf:"varint,2,opt,name=isOn,proto3" json:"isOn,omitempty"` } @@ -763,8 +763,8 @@ type UpdateServerHTTPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` - HttpJSON []byte `protobuf:"bytes,2,opt,name=httpJSON,proto3" json:"httpJSON,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID + HttpJSON []byte `protobuf:"bytes,2,opt,name=httpJSON,proto3" json:"httpJSON,omitempty"` // HTTP协议设置,当type为httpProxy或者httpWeb时填写 @link json:http_protocol } func (x *UpdateServerHTTPRequest) Reset() { @@ -818,8 +818,8 @@ type UpdateServerHTTPSRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` - HttpsJSON []byte `protobuf:"bytes,2,opt,name=httpsJSON,proto3" json:"httpsJSON,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID + HttpsJSON []byte `protobuf:"bytes,2,opt,name=httpsJSON,proto3" json:"httpsJSON,omitempty"` // HTTPS协议设置,当type为httpProxy或者httpWeb时填写 @link json:https_protocol } func (x *UpdateServerHTTPSRequest) Reset() { @@ -873,8 +873,8 @@ type UpdateServerTCPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` - TcpJSON []byte `protobuf:"bytes,2,opt,name=tcpJSON,proto3" json:"tcpJSON,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID + TcpJSON []byte `protobuf:"bytes,2,opt,name=tcpJSON,proto3" json:"tcpJSON,omitempty"` // TCP协议设置,当type为tcpProxy时填写 @link json:tcp_protocol } func (x *UpdateServerTCPRequest) Reset() { @@ -928,8 +928,8 @@ type UpdateServerTLSRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` - TlsJSON []byte `protobuf:"bytes,2,opt,name=tlsJSON,proto3" json:"tlsJSON,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID + TlsJSON []byte `protobuf:"bytes,2,opt,name=tlsJSON,proto3" json:"tlsJSON,omitempty"` // TLS协议设置,当type为tcpProxy时填写 @link json:tls_protocol } func (x *UpdateServerTLSRequest) Reset() { @@ -983,7 +983,7 @@ type UpdateServerUnixRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID UnixJSON []byte `protobuf:"bytes,2,opt,name=unixJSON,proto3" json:"unixJSON,omitempty"` } @@ -1038,8 +1038,8 @@ type UpdateServerUDPRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` - UdpJSON []byte `protobuf:"bytes,2,opt,name=udpJSON,proto3" json:"udpJSON,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID + UdpJSON []byte `protobuf:"bytes,2,opt,name=udpJSON,proto3" json:"udpJSON,omitempty"` // UDP协议设置,当type为udpProxy时填写 @link json:udp_protocol } func (x *UpdateServerUDPRequest) Reset() { @@ -1093,7 +1093,7 @@ type UpdateServerWebRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID WebId int64 `protobuf:"varint,2,opt,name=webId,proto3" json:"webId,omitempty"` } @@ -1149,8 +1149,8 @@ type UpdateServerReverseProxyRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` - ReverseProxyJSON []byte `protobuf:"bytes,2,opt,name=reverseProxyJSON,proto3" json:"reverseProxyJSON,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID + ReverseProxyJSON []byte `protobuf:"bytes,2,opt,name=reverseProxyJSON,proto3" json:"reverseProxyJSON,omitempty"` // 反向代理(包含源站)配置引用,此项可以在创建网站后再设置 @link json:reverse_proxy_ref } func (x *UpdateServerReverseProxyRequest) Reset() { @@ -1205,7 +1205,7 @@ type FindServerNamesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindServerNamesRequest) Reset() { @@ -1252,7 +1252,7 @@ type FindServerNamesResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerNamesJSON []byte `protobuf:"bytes,1,opt,name=serverNamesJSON,proto3" json:"serverNamesJSON,omitempty"` + ServerNamesJSON []byte `protobuf:"bytes,1,opt,name=serverNamesJSON,proto3" json:"serverNamesJSON,omitempty"` // 域名列表 @link json:server_names IsAuditing bool `protobuf:"varint,2,opt,name=isAuditing,proto3" json:"isAuditing,omitempty"` AuditingAt int64 `protobuf:"varint,5,opt,name=auditingAt,proto3" json:"auditingAt,omitempty"` AuditingServerNamesJSON []byte `protobuf:"bytes,3,opt,name=auditingServerNamesJSON,proto3" json:"auditingServerNamesJSON,omitempty"` @@ -1332,8 +1332,8 @@ type UpdateServerNamesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` - ServerNamesJSON []byte `protobuf:"bytes,2,opt,name=serverNamesJSON,proto3" json:"serverNamesJSON,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID + ServerNamesJSON []byte `protobuf:"bytes,2,opt,name=serverNamesJSON,proto3" json:"serverNamesJSON,omitempty"` // 域名列表 @link json:server_names } func (x *UpdateServerNamesRequest) Reset() { @@ -1388,7 +1388,7 @@ type UpdateServerNamesAuditingRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID AuditingResult *ServerNameAuditingResult `protobuf:"bytes,2,opt,name=auditingResult,proto3" json:"auditingResult,omitempty"` } @@ -1444,7 +1444,7 @@ type UpdateServerDNSRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID SupportCNAME bool `protobuf:"varint,2,opt,name=supportCNAME,proto3" json:"supportCNAME,omitempty"` } @@ -1500,7 +1500,7 @@ type RegenerateServerDNSNameRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *RegenerateServerDNSNameRequest) Reset() { @@ -1548,7 +1548,7 @@ type UpdateServerDNSNameRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID DnsName string `protobuf:"bytes,2,opt,name=dnsName,proto3" json:"dnsName,omitempty"` } @@ -1659,7 +1659,7 @@ type FindServerIdWithDNSNameResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindServerIdWithDNSNameResponse) Reset() { @@ -1978,7 +1978,7 @@ type DeleteServerRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *DeleteServerRequest) Reset() { @@ -2129,7 +2129,7 @@ type FindEnabledServerConfigRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindEnabledServerConfigRequest) Reset() { @@ -2224,7 +2224,7 @@ type FindEnabledServerTypeRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindEnabledServerTypeRequest) Reset() { @@ -2319,7 +2319,7 @@ type FindAndInitServerReverseProxyConfigRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindAndInitServerReverseProxyConfigRequest) Reset() { @@ -2422,7 +2422,7 @@ type FindAndInitServerWebConfigRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindAndInitServerWebConfigRequest) Reset() { @@ -2991,7 +2991,7 @@ type FindEnabledServerDNSRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindEnabledServerDNSRequest) Reset() { @@ -3102,7 +3102,7 @@ type CheckUserServerRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *CheckUserServerRequest) Reset() { @@ -3435,7 +3435,7 @@ type FindEnabledUserServerBasicRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindEnabledUserServerBasicRequest) Reset() { @@ -3530,7 +3530,7 @@ type UpdateEnabledUserServerBasicRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` } @@ -3896,7 +3896,7 @@ type FindNearbyServersRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindNearbyServersRequest) Reset() { @@ -4118,7 +4118,7 @@ type FindEnabledServerTrafficLimitRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindEnabledServerTrafficLimitRequest) Reset() { @@ -4213,7 +4213,7 @@ type UpdateServerTrafficLimitRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID TrafficLimitJSON []byte `protobuf:"bytes,2,opt,name=trafficLimitJSON,proto3" json:"trafficLimitJSON,omitempty"` } @@ -4269,7 +4269,7 @@ type UpdateServerUserPlanRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID UserPlanId int64 `protobuf:"varint,2,opt,name=userPlanId,proto3" json:"userPlanId,omitempty"` } @@ -4325,7 +4325,7 @@ type FindServerUserPlanRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindServerUserPlanRequest) Reset() { @@ -4420,7 +4420,7 @@ type ComposeServerConfigRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *ComposeServerConfigRequest) Reset() { @@ -4515,7 +4515,7 @@ type UpdateServerUAMRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID UamJSON []byte `protobuf:"bytes,2,opt,name=uamJSON,proto3" json:"uamJSON,omitempty"` } @@ -4571,7 +4571,7 @@ type FindEnabledServerUAMRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID } func (x *FindEnabledServerUAMRequest) Reset() { @@ -4666,7 +4666,7 @@ type UpdateServerUserRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID UserId int64 `protobuf:"varint,2,opt,name=userId,proto3" json:"userId,omitempty"` } @@ -4873,7 +4873,7 @@ type UploadServerHTTPRequestStatRequest_RegionCity struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID 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"` @@ -4976,7 +4976,7 @@ type UploadServerHTTPRequestStatRequest_RegionProvider struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID Count int64 `protobuf:"varint,3,opt,name=count,proto3" json:"count,omitempty"` ProviderId int64 `protobuf:"varint,4,opt,name=providerId,proto3" json:"providerId,omitempty"` } @@ -5039,7 +5039,7 @@ type UploadServerHTTPRequestStatRequest_System struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` Count int64 `protobuf:"varint,4,opt,name=count,proto3" json:"count,omitempty"` @@ -5110,7 +5110,7 @@ type UploadServerHTTPRequestStatRequest_Browser struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` Count int64 `protobuf:"varint,4,opt,name=count,proto3" json:"count,omitempty"` @@ -5181,7 +5181,7 @@ type UploadServerHTTPRequestStatRequest_HTTPFirewallRuleGroup struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` + ServerId int64 `protobuf:"varint,1,opt,name=serverId,proto3" json:"serverId,omitempty"` // 网站ID HttpFirewallRuleGroupId int64 `protobuf:"varint,2,opt,name=httpFirewallRuleGroupId,proto3" json:"httpFirewallRuleGroupId,omitempty"` Action string `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"` Count int64 `protobuf:"varint,4,opt,name=count,proto3" json:"count,omitempty"` diff --git a/pkg/rpc/protos/models/model_origin.proto b/pkg/rpc/protos/models/model_origin.proto index 3963416..a69f4e6 100644 --- a/pkg/rpc/protos/models/model_origin.proto +++ b/pkg/rpc/protos/models/model_origin.proto @@ -15,4 +15,5 @@ message Origin { repeated string domains = 6; string host = 7; bool followPort = 8; + bool http2Enabled = 10; // 是否支持HTTP/2,只在HTTPS源站时生效 } \ No newline at end of file diff --git a/pkg/rpc/protos/service_origin.proto b/pkg/rpc/protos/service_origin.proto index 3f9749b..ea4e1c9 100644 --- a/pkg/rpc/protos/service_origin.proto +++ b/pkg/rpc/protos/service_origin.proto @@ -30,15 +30,16 @@ message CreateOriginRequest { string description = 3; // 描述,为可选项 int32 weight = 4; // 权重,不小于0,一般设置为10 bool isOn = 5; // 是否启用 - bytes connTimeoutJSON = 6; // 可选项 - bytes readTimeoutJSON = 7; // 可选项 - bytes idleTimeoutJSON = 8; // 可选项 - int32 maxConns = 9; // 可选项 - int32 maxIdleConns = 10; // 可选项 - repeated string domains = 11; // 可选项 - bytes certRefJSON = 12; // 可选项 - string host = 13; // 可选项 - bool followPort = 14; // 可选项 + bytes connTimeoutJSON = 6; // 可选项,连接超时时间 + bytes readTimeoutJSON = 7; // 可选项,读取超时时间 + bytes idleTimeoutJSON = 8; // 可选项,空闲超时时间 + int32 maxConns = 9; // 可选项,最大连接数 + int32 maxIdleConns = 10; // 可选项,最大空闲连接数 + repeated string domains = 11; // 可选项,专属域名列表 + bytes certRefJSON = 12; // 可选项,证书设置 + string host = 13; // 可选项,回源主机名 + bool followPort = 14; // 可选项,是否跟随端口 + bool http2Enabled = 16; // 可选项,是否支持HTTP/2,只在HTTPS源站时生效 } message CreateOriginResponse { @@ -63,6 +64,7 @@ message UpdateOriginRequest { bytes certRefJSON = 13; // 可选项 string host = 14; // 可选项 bool followPort = 15; // 可选项 + bool http2Enabled = 17; // 可选项,是否支持HTTP/2,只在HTTPS源站时生效 } // 查找单个源站信息 diff --git a/pkg/serverconfigs/origin_config.go b/pkg/serverconfigs/origin_config.go index bb541fe..89a5891 100644 --- a/pkg/serverconfigs/origin_config.go +++ b/pkg/serverconfigs/origin_config.go @@ -14,30 +14,31 @@ import ( // OriginConfig 源站服务配置 type OriginConfig struct { - Id int64 `yaml:"id" json:"id"` // ID - IsOn bool `yaml:"isOn" json:"isOn"` // 是否启用 - Version int `yaml:"version" json:"version"` // 版本 - Name string `yaml:"name" json:"name"` // 名称 - Addr *NetworkAddressConfig `yaml:"addr" json:"addr"` // 地址 - OSS *ossconfigs.OSSConfig `yaml:"oss" json:"oss"` // 对象存储配置 - Description string `yaml:"description" json:"description"` // 描述 TODO - Code string `yaml:"code" json:"code"` // 代号 TODO + Id int64 `yaml:"id" json:"id"` // ID + IsOn bool `yaml:"isOn" json:"isOn"` // 是否启用 + Version int `yaml:"version" json:"version"` // 版本 + Name string `yaml:"name" json:"name"` // 名称 + Addr *NetworkAddressConfig `yaml:"addr" json:"addr"` // 地址 + HTTP2Enabled bool `yaml:"http2Enabled" json:"http2Enabled"` // 是否支持HTTP2 + OSS *ossconfigs.OSSConfig `yaml:"oss" json:"oss"` // 对象存储配置 + Description string `yaml:"description" json:"description"` // 描述 + Code string `yaml:"code" json:"code"` // 代号 Weight uint `yaml:"weight" json:"weight"` // 权重 ConnTimeout *shared.TimeDuration `yaml:"connTimeout" json:"connTimeout"` // 连接失败超时 ReadTimeout *shared.TimeDuration `yaml:"readTimeout" json:"readTimeout"` // 读取超时时间 IdleTimeout *shared.TimeDuration `yaml:"idleTimeout" json:"idleTimeout"` // 空闲连接超时时间 - MaxFails int `yaml:"maxFails" json:"maxFails"` // 最多失败次数 TODO + MaxFails int `yaml:"maxFails" json:"maxFails"` // 最多失败次数 MaxConns int `yaml:"maxConns" json:"maxConns"` // 最大并发连接数 MaxIdleConns int `yaml:"idleConns" json:"idleConns"` // 最大空闲连接数 Domains []string `yaml:"domains" json:"domains"` // 所属域名 StripPrefix string `yaml:"stripPrefix" json:"stripPrefix"` // 去除URL前缀 - RequestURI string `yaml:"requestURI" json:"requestURI"` // 转发后的请求URI TODO + RequestURI string `yaml:"requestURI" json:"requestURI"` // 转发后的请求URI RequestHost string `yaml:"requestHost" json:"requestHost"` // 自定义主机名 FollowPort bool `yaml:"followPort" json:"followPort"` // 端口跟随 - FollowProtocol *FollowProtocolConfig `yaml:"followProtocol" json:"followProtocol"` // 协议跟随 TODO + FollowProtocol *FollowProtocolConfig `yaml:"followProtocol" json:"followProtocol"` // 协议跟随 RequestHeaderPolicyRef *shared.HTTPHeaderPolicyRef `yaml:"requestHeaderPolicyRef" json:"requestHeaderPolicyRef"` // 请求Header RequestHeaderPolicy *shared.HTTPHeaderPolicy `yaml:"requestHeaderPolicy" json:"requestHeaderPolicy"` // 请求Header策略