fix: 因重构分组逻辑导致无法删除主控的bug

Author: Mecozea

internal/api/tunnel.go

@@ -417,11 +417,11 @@ func (h *TunnelHandler) HandleDeleteTunnel(c *gin.Context) {
 	var endpointID int64
 	if err := h.tunnelService.DB().QueryRow(`SELECT id, endpoint_id FROM tunnels WHERE instance_id = ?`, req.InstanceID).Scan(&tunnelID, &endpointID); err != nil {
 	} else {
-		// 清理隧道标签关联
-		if _, err := h.tunnelService.DB().Exec("DELETE FROM tunnel_tags WHERE tunnel_id = ?", tunnelID); err != nil {
-			log.Warnf("[API] 删除隧道标签关联失败: tunnelID=%d, err=%v", tunnelID, err)
+		// 清理隧道分组关联
+		if _, err := h.tunnelService.DB().Exec("DELETE FROM tunnel_groups WHERE tunnel_id = ?", tunnelID); err != nil {
+			log.Warnf("[API] 删除隧道分组关联失败: tunnelID=%d, err=%v", tunnelID, err)
 		} else {
-			log.Infof("[API] 已删除隧道标签关联: tunnelID=%d", tunnelID)
+			log.Infof("[API] 已删除隧道分组关联: tunnelID=%d", tunnelID)
 		}
 	}
 

internal/endpoint/service.go

@@ -250,7 +250,7 @@ func (s *Service) UpdateEndpoint(req UpdateEndpointRequest) (*Endpoint, error) {
 		// 修改配置：更新名称、URL、API路径，可选的API密钥
 		updates := make(map[string]interface{})
 		needUpdateCache := false
-		
+
 		if req.Name != "" {
 			// 检查新名称是否已存在
 			var count int64
@@ -262,7 +262,7 @@ func (s *Service) UpdateEndpoint(req UpdateEndpointRequest) (*Endpoint, error) {
 			}
 			updates["name"] = req.Name
 		}
-		
+
 		if req.URL != "" && req.URL != endpoint.URL {
 			// 检查URL是否重复
 			var count int64
@@ -279,17 +279,17 @@ func (s *Service) UpdateEndpoint(req UpdateEndpointRequest) (*Endpoint, error) {
 			}
 			needUpdateCache = true
 		}
-		
+
 		if req.APIPath != "" && req.APIPath != endpoint.APIPath {
 			updates["api_path"] = req.APIPath
 			needUpdateCache = true
 		}
-		
+
 		if req.APIKey != "" && req.APIKey != endpoint.APIKey {
 			updates["api_key"] = req.APIKey
 			needUpdateCache = true
 		}
-		
+
 		updates["updated_at"] = time.Now()
 
 		if err := s.db.Model(&endpoint).Updates(updates).Error; err != nil {
@@ -311,7 +311,7 @@ func (s *Service) UpdateEndpoint(req UpdateEndpointRequest) (*Endpoint, error) {
 		if req.APIKey == "" {
 			return nil, errors.New("API密钥不能为空")
 		}
-		
+
 		updates := map[string]interface{}{
 			"api_key":    req.APIKey,
 			"updated_at": time.Now(),
@@ -336,11 +336,11 @@ func (s *Service) UpdateEndpoint(req UpdateEndpointRequest) (*Endpoint, error) {
 // DeleteEndpoint 删除端点
 func (s *Service) DeleteEndpoint(id int64) error {
 	return s.db.Transaction(func(tx *gorm.DB) error {
-		// 1) 删除隧道标签关联表记录（通过隧道ID关联）
-		if err := tx.Exec("DELETE FROM tunnel_tags WHERE tunnel_id IN (SELECT id FROM tunnels WHERE endpoint_id = ?)", id).Error; err != nil {
+		// 1) 删除隧道分组关联表记录（通过隧道ID关联）
+		if err := tx.Exec("DELETE FROM tunnel_groups WHERE tunnel_id IN (SELECT id FROM tunnels WHERE endpoint_id = ?)", id).Error; err != nil {
 			// 忽略记录不存在的错误
 			if !errors.Is(err, gorm.ErrRecordNotFound) {
-				return fmt.Errorf("删除隧道标签关联失败: %v", err)
+				return fmt.Errorf("删除隧道分组关联失败: %v", err)
 			}
 		}
 

internal/tunnel/service.go

@@ -46,7 +46,7 @@ func (s *Service) GetTunnels() ([]TunnelWithStats, error) {
 	}
 
 	query := `
-		SELECT 
+		SELECT
 			t.id, t.instance_id, t.name, t.endpoint_id, t.type,
 			t.tunnel_address, t.tunnel_port, t.target_address, t.target_port,
 			t.tls_mode, t.cert_path, t.key_path, t.log_level, t.command_line,
@@ -57,8 +57,8 @@ func (s *Service) GetTunnels() ([]TunnelWithStats, error) {
 			tag.id AS tag_id, tag.name AS tag_name
 		FROM tunnels t
 		LEFT JOIN endpoints e ON t.endpoint_id = e.id
-		LEFT JOIN tunnel_tags tt ON t.id = tt.tunnel_id
-		LEFT JOIN tags tag ON tt.tag_id = tag.id
+		LEFT JOIN tunnel_groups tt ON t.id = tt.tunnel_id
+		LEFT JOIN groups tag ON tt.group_id = tag.id
 		ORDER BY t.created_at DESC
 	`
 
@@ -2590,8 +2590,8 @@ func (s *Service) getGroupsByTunnelIDs(tunnelIDs []int64) (map[int64][]models.Gr
 
 	query := fmt.Sprintf(`
 		SELECT tt.tunnel_id, t.id, t.name
-		FROM tunnel_tags tt
-		JOIN tags t ON tt.tag_id = t.id
+		FROM tunnel_groups tt
+		JOIN groups t ON tt.group_id = t.id
 		WHERE tt.tunnel_id IN (%s)
 	`, placeholders)