update: 优化主控删除和实例删除的逻辑

Author: Mecozea

internal/endpoint/service.go

@@ -240,7 +240,7 @@ func (s *Service) DeleteEndpoint(id int64) error {
 		return err
 	}
 
-	// 2) 删除关联隧道
+	// 2) 删除SSE日志
 	if _, err := tx.Exec(`DELETE FROM "EndpointSSE" WHERE endpointId = ?`, id); err != nil {
 		tx.Rollback()
 		return err
@@ -252,6 +252,14 @@ func (s *Service) DeleteEndpoint(id int64) error {
 		tx.Rollback()
 		return err
 	}
+
+	// 3) 删除回收站
+	res, err = tx.Exec(`DELETE FROM "TunnelRecycle" WHERE endpointId = ?`, id)
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
 	affected, err := res.RowsAffected()
 	if err != nil {
 		tx.Rollback()

internal/tunnel/service.go

@@ -906,11 +906,16 @@ func (s *Service) DeleteTunnelAndWait(instanceID string, timeout time.Duration,
 	if err != nil {
 		return err
 	}
+
 	rows, _ := result.RowsAffected()
 	if rows == 0 {
 		return errors.New("隧道删除失败")
 	}
 
+	if !recycle {
+		_, _ = s.db.Exec(`DELETE FROM "EndpointSSE" WHERE instanceId = ?`, instanceID)
+	}
+
 	// 更新端点隧道计数
 	_, _ = s.db.Exec(`UPDATE "Endpoint" SET tunnelCount = (
 		SELECT COUNT(*) FROM "Tunnel" WHERE endpointId = ?