实现批量删除网站功能

build/rpc.json

@@ -9507,6 +9507,15 @@
           ],
           "isDeprecated": false
         },
+        {
+          "name": "findBasicPlan",
+          "requestMessageName": "FindBasicPlanRequest",
+          "responseMessageName": "FindBasicPlanResponse",
+          "code": "rpc findBasicPlan(FindBasicPlanRequest) returns (FindBasicPlanResponse);",
+          "doc": "查找套餐基本信息",
+          "roles": [],
+          "isDeprecated": false
+        },
         {
           "name": "countAllEnabledPlans",
           "requestMessageName": "CountAllEnabledPlansRequest",
@@ -9547,7 +9556,9 @@
           "responseMessageName": "FindAllAvailableBasicPlansResponse",
           "code": "rpc findAllAvailableBasicPlans(FindAllAvailableBasicPlansRequest) returns (FindAllAvailableBasicPlansResponse);",
           "doc": "列出所有可用的套餐的基本信息",
-          "roles": [],
+          "roles": [
+            "node"
+          ],
           "isDeprecated": false
         },
         {
@@ -10754,7 +10765,19 @@
           "requestMessageName": "DeleteServerRequest",
           "responseMessageName": "RPCSuccess",
           "code": "rpc deleteServer (DeleteServerRequest) returns (RPCSuccess);",
-          "doc": "禁用某网站",
+          "doc": "删除某网站",
+          "roles": [
+            "admin",
+            "user"
+          ],
+          "isDeprecated": false
+        },
+        {
+          "name": "deleteServers",
+          "requestMessageName": "DeleteServersRequest",
+          "responseMessageName": "RPCSuccess",
+          "code": "rpc deleteServers(DeleteServersRequest) returns (RPCSuccess);",
+          "doc": "删除一组网站",
           "roles": [
             "admin",
             "user"
@@ -16492,7 +16515,12 @@
     {
       "name": "DeleteServerRequest",
       "code": "message DeleteServerRequest {\n\tint64 serverId = 1; // 网站ID\n}",
-      "doc": "禁用网站"
+      "doc": "删除某网站"
+    },
+    {
+      "name": "DeleteServersRequest",
+      "code": "message DeleteServersRequest {\n\trepeated int64 serverIds = 1; // 网站ID列表：[1, 2, ...]\n}",
+      "doc": "删除一组网站"
     },
     {
       "name": "DeleteTrafficPackagePeriodRequest",
@@ -18039,6 +18067,16 @@
       "code": "message FindBasicDNSDomainResponse {\n\tDNSDomain dnsDomain = 1;\n}",
       "doc": ""
     },
+    {
+      "name": "FindBasicPlanRequest",
+      "code": "message FindBasicPlanRequest {\n\tint64 planId = 1; // 套餐ID\n}",
+      "doc": "查找套餐基本信息"
+    },
+    {
+      "name": "FindBasicPlanResponse",
+      "code": "message FindBasicPlanResponse {\n\tPlan plan = 1; // 套餐信息（只读取基本信息）\n}",
+      "doc": ""
+    },
     {
       "name": "FindCurrentAPINodeResponse",
       "code": "message FindCurrentAPINodeResponse {\n\tAPINode apiNode = 1;\n}",
@@ -18911,7 +18949,7 @@
     },
     {
       "name": "FindEnabledServerResponse",
-      "code": "message FindEnabledServerResponse {\n\tServer server = 1;\n}",
+      "code": "message FindEnabledServerResponse {\n\tServer server = 1; // 网站信息\n}",
       "doc": ""
     },
     {

pkg/langs/codes/codes.go

@@ -491,6 +491,7 @@ const (
 	Server_LogCopyServerConfigs                                 langs.MessageCode = "server@log_copy_server_configs"                                      // 从网站 %d 中同步配置 %s
 	Server_LogCreateServer                                      langs.MessageCode = "server@log_create_server"                                            // 创建网站 %d
 	Server_LogDeleteServer                                      langs.MessageCode = "server@log_delete_server"                                            // 删除网站 %d
+	Server_LogDeleteServers                                     langs.MessageCode = "server@log_delete_servers"                                           // 批量删除网站
 	Server_LogDisableServer                                     langs.MessageCode = "server@log_disable_server"                                           // 停用网站 %d
 	Server_LogEnableServer                                      langs.MessageCode = "server@log_enable_server"                                            // 启用网站 %d
 	Server_LogSubmitAuditingServer                              langs.MessageCode = "server@log_submit_auditing_server"                                   // 提交网站 %d 域名审核

pkg/langs/messages/messages_en_us.go

@@ -492,6 +492,7 @@ func init() {
 		"server@log_copy_server_configs":                                      "从网站 %d 中同步配置 %s",
 		"server@log_create_server":                                            "创建网站 %d",
 		"server@log_delete_server":                                            "删除网站 %d",
+		"server@log_delete_servers":                                           "",
 		"server@log_disable_server":                                           "停用网站 %d",
 		"server@log_enable_server":                                            "启用网站 %d",
 		"server@log_submit_auditing_server":                                   "提交网站 %d 域名审核",

pkg/langs/messages/messages_zh_cn.go

@@ -492,6 +492,7 @@ func init() {
 		"server@log_copy_server_configs":                                      "从网站 %d 中同步配置 %s",
 		"server@log_create_server":                                            "创建网站 %d",
 		"server@log_delete_server":                                            "删除网站 %d",
+		"server@log_delete_servers":                                           "批量删除网站",
 		"server@log_disable_server":                                           "停用网站 %d",
 		"server@log_enable_server":                                            "启用网站 %d",
 		"server@log_submit_auditing_server":                                   "提交网站 %d 域名审核",

pkg/langs/protos/zh-cn/server.json

@@ -84,5 +84,6 @@
   "log_enable_server": "启用网站 %d",
   "log_disable_server": "停用网站 %d",
   "log_update_server_name": "修改网站 %d 名称",
-  "log_update_server_is_on":"修改网站 %d 启用状态"
+  "log_update_server_is_on":"修改网站 %d 启用状态",
+  "log_delete_servers": "批量删除网站"
 }

pkg/rpc/pb/service_server_grpc.pb.go

@@ -43,6 +43,7 @@ const (
 	ServerService_CountAllEnabledServersMatch_FullMethodName               = "/pb.ServerService/countAllEnabledServersMatch"
 	ServerService_ListEnabledServersMatch_FullMethodName                   = "/pb.ServerService/listEnabledServersMatch"
 	ServerService_DeleteServer_FullMethodName                              = "/pb.ServerService/deleteServer"
+	ServerService_DeleteServers_FullMethodName                             = "/pb.ServerService/deleteServers"
 	ServerService_FindEnabledServer_FullMethodName                         = "/pb.ServerService/findEnabledServer"
 	ServerService_FindEnabledServerConfig_FullMethodName                   = "/pb.ServerService/findEnabledServerConfig"
 	ServerService_FindEnabledServerType_FullMethodName                     = "/pb.ServerService/findEnabledServerType"
@@ -133,8 +134,10 @@ type ServerServiceClient interface {
 	CountAllEnabledServersMatch(ctx context.Context, in *CountAllEnabledServersMatchRequest, opts ...grpc.CallOption) (*RPCCountResponse, error)
 	// 列出单页网站
 	ListEnabledServersMatch(ctx context.Context, in *ListEnabledServersMatchRequest, opts ...grpc.CallOption) (*ListEnabledServersMatchResponse, error)
-	// 禁用某网站
+	// 删除某网站
 	DeleteServer(ctx context.Context, in *DeleteServerRequest, opts ...grpc.CallOption) (*RPCSuccess, error)
+	// 删除一组网站
+	DeleteServers(ctx context.Context, in *DeleteServersRequest, opts ...grpc.CallOption) (*RPCSuccess, error)
 	// 查找单个网站
 	FindEnabledServer(ctx context.Context, in *FindEnabledServerRequest, opts ...grpc.CallOption) (*FindEnabledServerResponse, error)
 	// 查找网站配置
@@ -437,6 +440,15 @@ func (c *serverServiceClient) DeleteServer(ctx context.Context, in *DeleteServer
 	return out, nil
 }
 
+func (c *serverServiceClient) DeleteServers(ctx context.Context, in *DeleteServersRequest, opts ...grpc.CallOption) (*RPCSuccess, error) {
+	out := new(RPCSuccess)
+	err := c.cc.Invoke(ctx, ServerService_DeleteServers_FullMethodName, in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *serverServiceClient) FindEnabledServer(ctx context.Context, in *FindEnabledServerRequest, opts ...grpc.CallOption) (*FindEnabledServerResponse, error) {
 	out := new(FindEnabledServerResponse)
 	err := c.cc.Invoke(ctx, ServerService_FindEnabledServer_FullMethodName, in, out, opts...)
@@ -829,8 +841,10 @@ type ServerServiceServer interface {
 	CountAllEnabledServersMatch(context.Context, *CountAllEnabledServersMatchRequest) (*RPCCountResponse, error)
 	// 列出单页网站
 	ListEnabledServersMatch(context.Context, *ListEnabledServersMatchRequest) (*ListEnabledServersMatchResponse, error)
-	// 禁用某网站
+	// 删除某网站
 	DeleteServer(context.Context, *DeleteServerRequest) (*RPCSuccess, error)
+	// 删除一组网站
+	DeleteServers(context.Context, *DeleteServersRequest) (*RPCSuccess, error)
 	// 查找单个网站
 	FindEnabledServer(context.Context, *FindEnabledServerRequest) (*FindEnabledServerResponse, error)
 	// 查找网站配置
@@ -985,6 +999,9 @@ func (UnimplementedServerServiceServer) ListEnabledServersMatch(context.Context,
 func (UnimplementedServerServiceServer) DeleteServer(context.Context, *DeleteServerRequest) (*RPCSuccess, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteServer not implemented")
 }
+func (UnimplementedServerServiceServer) DeleteServers(context.Context, *DeleteServersRequest) (*RPCSuccess, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method DeleteServers not implemented")
+}
 func (UnimplementedServerServiceServer) FindEnabledServer(context.Context, *FindEnabledServerRequest) (*FindEnabledServerResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindEnabledServer not implemented")
 }
@@ -1543,6 +1560,24 @@ func _ServerService_DeleteServer_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ServerService_DeleteServers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(DeleteServersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ServerServiceServer).DeleteServers(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ServerService_DeleteServers_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ServerServiceServer).DeleteServers(ctx, req.(*DeleteServersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ServerService_FindEnabledServer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(FindEnabledServerRequest)
 	if err := dec(in); err != nil {
@@ -2330,6 +2365,10 @@ var ServerService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "deleteServer",
 			Handler:    _ServerService_DeleteServer_Handler,
 		},
+		{
+			MethodName: "deleteServers",
+			Handler:    _ServerService_DeleteServers_Handler,
+		},
 		{
 			MethodName: "findEnabledServer",
 			Handler:    _ServerService_FindEnabledServer_Handler,

pkg/rpc/protos/service_server.proto

@@ -80,9 +80,12 @@ service ServerService {
 	// 列出单页网站
 	rpc listEnabledServersMatch (ListEnabledServersMatchRequest) returns (ListEnabledServersMatchResponse);
 
-	// 禁用某网站
+	// 删除某网站
 	rpc deleteServer (DeleteServerRequest) returns (RPCSuccess);
 
+	// 删除一组网站
+	rpc deleteServers(DeleteServersRequest) returns (RPCSuccess);
+
 	// 查找单个网站
 	rpc findEnabledServer (FindEnabledServerRequest) returns (FindEnabledServerResponse);
 
@@ -410,11 +413,16 @@ message ListEnabledServersMatchResponse {
 	repeated Server servers = 1;
 }
 
-// 禁用网站
+// 删除某网站
 message DeleteServerRequest {
 	int64 serverId = 1; // 网站ID
 }
 
+// 删除一组网站
+message DeleteServersRequest {
+	repeated int64 serverIds = 1; // 网站ID列表：[1, 2, ...]
+}
+
 // 查找单个网站
 message FindEnabledServerRequest {
 	int64 serverId = 1; // 网站ID
@@ -422,7 +430,7 @@ message FindEnabledServerRequest {
 }
 
 message FindEnabledServerResponse {
-	Server server = 1;
+	Server server = 1; // 网站信息
 }
 
 // 查找网站配置