feat: 服务卡片拖拽顺序

Author: Mecozea

internal/api/services.go

@@ -27,6 +27,7 @@ func SetupServicesRoutes(rg *gin.RouterGroup, servicesService *services.ServiceI
 	rg.GET("/services/:sid", servicesHandler.GetServiceByID)
 	rg.GET("/services/available-instances", servicesHandler.GetAvailableInstances)
 	rg.POST("/services/assemble", servicesHandler.AssembleService)
+	rg.POST("/services/sorts", servicesHandler.UpdateServicesSorts)
 
 	// 服务操作路由
 	rg.POST("/services/:sid/start", servicesHandler.StartService)
@@ -218,3 +219,22 @@ func (h *ServicesHandler) SyncService(c *gin.Context) {
 		"message": "同步服务成功",
 	})
 }
+
+// UpdateServicesSorts 批量更新服务排序
+func (h *ServicesHandler) UpdateServicesSorts(c *gin.Context) {
+	var req services.UpdateServicesSortsRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "请求参数错误: " + err.Error()})
+		return
+	}
+
+	if err := h.servicesService.UpdateServicesSorts(&req); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "更新排序失败: " + err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"success": true,
+		"message": "排序已保存",
+	})
+}

internal/services/models.go

@@ -41,3 +41,14 @@ type AssembleServiceRequest struct {
 	ClientInstanceId string  `json:"clientInstanceId" binding:"required"`
 	ServerInstanceId *string `json:"serverInstanceId,omitempty"`
 }
+
+// ServiceSortItem 服务排序项
+type ServiceSortItem struct {
+	Sid   string `json:"sid" binding:"required"`
+	Sorts int64  `json:"sorts" binding:"required"`
+}
+
+// UpdateServicesSortsRequest 更新服务排序请求
+type UpdateServicesSortsRequest struct {
+	Services []ServiceSortItem `json:"services" binding:"required,min=1"`
+}

internal/services/service.go

@@ -27,10 +27,10 @@ func NewService(db *gorm.DB, tunnelService *tunnel.Service, sseManager *sse.Mana
 	}
 }
 
-// GetServices 获取所有服务
+// GetServices 获取所有服务（按 sorts 降序排序，更大的值排在前面）
 func (s *ServiceImpl) GetServices() ([]*models.Services, error) {
 	var services []*models.Services
-	err := s.db.Order("sorts").Find(&services).Error
+	err := s.db.Order("sorts DESC").Find(&services).Error
 	return services, err
 }
 
@@ -581,3 +581,55 @@ func (s *ServiceImpl) syncServiceFromTunnel(sid, serviceType, instanceID string,
 
 	return nil
 }
+
+// UpdateServicesSorts 批量更新服务排序（优化版：使用 CASE WHEN 单条 SQL）
+func (s *ServiceImpl) UpdateServicesSorts(req *UpdateServicesSortsRequest) error {
+	if len(req.Services) == 0 {
+		return nil
+	}
+
+	// 开启事务
+	tx := s.db.Begin()
+	if tx.Error != nil {
+		return fmt.Errorf("开启事务失败: %w", tx.Error)
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	// 构建批量更新 SQL（使用 CASE WHEN）
+	// UPDATE services SET sorts = CASE sid
+	//   WHEN 'service-1' THEN 0
+	//   WHEN 'service-2' THEN 1
+	//   ELSE sorts
+	// END
+	// WHERE sid IN ('service-1', 'service-2', ...)
+
+	var caseSQL string
+	var sids []string
+	var args []interface{}
+
+	for _, item := range req.Services {
+		caseSQL += " WHEN ? THEN ?"
+		args = append(args, item.Sid, item.Sorts)
+		sids = append(sids, item.Sid)
+	}
+
+	sql := fmt.Sprintf("UPDATE services SET sorts = CASE sid %s ELSE sorts END WHERE sid IN (?)", caseSQL)
+
+	// 执行批量更新
+	if err := tx.Exec(sql, append(args, sids)...).Error; err != nil {
+		tx.Rollback()
+		return fmt.Errorf("批量更新服务排序失败: %w", err)
+	}
+
+	// 提交事务
+	if err := tx.Commit().Error; err != nil {
+		return fmt.Errorf("提交事务失败: %w", err)
+	}
+
+	log.Infof("[Service] 批量更新 %d 个服务的排序成功", len(req.Services))
+	return nil
+}

internal/sse/service.go

@@ -729,6 +729,18 @@ func (s *Service) upsertService(instanceID string, tunnel *models.Tunnel) {
 			updateColumns = []string{"alias", "client_instance_id", "client_endpoint_id", "exit_host", "exit_port", "total_rx", "total_tx"}
 		}
 	}
+	// 检查服务是否已存在，如果不存在则自动设置 sorts
+	var existingService models.Services
+	isNewService := s.db.Where("sid = ? AND type = ?", *peer.SID, *peer.Type).First(&existingService).Error != nil
+
+	if isNewService {
+		// 新服务：查询当前最大 sorts 值并 +1
+		var maxSorts int64
+		s.db.Model(&models.Services{}).Select("COALESCE(MAX(sorts), -1)").Scan(&maxSorts)
+		service.Sorts = maxSorts + 1
+		log.Infof("新服务 SID=%s, Type=%s, 自动设置 sorts=%d", *peer.SID, *peer.Type, service.Sorts)
+	}
+
 	// 使用 OnConflict 处理插入或更新
 	if err := s.db.Clauses(clause.OnConflict{
 		Columns: []clause.Column{

web/package.json

@@ -11,6 +11,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@fortawesome/fontawesome-svg-core": "^6.5.0",
     "@fortawesome/free-brands-svg-icons": "^6.5.0",
     "@fortawesome/free-solid-svg-icons": "^6.5.0",