阶段性提交

internal/rpc/protos/model_node.proto

@@ -3,11 +3,11 @@ option go_package = "./pb";
 
 package pb;
 
-import "model_cluster.proto";
+import "model_node_cluster.proto";
 
 message Node {
 	int64 id = 1;
 	string name = 2;
 
-	Cluster cluster = 32;
+	NodeCluster cluster = 32;
 }

internal/rpc/protos/model_node_cluster.proto

@@ -3,7 +3,7 @@ option go_package = "./pb";
 
 package pb;
 
-message Cluster {
+message NodeCluster {
 	int64 id = 1;
 	string name = 2;
 	int64 createdAt = 3;

internal/rpc/protos/model_node_grant.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+message NodeGrant {
+	int64 id = 1;
+	string name = 2;
+	string method = 3;
+	string password = 4;
+	bool su = 5;
+	string privateKey = 6;
+	string description = 7;
+	int64 nodeId = 8;
+}

internal/rpc/protos/model_server.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "model_node_cluster.proto";
+
+message Server {
+	int64 id = 1;
+	bytes config = 2;
+	bytes includeNodes = 3;
+	bytes excludeNodes = 4;
+	int64 createdAt = 5;
+
+	NodeCluster cluster = 6;
+}

internal/rpc/protos/service_admin.proto

@@ -3,117 +3,63 @@ option go_package = "./pb";
 
 package pb;
 
-import "model_cluster.proto";
-import "model_node.proto";
 
 service AdminService {
 	// 登录
-	rpc login (AdminLoginRequest) returns (AdminLoginResponse) {
+	rpc loginAdmin (LoginAdminRequest) returns (LoginAdminResponse) {
 	}
 
 	// 创建操作日志
-	rpc createLog (AdminCreateLogRequest) returns (AdminCreateLogResponse) {
+	rpc createAdminLog (CreateAdminLogRequest) returns (CreateAdminLogResponse) {
 	}
 
 	// 检查管理员是否存在
-	rpc checkAdminExists (AdminCheckAdminExistsRequest) returns (AdminCheckAdminExistsResponse) {
+	rpc checkAdminExists (CheckAdminExistsRequest) returns (CheckAdminExistsResponse) {
 	}
 
 	// 获取管理员名称
-	rpc findAdminFullname (AdminFindAdminNameRequest) returns (AdminFindAdminNameResponse) {
+	rpc findAdminFullname (FindAdminNameRequest) returns (FindAdminNameResponse) {
 	}
 
-	// 获取所有集群的信息
-	rpc findAllEnabledClusters (AdminFindAllEnabledClustersRequest) returns (AdminFindAllEnabledClustersResponse) {
-	}
-
-	// 创建节点
-	rpc createNode (AdminCreateNodeRequest) returns (AdminCreateNodeResponse) {
-	};
-
-	// 节点数量
-	rpc countAllEnabledNodes (AdminCountAllEnabledNodesRequest) returns (AdminCountAllEnabledNodesResponse) {
-	};
-
-	// 列出单页节点
-	rpc listEnabledNodes (AdminListEnabledNodesRequest) returns (AdminListEnabledNodesResponse) {
-
-	}
 }
 
-message AdminLoginRequest {
+message LoginAdminRequest {
 	string username = 1;
 	string password = 2;
 }
 
-message AdminLoginResponse {
+message LoginAdminResponse {
 	int64 adminId = 1;
 	bool isOk = 2;
 	string message = 3;
 }
 
-message AdminCreateLogRequest {
+message CreateAdminLogRequest {
 	string level = 1;
 	string description = 2;
 	string action = 3;
 	string ip = 4;
 }
 
-message AdminCreateLogResponse {
+message CreateAdminLogResponse {
 	bool isOk = 1;
 }
 
-message AdminCheckAdminExistsRequest {
+message CheckAdminExistsRequest {
 	int64 adminId = 1;
 }
 
-message AdminCheckAdminExistsResponse {
+message CheckAdminExistsResponse {
 	bool isOk = 1;
 	string message = 2;
 }
 
 
-message AdminFindAdminNameRequest {
+message FindAdminNameRequest {
 	int64 adminId = 1;
 }
 
-message AdminFindAdminNameResponse {
+message FindAdminNameResponse {
 	string fullname = 1;
 }
 
-message AdminFindAllEnabledClustersRequest {
-
-}
-
-message AdminFindAllEnabledClustersResponse {
-	repeated Cluster clusters = 1;
-}
-
-// 创建节点
-message AdminCreateNodeRequest {
-	string name = 1;
-	int64 clusterId = 2;
-}
-
-message AdminCreateNodeResponse {
-	int64 nodeId = 1;
-}
-
-// 节点数量
-message AdminCountAllEnabledNodesRequest {
-
-}
-
-message AdminCountAllEnabledNodesResponse {
-	int64 count = 1;
-}
-
-// 列出单页节点
-message AdminListEnabledNodesRequest {
-	int64 offset = 1;
-	int64 size = 2;
-}
-
-message AdminListEnabledNodesResponse {
-	repeated Node nodes = 1;
-}

internal/rpc/protos/service_log.proto

@@ -1,9 +1,5 @@
 syntax = "proto3";
+option go_package = "./pb";
 
 package pb;
 
-option go_package = "./pb";
-
-service LogService {
-
-}

internal/rpc/protos/service_node.proto

@@ -1,19 +1,45 @@
 syntax = "proto3";
-
-package pb;
-
 option go_package = "./pb";
 
+package pb;
+import "model_node.proto";
+
 service NodeService {
-	rpc config (ConfigRequest) returns (ConfigResponse) {
+	// 创建节点
+	rpc createNode (CreateNodeRequest) returns (CreateNodeResponse);
 
-	}
+	// 节点数量
+	rpc countAllEnabledNodes (CountAllEnabledNodesRequest) returns (CountAllEnabledNodesResponse);
+
+	// 列出单页节点
+	rpc listEnabledNodes (ListEnabledNodesRequest) returns (ListEnabledNodesResponse);
 }
 
-message ConfigRequest {
-	string nodeId = 1;
+// 创建节点
+message CreateNodeRequest {
+	string name = 1;
+	int64 clusterId = 2;
 }
 
-message ConfigResponse {
-	string id = 1;
-}
+message CreateNodeResponse {
+	int64 nodeId = 1;
+}
+
+// 节点数量
+message CountAllEnabledNodesRequest {
+
+}
+
+message CountAllEnabledNodesResponse {
+	int64 count = 1;
+}
+
+// 列出单页节点
+message ListEnabledNodesRequest {
+	int64 offset = 1;
+	int64 size = 2;
+}
+
+message ListEnabledNodesResponse {
+	repeated Node nodes = 1;
+}

internal/rpc/protos/service_node_cluster.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+import "model_node_cluster.proto";
+
+service NodeClusterService {
+	// 获取所有集群的信息
+	rpc findAllEnabledClusters (FindAllEnabledNodeClustersRequest) returns (FindAllEnabledNodeClustersResponse);
+}
+
+message FindAllEnabledNodeClustersRequest {
+
+}
+
+message FindAllEnabledNodeClustersResponse {
+	repeated NodeCluster clusters = 1;
+}

internal/rpc/protos/service_node_grant.proto

@@ -0,0 +1,81 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+import "model_node_grant.proto";
+
+service NodeGrantService {
+	// 创建认证
+	rpc createNodeGrant (CreateNodeGrantRequest) returns (CreateNodeGrantResponse);
+
+	// 修改认证
+	rpc updateNodeGrant (UpdateNodeGrantRequest) returns (UpdateNodeGrantResponse);
+
+	// 禁用认证
+	rpc disableNodeGrant (DisableNodeGrantRequest) returns (DisableNodeGrantResponse);
+
+	// 计算认证的数量
+	rpc countAllEnabledNodeGrants (CountAllEnabledNodeGrantsRequest) returns (CountAllEnabledNodeGrantsResponse);
+
+	// 列出所有认证
+	rpc ListEnabledNodeGrants (ListEnabledNodeGrantsRequest) returns (ListEnabledNodeGrantsResponse);
+}
+
+// 创建节点认证
+message CreateNodeGrantRequest {
+	string name = 1;
+	string method = 2;
+	string username = 3;
+	string password = 4;
+	string privateKey = 5;
+	string description = 6;
+	int64 nodeId = 7;
+}
+
+message CreateNodeGrantResponse {
+	int64 grantId = 1;
+}
+
+// 修改节点认证
+message UpdateNodeGrantRequest {
+	int64 grantId = 8;
+	string name = 1;
+	string method = 2;
+	string username = 3;
+	string password = 4;
+	string privateKey = 5;
+	string description = 6;
+	int64 nodeId = 7;
+}
+
+message UpdateNodeGrantResponse {
+
+}
+
+// 禁用节点认证
+message DisableNodeGrantRequest {
+	int64 grantId = 1;
+}
+
+message DisableNodeGrantResponse {
+
+}
+
+// 计算节点认证数量
+message CountAllEnabledNodeGrantsRequest {
+
+}
+
+message CountAllEnabledNodeGrantsResponse {
+	int64 count = 1;
+}
+
+// 列出所有认证
+message ListEnabledNodeGrantsRequest {
+	int64 offset = 1;
+	int64 size = 2;
+}
+
+message ListEnabledNodeGrantsResponse {
+	repeated NodeGrant grants = 1;
+}

internal/rpc/protos/service_node_group.proto

@@ -1,9 +1,5 @@
 syntax = "proto3";
+option go_package = "./pb";
 
 package pb;
 
-option go_package = "./pb";
-
-service DnsService {
-
-}

internal/rpc/protos/service_node_region.proto

@@ -1,9 +1,5 @@
 syntax = "proto3";
+option go_package = "./pb";
 
 package pb;
 
-option go_package = "./pb";
-
-service StatService {
-
-}

internal/rpc/protos/service_provider.proto

@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package pb;
-
-option go_package = "./pb";
-
-service ProviderService {
-
-}

internal/rpc/protos/service_server.proto

@@ -0,0 +1,50 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+import "model_server.proto";
+
+service ServerService {
+	// 创建服务
+	rpc createServer (CreateServerRequest) returns (CreateServerResponse);
+
+	// 计算服务数量
+	rpc countAllEnabledServers (CountAllEnabledServersRequest) returns (CountAllEnabledServersResponse);
+
+	// 列出单页服务
+	rpc listEnabledServers (ListEnabledServersRequest) returns (ListEnabledServersResponse);
+}
+
+
+// 创建服务
+message CreateServerRequest {
+	int64 userId = 1;
+	int64 adminId = 2;
+	int64 clusterId = 6;
+	bytes config = 3;
+	bytes includeNodesJSON = 4;
+	bytes excludeNodesJSON = 5;
+}
+
+message CreateServerResponse {
+	int64 serverId = 1;
+}
+
+// 计算服务数量
+message CountAllEnabledServersRequest {
+
+}
+
+message CountAllEnabledServersResponse {
+	int64 count = 1;
+}
+
+// 列出单页服务
+message ListEnabledServersRequest {
+	int64 offset = 1;
+	int64 size = 2;
+}
+
+message ListEnabledServersResponse {
+	repeated Server servers = 1;
+}

internal/rpc/protos/service_server_group.proto

@@ -1,9 +1,5 @@
 syntax = "proto3";
+option go_package = "./pb";
 
 package pb;
 
-option go_package = "./pb";
-
-service MonitorService {
-
-}

internal/rpc/protos/service_user.proto

@@ -3,6 +3,3 @@ option go_package = "./pb";
 
 package pb;
 
-service UserService {
-
-}