update: log print

yangtao · yangtao · commit 5bad3f2e014a · 2025-06-19T14:24:40.000+08:00
diff --git a/internal/api/data.go b/internal/api/data.go
@@ -7,8 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"log/slog"
-
+	log "NodePassDash/internal/log"
 	"NodePassDash/internal/sse"
 )
 
@@ -64,7 +63,7 @@ func (h *DataHandler) HandleExport(w http.ResponseWriter, r *http.Request) {
 	// 查询端点
 	rows, err := h.db.Query(`SELECT id, name, url, apiPath, apiKey, status, color FROM "Endpoint" ORDER BY id`)
 	if err != nil {
-		slog.Error("export query endpoints", "err", err)
+		log.Errorf("export query endpoints: %v", err)
 		http.Error(w, "export failed", http.StatusInternalServerError)
 		return
 	}
diff --git a/internal/api/endpoint.go b/internal/api/endpoint.go
@@ -1,12 +1,12 @@
 package api
 
 import (
+	log "NodePassDash/internal/log"
 	"crypto/tls"
 	"database/sql"
 	"encoding/json"
 	"fmt"
 	"io"
-	"log/slog"
 	"net/http"
 	"strconv"
 	"time"
@@ -94,9 +94,9 @@ func (h *EndpointHandler) HandleCreateEndpoint(w http.ResponseWriter, r *http.Re
 	// 创建成功后，异步启动 SSE 监听
 	if h.sseManager != nil && newEndpoint != nil {
 		go func(ep *endpoint.Endpoint) {
-			slog.Info("新端点创建成功，准备启动 SSE 监听", "endpointID", ep.ID)
+			log.Infof("[API.%v] 创建成功，准备启动 SSE 监听", ep.ID)
 			if err := h.sseManager.ConnectEndpoint(ep.ID, ep.URL, ep.APIPath, ep.APIKey); err != nil {
-				slog.Warn("启动 SSE 监听失败", "endpointID", ep.ID, "err", err)
+				log.Errorf("[API.%v] 启动 SSE 监听失败: %v", ep.ID, err)
 			}
 		}(newEndpoint)
 	}
@@ -189,9 +189,9 @@ func (h *EndpointHandler) HandleDeleteEndpoint(w http.ResponseWriter, r *http.Re
 
 	// 如果存在 SSE 监听，先断开
 	if h.sseManager != nil {
-		slog.Info("删除端点前，先断开 SSE 监听", "endpointID", id)
+		log.Infof("[API.%v] 删除端点前，先断开 SSE 监听", id)
 		h.sseManager.DisconnectEndpoint(id)
-		slog.Info("已断开 SSE 监听", "endpointID", id)
+		log.Infof("[API.%v] 已断开 SSE 监听", id)
 	}
 
 	if err := h.endpointService.DeleteEndpoint(id); err != nil {
@@ -203,7 +203,7 @@ func (h *EndpointHandler) HandleDeleteEndpoint(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	slog.Info("端点及其隧道已删除", "endpointID", id)
+	log.Infof("[API.%v] 端点及其隧道已删除", id)
 
 	json.NewEncoder(w).Encode(endpoint.EndpointResponse{
 		Success: true,
@@ -285,9 +285,9 @@ func (h *EndpointHandler) HandlePatchEndpoint(w http.ResponseWriter, r *http.Req
 			go func(eid int64) {
 				ep, err := h.endpointService.GetEndpointByID(eid)
 				if err == nil {
-					slog.Info("手动重连端点，启动 SSE", "endpointID", eid)
+					log.Infof("[API.%v] 手动重连端点，启动 SSE", eid)
 					if err := h.sseManager.ConnectEndpoint(eid, ep.URL, ep.APIPath, ep.APIKey); err != nil {
-						slog.Warn("手动重连端点失败", "endpointID", eid, "err", err)
+						log.Errorf("[API.%v] 手动重连端点失败: %v", eid, err)
 					}
 				}
 			}(id)
@@ -296,14 +296,14 @@ func (h *EndpointHandler) HandlePatchEndpoint(w http.ResponseWriter, r *http.Req
 	case "disconnect":
 		if h.sseManager != nil {
 			go func(eid int64) {
-				slog.Info("手动断开端点 SSE", "endpointID", eid)
+				log.Infof("[API.%v] 手动断开端点 SSE", eid)
 				h.sseManager.DisconnectEndpoint(eid)
 
 				// 更新端点状态为 OFFLINE
 				if err := h.endpointService.UpdateEndpointStatus(eid, endpoint.StatusOffline); err != nil {
-					slog.Warn("更新端点状态为 OFFLINE 失败", "endpointID", eid, "err", err)
+					log.Errorf("[API.%v] 更新端点状态为 OFFLINE 失败: %v", eid, err)
 				} else {
-					slog.Info("端点状态已更新为 OFFLINE", "endpointID", eid)
+					log.Infof("[API.%v] 端点状态已更新为 OFFLINE", eid)
 				}
 			}(id)
 		}
diff --git a/internal/api/sse.go b/internal/api/sse.go
@@ -6,8 +6,6 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"log/slog"
-
 	"net/http"
 	"strings"
 	"time"
@@ -188,6 +186,6 @@ func (h *SSEHandler) writeError(w http.ResponseWriter, msg string) {
 
 // loggerError 同时记录日志并返回错误
 func (h *SSEHandler) loggerError(w http.ResponseWriter, prefix string, err error) {
-	slog.Error(prefix, "err", err)
+	log.Errorf("[SSE] %v: %v", prefix, err)
 	h.writeError(w, fmt.Sprintf("%s: %v", prefix, err))
 }
diff --git a/internal/api/tunnel.go b/internal/api/tunnel.go
@@ -1,9 +1,9 @@
 package api
 
 import (
+	log "NodePassDash/internal/log"
 	"database/sql"
 	"encoding/json"
-	"log/slog"
 	"net/http"
 	"regexp"
 	"strconv"
@@ -137,7 +137,7 @@ func (h *TunnelHandler) HandleCreateTunnel(w http.ResponseWriter, r *http.Reques
 		Max:           maxVal,
 	}
 
-	slog.Info("创建隧道请求", "name", req.Name, "endpointId", req.EndpointID, "mode", req.Mode)
+	log.Infof("[API.%v] 创建隧道请求: %v", req.EndpointID, req.Name)
 
 	newTunnel, err := h.tunnelService.CreateTunnel(req)
 	if err != nil {
diff --git a/internal/tunnel/service.go b/internal/tunnel/service.go
@@ -1,10 +1,10 @@
 package tunnel
 
 import (
+	log "NodePassDash/internal/log"
 	"database/sql"
 	"errors"
 	"fmt"
-	"log/slog"
 	"strconv"
 	"strings"
 	"time"
@@ -154,7 +154,7 @@ func NewService(db *sql.DB) *Service {
 
 // GetTunnels 获取所有隧道列表
 func (s *Service) GetTunnels() ([]TunnelWithStats, error) {
-	slog.Debug("GetTunnels called")
+	log.Debugf("[Req] 获取所有隧道列表")
 	query := `
 		SELECT 
 			t.id, t.instanceId, t.name, t.endpointId, t.mode,
@@ -259,7 +259,7 @@ func (s *Service) GetTunnels() ([]TunnelWithStats, error) {
 
 // CreateTunnel 创建新隧道
 func (s *Service) CreateTunnel(req CreateTunnelRequest) (*Tunnel, error) {
-	slog.Info("CreateTunnel", "name", req.Name, "endpointId", req.EndpointID, "mode", req.Mode)
+	log.Infof("[Req] 创建隧道: %v", req.Name)
 	// 检查端点是否存在
 	var endpointURL, endpointAPIPath, endpointAPIKey string
 	err := s.db.QueryRow(
@@ -448,7 +448,7 @@ func (s *Service) CreateTunnel(req CreateTunnelRequest) (*Tunnel, error) {
 
 // DeleteTunnel 删除隧道
 func (s *Service) DeleteTunnel(instanceID string) error {
-	slog.Info("DeleteTunnel", "instanceId", instanceID)
+	log.Infof("[Req] 删除隧道: %v", instanceID)
 	// 获取隧道信息
 	var tunnel struct {
 		ID         int64
@@ -537,7 +537,7 @@ func (s *Service) UpdateTunnelStatus(instanceID string, status TunnelStatus) err
 
 // ControlTunnel 控制隧道状态（启动/停止/重启）
 func (s *Service) ControlTunnel(req TunnelActionRequest) error {
-	slog.Info("ControlTunnel", "instanceId", req.InstanceID, "action", req.Action)
+	log.Infof("[Req] 控制隧道状态: %v => %v", req.InstanceID, req.Action)
 	// 获取隧道和端点信息
 	var tunnel struct {
 		ID         int64
@@ -650,7 +650,7 @@ func formatTrafficBytes(bytes int64) string {
 
 // UpdateTunnel 更新隧道配置
 func (s *Service) UpdateTunnel(req UpdateTunnelRequest) error {
-	slog.Info("UpdateTunnel", "id", req.ID)
+	log.Infof("[Req] 更新隧道: %v", req.ID)
 	// 检查隧道是否存在
 	var exists bool
 	err := s.db.QueryRow(`SELECT EXISTS(SELECT 1 FROM "Tunnel" WHERE id = ?)`, req.ID).Scan(&exists)
@@ -842,7 +842,7 @@ func (s *Service) GetInstanceIDByTunnelID(id int64) (string, error) {
 // 该方法不会主动删除本地记录，而是假设有其它进程 (如 SSE 监听) 负责删除
 // timeout 为等待的最长时长
 func (s *Service) DeleteTunnelAndWait(instanceID string, timeout time.Duration) error {
-	slog.Info("DeleteTunnelAndWait", "instanceId", instanceID, "timeout", timeout)
+	log.Infof("[Req] 删除隧道: %v", instanceID)
 	// 获取隧道及端点信息（与 DeleteTunnel 中相同，但不删除本地记录）
 	var tunnel struct {
 		ID         int64
@@ -889,7 +889,7 @@ func (s *Service) DeleteTunnelAndWait(instanceID string, timeout time.Duration)
 	}
 
 	// 超时仍未删除，执行本地强制删除并刷新计数
-	slog.Warn("等待删除超时，执行本地删除", "instanceId", instanceID)
+	log.Warnf("[Req] 等待删除超时，执行本地删除: %v", instanceID)
 
 	// 删除隧道记录
 	result, err := s.db.Exec(`DELETE FROM "Tunnel" WHERE id = ?`, tunnel.ID)
@@ -922,7 +922,7 @@ func (s *Service) DeleteTunnelAndWait(instanceID string, timeout time.Duration)
 
 // RenameTunnel 仅修改隧道名称，不调用远端 API
 func (s *Service) RenameTunnel(id int64, newName string) error {
-	slog.Info("RenameTunnel", "id", id, "newName", newName)
+	log.Infof("[Req] 重命名隧道: %v", newName)
 
 	// 检查名称重复
 	var exists bool
