阶段性提交

pkg/rpc/protos/model_http_web.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+message HTTPWeb {
+	int64 id = 1;
+	string root = 2;
+}

pkg/rpc/protos/model_reverse_proxy.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+message ReverseProxy {
+	int64 id = 1;
+	bytes schedulingJSON = 2;
+	bytes primaryOriginsJSON = 3;
+	bytes backupOriginsJSON = 4;
+}

pkg/rpc/protos/model_server.proto

@@ -7,13 +7,24 @@ import "model_node_cluster.proto";
 
 message Server {
 	int64 id = 1;
-	bytes config = 2;
-	string type = 3;
-	string name = 4;
-	string description = 5;
-	bytes includeNodes = 6;
-	bytes excludeNodes = 7;
-	int64 createdAt = 8;
+	string type = 2;
+	string name = 3;
+	string description = 4;
+	bytes includeNodes = 5;
+	bytes excludeNodes = 6;
+	int64 createdAt = 7;
 
-	NodeCluster cluster = 10;
+	// 配置相关
+	bytes config = 17;
+	bytes serverNamesJON = 8;
+	bytes httpJSON = 9;
+	bytes httpsJSON = 10;
+	bytes tcpJSON = 11;
+	bytes tlsJSON = 12;
+	bytes unixJSON = 13;
+	bytes udpJSON = 14;
+	int64 webId = 15;
+	int64 reverseProxyId = 16;
+
+	NodeCluster cluster = 30;
 }

pkg/rpc/protos/service_http_web.proto

@@ -0,0 +1,45 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "model_http_web.proto";
+
+service HTTPWebService {
+	// 创建Web配置
+	rpc createHTTPWeb (CreateHTTPWebRequest) returns (CreateHTTPWebResponse);
+
+	// 查找Web配置
+	rpc findEnabledHTTPWeb (FindEnabledHTTPWebRequest) returns (FindEnabledHTTPWebResponse);
+
+	// 更新Web配置
+	rpc updateHTTPWeb (UpdateHTTPWebRequest) returns (UpdateHTTPWebResponse);
+}
+
+// 创建Web配置
+message CreateHTTPWebRequest {
+	string root = 1;
+}
+
+message CreateHTTPWebResponse {
+	int64 webId = 1;
+}
+
+// 查找Web配置
+message FindEnabledHTTPWebRequest {
+	int64 webId = 1;
+}
+
+message FindEnabledHTTPWebResponse {
+	HTTPWeb web = 1;
+}
+
+// 更新Web配置
+message UpdateHTTPWebRequest {
+	int64 webId = 1;
+	string root = 2;
+}
+
+message UpdateHTTPWebResponse {
+
+}

pkg/rpc/protos/service_origin_server.proto

@@ -15,6 +15,9 @@ service OriginServerService {
 
 	// 查找单个源站信息
 	rpc findEnabledOriginServer (FindEnabledOriginServerRequest) returns (FindEnabledOriginServerResponse);
+
+	// 查找源站配置
+	rpc findEnabledOriginServerConfig (FindEnabledOriginServerConfigRequest) returns (FindEnabledOriginServerConfigResponse);
 }
 
 // 创建源站
@@ -47,4 +50,13 @@ message FindEnabledOriginServerRequest {
 
 message FindEnabledOriginServerResponse {
 	OriginServer Origin = 1;
+}
+
+// 查找源站配置
+message FindEnabledOriginServerConfigRequest {
+	int64 originId = 1;
+}
+
+message FindEnabledOriginServerConfigResponse {
+	bytes config = 1;
 }

pkg/rpc/protos/service_reverse_proxy.proto

@@ -0,0 +1,85 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "model_reverse_proxy.proto";
+
+service ReverseProxyService {
+	// 创建反向代理
+	rpc createReverseProxy (CreateReverseProxyRequest) returns (CreateReverseProxyResponse);
+
+	// 查找反向代理
+	rpc findEnabledReverseProxy (FindEnabledReverseProxyRequest) returns (FindEnabledReverseProxyResponse);
+
+	// 查找反向代理配置
+	rpc findEnabledReverseProxyConfig (FindEnabledReverseProxyConfigRequest) returns (FindEnabledReverseProxyConfigResponse);
+
+	// 修改反向代理的调度算法
+	rpc updateReverseProxyScheduling (UpdateReverseProxySchedulingRequest) returns (UpdateReverseProxySchedulingResponse);
+
+	// 修改主要源站信息
+	rpc updateReverseProxyPrimaryOrigins (UpdateReverseProxyPrimaryOriginsRequest) returns (UpdateReverseProxyPrimaryOriginsResponse);
+
+	// 修改备用源站信息
+	rpc updateReverseProxyBackupOrigins (UpdateReverseProxyBackupOriginsRequest) returns (UpdateReverseProxyBackupOriginsResponse);
+}
+
+// 创建反向代理
+message CreateReverseProxyRequest {
+	bytes schedulingJSON = 1;
+	bytes primaryOriginsJSON = 2;
+	bytes backupOriginsJSON = 3;
+}
+
+message CreateReverseProxyResponse {
+	int64 reverseProxyId = 1;
+}
+
+// 查找反向代理
+message FindEnabledReverseProxyRequest {
+	int64 reverseProxyId = 1;
+}
+
+message FindEnabledReverseProxyResponse {
+	ReverseProxy reverseProxy = 1;
+}
+
+// 查找反向代理配置
+message FindEnabledReverseProxyConfigRequest {
+	int64 reverseProxyId = 1;
+}
+
+message FindEnabledReverseProxyConfigResponse {
+	bytes config = 1;
+}
+
+// 修改反向代理调度算法
+message UpdateReverseProxySchedulingRequest {
+	int64 reverseProxyId = 1;
+	bytes schedulingJSON = 2;
+}
+
+message UpdateReverseProxySchedulingResponse {
+
+}
+
+// 修改主要源站信息
+message UpdateReverseProxyPrimaryOriginsRequest {
+	int64 reverseProxyId = 1;
+	bytes originsJSON = 2;
+}
+
+message UpdateReverseProxyPrimaryOriginsResponse {
+
+}
+
+// 修改备用源站信息
+message UpdateReverseProxyBackupOriginsRequest {
+	int64 reverseProxyId = 1;
+	bytes originsJSON = 2;
+}
+
+message UpdateReverseProxyBackupOriginsResponse {
+
+}

pkg/rpc/protos/service_server.proto

@@ -8,8 +8,35 @@ service ServerService {
 	// 创建服务
 	rpc createServer (CreateServerRequest) returns (CreateServerResponse);
 
-	// 修改服务
-	rpc updateServer (UpdateServerRequest) returns (UpdateServerResponse);
+	// 修改服务基本信息
+	rpc updateServerBasic (UpdateServerBasicRequest) returns (UpdateServerBasicResponse);
+
+	// 修改服务的HTTP设置
+	rpc updateServerHTTP (UpdateServerHTTPRequest) returns (UpdateServerHTTPResponse);
+
+	// 修改服务的HTTPS设置
+	rpc updateServerHTTPS (UpdateServerHTTPSRequest) returns (UpdateServerHTTPSResponse);
+
+	// 修改服务的TCP设置
+	rpc updateServerTCP (UpdateServerTCPRequest) returns (UpdateServerTCPResponse);
+
+	// 修改服务的TLS设置
+	rpc updateServerTLS (UpdateServerTLSRequest) returns (UpdateServerTLSResponse);
+
+	// 修改服务的Unix设置
+	rpc updateServerUnix (UpdateServerUnixRequest) returns (UpdateServerUnixResponse);
+
+	// 修改服务的UDP设置
+	rpc updateServerUDP (UpdateServerUDPRequest) returns (UpdateServerUDPResponse);
+
+	// 修改服务的Web设置
+	rpc updateServerWeb (UpdateServerWebRequest) returns (UpdateServerWebResponse);
+
+	// 修改服务的反向代理设置
+	rpc updateServerReverseProxy (UpdateServerReverseProxyRequest) returns (UpdateServerReverseProxyResponse);
+
+	// 修改服务的域名设置
+	rpc updateServerNames (UpdateServerNamesRequest) returns (UpdateServerNamesResponse);
 
 	// 计算服务数量
 	rpc countAllEnabledServers (CountAllEnabledServersRequest) returns (CountAllEnabledServersResponse);
@@ -22,6 +49,12 @@ service ServerService {
 
 	// 查找单个服务
 	rpc findEnabledServer (FindEnabledServerRequest) returns (FindEnabledServerResponse);
+
+	// 查找服务的服务类型
+	rpc findEnabledServerType (FindEnabledServerTypeRequest) returns (FindEnabledServerTypeResponse);
+
+	// 查找反向代理设置
+	rpc findServerReverseProxy (FindServerReverseProxyRequest) returns (FindServerReverseProxyResponse);
 }
 
 // 创建服务
@@ -31,30 +64,118 @@ message CreateServerRequest {
 	string type = 3;
 	string name = 4;
 	string description = 5;
-	int64 clusterId = 6;
-	bytes config = 7;
-	bytes includeNodesJSON = 8;
-	bytes excludeNodesJSON = 9;
+
+	// 配置相关
+	bytes serverNamesJON = 8;
+	bytes httpJSON = 9;
+	bytes httpsJSON = 10;
+	bytes tcpJSON = 11;
+	bytes tlsJSON = 12;
+	bytes unixJSON = 13;
+	bytes udpJSON = 14;
+	int64 webId = 15;
+	int64 reverseProxyId = 16;
+
+	int64 clusterId = 30;
+	bytes includeNodesJSON = 31;
+	bytes excludeNodesJSON = 32;
 }
 
 message CreateServerResponse {
 	int64 serverId = 1;
 }
 
-// 修改服务
-message UpdateServerRequest {
+// 修改服务基本信息
+message UpdateServerBasicRequest {
 	int64 serverId = 1;
-	int64 userId = 2;
-	int64 adminId = 3;
-	string name = 4;
-	string description = 5;
-	int64 clusterId = 6;
-	bytes config = 7;
-	bytes includeNodesJSON = 8;
-	bytes excludeNodesJSON = 9;
+	string name = 2;
+	string description = 3;
+	int64 clusterId = 4;
 }
 
-message UpdateServerResponse {
+message UpdateServerBasicResponse {
+
+}
+
+// 修改服务的HTTP等设置
+message UpdateServerHTTPRequest {
+	int64 serverId = 1;
+	bytes config = 2;
+}
+
+message UpdateServerHTTPResponse {
+
+}
+
+message UpdateServerHTTPSRequest {
+	int64 serverId = 1;
+	bytes config = 2;
+}
+
+message UpdateServerHTTPSResponse {
+
+}
+
+message UpdateServerTCPRequest {
+	int64 serverId = 1;
+	bytes config = 2;
+}
+
+message UpdateServerTCPResponse {
+
+}
+
+message UpdateServerTLSRequest {
+	int64 serverId = 1;
+	bytes config = 2;
+}
+
+message UpdateServerTLSResponse {
+
+}
+
+message UpdateServerUnixRequest {
+	int64 serverId = 1;
+	bytes config = 2;
+}
+
+message UpdateServerUnixResponse {
+
+}
+
+message UpdateServerUDPRequest {
+	int64 serverId = 1;
+	bytes config = 2;
+}
+
+message UpdateServerUDPResponse {
+
+}
+
+message UpdateServerWebRequest {
+	int64 serverId = 1;
+	int64 webId = 2;
+}
+
+message UpdateServerWebResponse {
+
+}
+
+message UpdateServerReverseProxyRequest {
+	int64 serverId = 1;
+	int64 reverseProxyId = 2;
+}
+
+message UpdateServerReverseProxyResponse {
+
+}
+
+message UpdateServerNamesRequest {
+	int64 serverId = 1;
+	bytes config = 2;
+}
+
+message UpdateServerNamesResponse {
 
 }
 
@@ -93,4 +214,22 @@ message FindEnabledServerRequest {
 
 message FindEnabledServerResponse {
 	Server server = 1;
+}
+
+// 查找服务的服务类型
+message FindEnabledServerTypeRequest {
+	int64 serverId = 1;
+}
+
+message FindEnabledServerTypeResponse {
+	string type = 1;
+}
+
+// 查找反向代理设置
+message FindServerReverseProxyRequest {
+	int64 serverId = 1;
+}
+
+message FindServerReverseProxyResponse {
+	bytes config = 1;
 }