diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/controller/server.go | 6 | ||||
| -rw-r--r-- | web/global/global.go | 2 | ||||
| -rw-r--r-- | web/job/clear_logs_job.go | 2 | ||||
| -rw-r--r-- | web/service/server.go | 4 | ||||
| -rw-r--r-- | web/web.go | 2 | ||||
| -rw-r--r-- | web/websocket/hub.go | 6 | ||||
| -rw-r--r-- | web/websocket/notifier.go | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/web/controller/server.go b/web/controller/server.go index 5b39700e..d32209e1 100644 --- a/web/controller/server.go +++ b/web/controller/server.go @@ -210,10 +210,10 @@ func (a *ServerController) getXrayLogs(c *gin.Context) { //getting tags for freedom and blackhole outbounds config, err := a.settingService.GetDefaultXrayConfig() if err == nil && config != nil { - if cfgMap, ok := config.(map[string]interface{}); ok { - if outbounds, ok := cfgMap["outbounds"].([]interface{}); ok { + if cfgMap, ok := config.(map[string]any); ok { + if outbounds, ok := cfgMap["outbounds"].([]any); ok { for _, outbound := range outbounds { - if obMap, ok := outbound.(map[string]interface{}); ok { + if obMap, ok := outbound.(map[string]any); ok { switch obMap["protocol"] { case "freedom": if tag, ok := obMap["tag"].(string); ok { diff --git a/web/global/global.go b/web/global/global.go index f72c7bfe..5556b486 100644 --- a/web/global/global.go +++ b/web/global/global.go @@ -17,7 +17,7 @@ var ( type WebServer interface { GetCron() *cron.Cron // Get the cron scheduler GetCtx() context.Context // Get the server context - GetWSHub() interface{} // Get the WebSocket hub (using interface{} to avoid circular dependency) + GetWSHub() any // Get the WebSocket hub (using any to avoid circular dependency) } // SubServer interface defines methods for accessing the subscription server instance. diff --git a/web/job/clear_logs_job.go b/web/job/clear_logs_job.go index 85e0d64a..4ec0ec7f 100644 --- a/web/job/clear_logs_job.go +++ b/web/job/clear_logs_job.go @@ -45,7 +45,7 @@ func (j *ClearLogsJob) Run() { } // Clear log files and copy to previous logs - for i := 0; i < len(logFiles); i++ { + for i := range len(logFiles) { if i > 0 { // Copy to previous logs logFilePrev, err := os.OpenFile(logFilesPrev[i-1], os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644) diff --git a/web/service/server.go b/web/service/server.go index 970c5c0f..49f13b91 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -1205,7 +1205,7 @@ func (s *ServerService) GetNewmldsa65() (any, error) { return keyPair, nil } -func (s *ServerService) GetNewEchCert(sni string) (interface{}, error) { +func (s *ServerService) GetNewEchCert(sni string) (any, error) { // Run the command cmd := exec.Command(xray.GetBinaryPath(), "tls", "ech", "--serverName", sni) var out bytes.Buffer @@ -1223,7 +1223,7 @@ func (s *ServerService) GetNewEchCert(sni string) (interface{}, error) { configList := lines[1] serverKeys := lines[3] - return map[string]interface{}{ + return map[string]any{ "echServerKeys": serverKeys, "echConfigList": configList, }, nil @@ -487,6 +487,6 @@ func (s *Server) GetCron() *cron.Cron { } // GetWSHub returns the WebSocket hub instance. -func (s *Server) GetWSHub() interface{} { +func (s *Server) GetWSHub() any { return s.wsHub } diff --git a/web/websocket/hub.go b/web/websocket/hub.go index 7ee93405..8aa5903c 100644 --- a/web/websocket/hub.go +++ b/web/websocket/hub.go @@ -26,7 +26,7 @@ const ( // Message represents a WebSocket message type Message struct { Type MessageType `json:"type"` - Payload interface{} `json:"payload"` + Payload any `json:"payload"` Time int64 `json:"time"` } @@ -250,7 +250,7 @@ func (h *Hub) broadcastParallel(clients []*Client, message []byte) { } // Broadcast sends a message to all connected clients -func (h *Hub) Broadcast(messageType MessageType, payload interface{}) { +func (h *Hub) Broadcast(messageType MessageType, payload any) { if h == nil { return } @@ -289,7 +289,7 @@ func (h *Hub) Broadcast(messageType MessageType, payload interface{}) { } // BroadcastToTopic sends a message only to clients subscribed to the specific topic -func (h *Hub) BroadcastToTopic(messageType MessageType, payload interface{}) { +func (h *Hub) BroadcastToTopic(messageType MessageType, payload any) { if h == nil { return } diff --git a/web/websocket/notifier.go b/web/websocket/notifier.go index 416adaff..91e52c7c 100644 --- a/web/websocket/notifier.go +++ b/web/websocket/notifier.go @@ -25,7 +25,7 @@ func GetHub() *Hub { } // BroadcastStatus broadcasts server status update to all connected clients -func BroadcastStatus(status interface{}) { +func BroadcastStatus(status any) { hub := GetHub() if hub != nil { hub.Broadcast(MessageTypeStatus, status) @@ -33,7 +33,7 @@ func BroadcastStatus(status interface{}) { } // BroadcastTraffic broadcasts traffic statistics update to all connected clients -func BroadcastTraffic(traffic interface{}) { +func BroadcastTraffic(traffic any) { hub := GetHub() if hub != nil { hub.Broadcast(MessageTypeTraffic, traffic) @@ -41,7 +41,7 @@ func BroadcastTraffic(traffic interface{}) { } // BroadcastInbounds broadcasts inbounds list update to all connected clients -func BroadcastInbounds(inbounds interface{}) { +func BroadcastInbounds(inbounds any) { hub := GetHub() if hub != nil { hub.Broadcast(MessageTypeInbounds, inbounds) |