From c5f5038d35e7c37f021b1b7d732331a58f94ee89 Mon Sep 17 00:00:00 2001 From: Jacky Date: Thu, 24 Oct 2024 18:21:54 +0800 Subject: [PATCH] style(go): sort imports --- api/analytic/analytic.go | 2 +- api/analytic/nodes.go | 2 +- api/api.go | 2 +- api/certificate/issue.go | 2 +- api/config/list.go | 2 +- api/config/rename.go | 2 +- api/nginx/nginx_log.go | 2 +- api/sites/domain.go | 2 +- api/terminal/pty.go | 2 +- api/upstream/upstream.go | 2 +- api/user/auth.go | 2 +- internal/analytic/analytic.go | 2 +- internal/analytic/node.go | 2 +- internal/analytic/node_record.go | 2 +- internal/analytic/node_stat.go | 2 +- internal/analytic/record.go | 2 +- internal/cache/cache.go | 2 +- internal/cert/logger.go | 2 +- internal/cert/payload.go | 2 +- internal/cert/sync.go | 2 +- internal/chatbot/context.go | 2 +- internal/cluster/cluster.go | 2 +- internal/cron/cron.go | 2 +- internal/kernal/register_acme_user.go | 2 +- internal/logrotate/logrotate.go | 2 +- internal/middleware/proxy.go | 2 +- internal/middleware/proxy_ws.go | 2 +- internal/passkey/webauthn.go | 2 +- internal/validation/validation.go | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/api/analytic/analytic.go b/api/analytic/analytic.go index 918a3ee8..ea2393a5 100644 --- a/api/analytic/analytic.go +++ b/api/analytic/analytic.go @@ -4,12 +4,12 @@ import ( "fmt" "github.com/0xJacky/Nginx-UI/internal/analytic" "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/host" "github.com/shirou/gopsutil/v3/load" "github.com/shirou/gopsutil/v3/net" "github.com/spf13/cast" + "github.com/uozi-tech/cosy/logger" "net/http" "runtime" "time" diff --git a/api/analytic/nodes.go b/api/analytic/nodes.go index 4f698c3b..8d4fe9f2 100644 --- a/api/analytic/nodes.go +++ b/api/analytic/nodes.go @@ -3,9 +3,9 @@ package analytic import ( "github.com/0xJacky/Nginx-UI/internal/analytic" "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" + "github.com/uozi-tech/cosy/logger" "net/http" "time" ) diff --git a/api/api.go b/api/api.go index d5989690..71f64e13 100644 --- a/api/api.go +++ b/api/api.go @@ -2,10 +2,10 @@ package api import ( "errors" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/model" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" + "github.com/uozi-tech/cosy/logger" "net/http" "reflect" "regexp" diff --git a/api/certificate/issue.go b/api/certificate/issue.go index bd9b70e7..1500d936 100644 --- a/api/certificate/issue.go +++ b/api/certificate/issue.go @@ -2,11 +2,11 @@ package certificate import ( "github.com/0xJacky/Nginx-UI/internal/cert" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/model" "github.com/gin-gonic/gin" "github.com/go-acme/lego/v4/certcrypto" "github.com/gorilla/websocket" + "github.com/uozi-tech/cosy/logger" "net/http" ) diff --git a/api/config/list.go b/api/config/list.go index 27e517d7..05aace4b 100644 --- a/api/config/list.go +++ b/api/config/list.go @@ -3,9 +3,9 @@ package config import ( "github.com/0xJacky/Nginx-UI/api" "github.com/0xJacky/Nginx-UI/internal/config" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/gin-gonic/gin" + "github.com/uozi-tech/cosy/logger" "net/http" "os" "strings" diff --git a/api/config/rename.go b/api/config/rename.go index e90542a6..fb78dd77 100644 --- a/api/config/rename.go +++ b/api/config/rename.go @@ -4,10 +4,10 @@ import ( "github.com/0xJacky/Nginx-UI/api" "github.com/0xJacky/Nginx-UI/internal/config" "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/query" "github.com/gin-gonic/gin" + "github.com/uozi-tech/cosy/logger" "net/http" "os" ) diff --git a/api/nginx/nginx_log.go b/api/nginx/nginx_log.go index 22661ded..eeed9bf1 100644 --- a/api/nginx/nginx_log.go +++ b/api/nginx/nginx_log.go @@ -6,7 +6,6 @@ import ( "github.com/0xJacky/Nginx-UI/api" "github.com/0xJacky/Nginx-UI/internal/cache" "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/settings" "github.com/gin-gonic/gin" @@ -14,6 +13,7 @@ import ( "github.com/hpcloud/tail" "github.com/pkg/errors" "github.com/spf13/cast" + "github.com/uozi-tech/cosy/logger" "io" "net/http" "os" diff --git a/api/sites/domain.go b/api/sites/domain.go index 8956ffc6..9fbd80ac 100644 --- a/api/sites/domain.go +++ b/api/sites/domain.go @@ -4,12 +4,12 @@ import ( "github.com/0xJacky/Nginx-UI/api" "github.com/0xJacky/Nginx-UI/internal/cert" "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/query" "github.com/gin-gonic/gin" "github.com/sashabaranov/go-openai" + "github.com/uozi-tech/cosy/logger" "net/http" "os" ) diff --git a/api/terminal/pty.go b/api/terminal/pty.go index c7abf154..9964d254 100644 --- a/api/terminal/pty.go +++ b/api/terminal/pty.go @@ -1,10 +1,10 @@ package terminal import ( - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/pty" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" + "github.com/uozi-tech/cosy/logger" "net/http" ) diff --git a/api/upstream/upstream.go b/api/upstream/upstream.go index 64a6ee86..14c39b2a 100644 --- a/api/upstream/upstream.go +++ b/api/upstream/upstream.go @@ -2,10 +2,10 @@ package upstream import ( "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/upstream" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" + "github.com/uozi-tech/cosy/logger" "net/http" "time" ) diff --git a/api/user/auth.go b/api/user/auth.go index d3565ceb..18426777 100644 --- a/api/user/auth.go +++ b/api/user/auth.go @@ -2,12 +2,12 @@ package user import ( "github.com/0xJacky/Nginx-UI/api" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/user" "github.com/0xJacky/Nginx-UI/query" "github.com/0xJacky/Nginx-UI/settings" "github.com/gin-gonic/gin" "github.com/pkg/errors" + "github.com/uozi-tech/cosy/logger" "math/rand/v2" "net/http" "sync" diff --git a/internal/analytic/analytic.go b/internal/analytic/analytic.go index 1e8f0b60..0921cbaa 100644 --- a/internal/analytic/analytic.go +++ b/internal/analytic/analytic.go @@ -1,8 +1,8 @@ package analytic import ( - "github.com/uozi-tech/cosy/logger" "github.com/shirou/gopsutil/v3/net" + "github.com/uozi-tech/cosy/logger" "time" ) diff --git a/internal/analytic/node.go b/internal/analytic/node.go index 57ba06a4..573f195c 100644 --- a/internal/analytic/node.go +++ b/internal/analytic/node.go @@ -2,12 +2,12 @@ package analytic import ( "encoding/json" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/transport" "github.com/0xJacky/Nginx-UI/internal/upgrader" "github.com/0xJacky/Nginx-UI/model" "github.com/shirou/gopsutil/v3/load" "github.com/shirou/gopsutil/v3/net" + "github.com/uozi-tech/cosy/logger" "io" "net/http" "net/url" diff --git a/internal/analytic/node_record.go b/internal/analytic/node_record.go index 9aabfc32..c4f79c54 100644 --- a/internal/analytic/node_record.go +++ b/internal/analytic/node_record.go @@ -3,10 +3,10 @@ package analytic import ( "context" "encoding/json" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/query" "github.com/gorilla/websocket" + "github.com/uozi-tech/cosy/logger" "net/http" "time" ) diff --git a/internal/analytic/node_stat.go b/internal/analytic/node_stat.go index beb0964c..804abf9f 100644 --- a/internal/analytic/node_stat.go +++ b/internal/analytic/node_stat.go @@ -1,10 +1,10 @@ package analytic import ( - "github.com/uozi-tech/cosy/logger" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/load" "github.com/shirou/gopsutil/v3/net" + "github.com/uozi-tech/cosy/logger" "math" "runtime" "time" diff --git a/internal/analytic/record.go b/internal/analytic/record.go index 8bdf6f51..b0154c06 100644 --- a/internal/analytic/record.go +++ b/internal/analytic/record.go @@ -1,10 +1,10 @@ package analytic import ( - "github.com/uozi-tech/cosy/logger" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/net" + "github.com/uozi-tech/cosy/logger" "runtime" "time" ) diff --git a/internal/cache/cache.go b/internal/cache/cache.go index f8a9d4d9..dc409fd8 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -1,8 +1,8 @@ package cache import ( - "github.com/uozi-tech/cosy/logger" "github.com/dgraph-io/ristretto" + "github.com/uozi-tech/cosy/logger" "time" ) diff --git a/internal/cert/logger.go b/internal/cert/logger.go index 81323bb9..fb5c88a9 100644 --- a/internal/cert/logger.go +++ b/internal/cert/logger.go @@ -2,8 +2,8 @@ package cert import ( "fmt" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/model" + "github.com/uozi-tech/cosy/logger" "strings" "time" ) diff --git a/internal/cert/payload.go b/internal/cert/payload.go index 781123e4..5fa29794 100644 --- a/internal/cert/payload.go +++ b/internal/cert/payload.go @@ -2,12 +2,12 @@ package cert import ( "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/query" "github.com/go-acme/lego/v4/certcrypto" "github.com/pkg/errors" + "github.com/uozi-tech/cosy/logger" "log" "os" "path/filepath" diff --git a/internal/cert/sync.go b/internal/cert/sync.go index b03cb9ec..c23fdf93 100644 --- a/internal/cert/sync.go +++ b/internal/cert/sync.go @@ -5,13 +5,13 @@ import ( "encoding/json" "fmt" "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/internal/notification" "github.com/0xJacky/Nginx-UI/internal/transport" "github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/query" "github.com/go-acme/lego/v4/certcrypto" + "github.com/uozi-tech/cosy/logger" "io" "net/http" "os" diff --git a/internal/chatbot/context.go b/internal/chatbot/context.go index cbc3bf5c..560462d3 100644 --- a/internal/chatbot/context.go +++ b/internal/chatbot/context.go @@ -2,9 +2,9 @@ package chatbot import ( "github.com/0xJacky/Nginx-UI/internal/helper" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/sashabaranov/go-openai" + "github.com/uozi-tech/cosy/logger" "os" "regexp" "strings" diff --git a/internal/cluster/cluster.go b/internal/cluster/cluster.go index 0309855b..f9328431 100644 --- a/internal/cluster/cluster.go +++ b/internal/cluster/cluster.go @@ -1,10 +1,10 @@ package cluster import ( - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/query" "github.com/0xJacky/Nginx-UI/settings" + "github.com/uozi-tech/cosy/logger" "gorm.io/gen/field" "net/url" "strings" diff --git a/internal/cron/cron.go b/internal/cron/cron.go index 98721dfd..ce811b48 100644 --- a/internal/cron/cron.go +++ b/internal/cron/cron.go @@ -2,11 +2,11 @@ package cron import ( "github.com/0xJacky/Nginx-UI/internal/cert" - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/logrotate" "github.com/0xJacky/Nginx-UI/query" "github.com/0xJacky/Nginx-UI/settings" "github.com/go-co-op/gocron" + "github.com/uozi-tech/cosy/logger" "time" ) diff --git a/internal/kernal/register_acme_user.go b/internal/kernal/register_acme_user.go index da2cadd8..445b5204 100644 --- a/internal/kernal/register_acme_user.go +++ b/internal/kernal/register_acme_user.go @@ -1,8 +1,8 @@ package kernal import ( - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/query" + "github.com/uozi-tech/cosy/logger" ) func RegisterAcmeUser() { diff --git a/internal/logrotate/logrotate.go b/internal/logrotate/logrotate.go index 51dda63b..b9fc8f1c 100644 --- a/internal/logrotate/logrotate.go +++ b/internal/logrotate/logrotate.go @@ -1,8 +1,8 @@ package logrotate import ( - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/settings" + "github.com/uozi-tech/cosy/logger" "os/exec" "strings" ) diff --git a/internal/middleware/proxy.go b/internal/middleware/proxy.go index 2fd9c1d9..98732071 100644 --- a/internal/middleware/proxy.go +++ b/internal/middleware/proxy.go @@ -1,11 +1,11 @@ package middleware import ( - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/internal/transport" "github.com/0xJacky/Nginx-UI/query" "github.com/gin-gonic/gin" "github.com/spf13/cast" + "github.com/uozi-tech/cosy/logger" "io" "net/http" "net/url" diff --git a/internal/middleware/proxy_ws.go b/internal/middleware/proxy_ws.go index 0dfc14b3..d80db15f 100644 --- a/internal/middleware/proxy_ws.go +++ b/internal/middleware/proxy_ws.go @@ -1,11 +1,11 @@ package middleware import ( - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/query" "github.com/gin-gonic/gin" "github.com/pretty66/websocketproxy" "github.com/spf13/cast" + "github.com/uozi-tech/cosy/logger" "net/http" ) diff --git a/internal/passkey/webauthn.go b/internal/passkey/webauthn.go index e71d93a8..bfd17b47 100644 --- a/internal/passkey/webauthn.go +++ b/internal/passkey/webauthn.go @@ -1,10 +1,10 @@ package passkey import ( - "github.com/uozi-tech/cosy/logger" "github.com/0xJacky/Nginx-UI/settings" "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" + "github.com/uozi-tech/cosy/logger" ) var instance *webauthn.WebAuthn diff --git a/internal/validation/validation.go b/internal/validation/validation.go index 769bd60e..176d6d33 100644 --- a/internal/validation/validation.go +++ b/internal/validation/validation.go @@ -1,9 +1,9 @@ package validation import ( - "github.com/uozi-tech/cosy/logger" "github.com/gin-gonic/gin/binding" val "github.com/go-playground/validator/v10" + "github.com/uozi-tech/cosy/logger" ) func Init() {