diff --git a/database/db.go b/database/db.go index 80f9f655..9b3dd133 100644 --- a/database/db.go +++ b/database/db.go @@ -12,10 +12,10 @@ import ( "path" "slices" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/util/crypto" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/util/crypto" + "github.com/mhsanaei/3x-ui/v3/xray" "gorm.io/driver/sqlite" "gorm.io/gorm" diff --git a/database/model/model.go b/database/model/model.go index 3fab264a..b098ab2d 100644 --- a/database/model/model.go +++ b/database/model/model.go @@ -4,8 +4,8 @@ package model import ( "fmt" - "github.com/mhsanaei/3x-ui/v2/util/json_util" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/util/json_util" + "github.com/mhsanaei/3x-ui/v3/xray" ) // Protocol represents the protocol type for Xray inbounds. diff --git a/go.mod b/go.mod index 0db38639..c7491ef0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mhsanaei/3x-ui/v2 +module github.com/mhsanaei/3x-ui/v3 go 1.26.3 diff --git a/logger/logger.go b/logger/logger.go index 7d26dcd0..d665396a 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -9,7 +9,7 @@ import ( "runtime" "time" - "github.com/mhsanaei/3x-ui/v2/config" + "github.com/mhsanaei/3x-ui/v3/config" "github.com/op/go-logging" ) diff --git a/main.go b/main.go index 20724169..4d593898 100644 --- a/main.go +++ b/main.go @@ -11,15 +11,15 @@ import ( "syscall" _ "unsafe" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/sub" - "github.com/mhsanaei/3x-ui/v2/util/crypto" - "github.com/mhsanaei/3x-ui/v2/util/sys" - "github.com/mhsanaei/3x-ui/v2/web" - "github.com/mhsanaei/3x-ui/v2/web/global" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/sub" + "github.com/mhsanaei/3x-ui/v3/util/crypto" + "github.com/mhsanaei/3x-ui/v3/util/sys" + "github.com/mhsanaei/3x-ui/v3/web" + "github.com/mhsanaei/3x-ui/v3/web/global" + "github.com/mhsanaei/3x-ui/v3/web/service" "github.com/joho/godotenv" "github.com/op/go-logging" diff --git a/sub/sub.go b/sub/sub.go index 7a327cc4..da03f38d 100644 --- a/sub/sub.go +++ b/sub/sub.go @@ -13,13 +13,13 @@ import ( "strconv" "strings" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - webpkg "github.com/mhsanaei/3x-ui/v2/web" - "github.com/mhsanaei/3x-ui/v2/web/locale" - "github.com/mhsanaei/3x-ui/v2/web/middleware" - "github.com/mhsanaei/3x-ui/v2/web/network" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + webpkg "github.com/mhsanaei/3x-ui/v3/web" + "github.com/mhsanaei/3x-ui/v3/web/locale" + "github.com/mhsanaei/3x-ui/v3/web/middleware" + "github.com/mhsanaei/3x-ui/v3/web/network" + "github.com/mhsanaei/3x-ui/v3/web/service" "github.com/gin-gonic/gin" ) diff --git a/sub/subClashService.go b/sub/subClashService.go index c38687b1..c94ea467 100644 --- a/sub/subClashService.go +++ b/sub/subClashService.go @@ -7,10 +7,10 @@ import ( "github.com/goccy/go-json" yaml "github.com/goccy/go-yaml" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/xray" ) type SubClashService struct { diff --git a/sub/subController.go b/sub/subController.go index ddb24c11..693b5871 100644 --- a/sub/subController.go +++ b/sub/subController.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - webpkg "github.com/mhsanaei/3x-ui/v2/web" - "github.com/mhsanaei/3x-ui/v2/web/service" + webpkg "github.com/mhsanaei/3x-ui/v3/web" + "github.com/mhsanaei/3x-ui/v3/web/service" "github.com/gin-gonic/gin" ) diff --git a/sub/subJsonService.go b/sub/subJsonService.go index 8d0514fd..fc35698e 100644 --- a/sub/subJsonService.go +++ b/sub/subJsonService.go @@ -7,12 +7,12 @@ import ( "maps" "strings" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/json_util" - "github.com/mhsanaei/3x-ui/v2/util/random" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/json_util" + "github.com/mhsanaei/3x-ui/v3/util/random" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/xray" ) //go:embed default.json diff --git a/sub/subService.go b/sub/subService.go index 40365dce..6bfbea2b 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -13,13 +13,13 @@ import ( "github.com/gin-gonic/gin" "github.com/goccy/go-json" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/util/random" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/util/random" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/xray" ) // SubService provides business logic for generating subscription links and managing subscription data. diff --git a/util/common/err.go b/util/common/err.go index e12bd13f..2e4c8752 100644 --- a/util/common/err.go +++ b/util/common/err.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/logger" ) // NewErrorf creates a new error with formatted message. diff --git a/web/controller/api.go b/web/controller/api.go index 93e35b85..219632d5 100644 --- a/web/controller/api.go +++ b/web/controller/api.go @@ -4,9 +4,9 @@ import ( "net/http" "strings" - "github.com/mhsanaei/3x-ui/v2/web/middleware" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/web/middleware" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/controller/base.go b/web/controller/base.go index 2b136103..17946892 100644 --- a/web/controller/base.go +++ b/web/controller/base.go @@ -5,9 +5,9 @@ package controller import ( "net/http" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/locale" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/locale" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/controller/custom_geo.go b/web/controller/custom_geo.go index 677bda99..aab386bf 100644 --- a/web/controller/custom_geo.go +++ b/web/controller/custom_geo.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/entity" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/entity" + "github.com/mhsanaei/3x-ui/v3/web/service" "github.com/gin-gonic/gin" ) diff --git a/web/controller/dist.go b/web/controller/dist.go index 24eca57d..b53e7233 100644 --- a/web/controller/dist.go +++ b/web/controller/dist.go @@ -10,9 +10,9 @@ import ( "github.com/gin-gonic/gin" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/session" ) // distFS is filled in once at startup by the web package via SetDistFS. diff --git a/web/controller/inbound.go b/web/controller/inbound.go index 477d46cc..00d26cc1 100644 --- a/web/controller/inbound.go +++ b/web/controller/inbound.go @@ -6,10 +6,10 @@ import ( "strconv" "time" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/session" - "github.com/mhsanaei/3x-ui/v2/web/websocket" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/session" + "github.com/mhsanaei/3x-ui/v3/web/websocket" "github.com/gin-gonic/gin" ) diff --git a/web/controller/index.go b/web/controller/index.go index ac802026..1e77ab99 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -5,10 +5,10 @@ import ( "text/template" "time" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/middleware" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/middleware" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/controller/node.go b/web/controller/node.go index 715f1a27..675bb34e 100644 --- a/web/controller/node.go +++ b/web/controller/node.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/web/service" "github.com/gin-gonic/gin" ) diff --git a/web/controller/server.go b/web/controller/server.go index 15b1188c..3c739b1f 100644 --- a/web/controller/server.go +++ b/web/controller/server.go @@ -8,11 +8,11 @@ import ( "strconv" "time" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/entity" - "github.com/mhsanaei/3x-ui/v2/web/global" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/websocket" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/entity" + "github.com/mhsanaei/3x-ui/v3/web/global" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/websocket" "github.com/gin-gonic/gin" ) diff --git a/web/controller/setting.go b/web/controller/setting.go index e35a7bde..7c4ec7b1 100644 --- a/web/controller/setting.go +++ b/web/controller/setting.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "github.com/mhsanaei/3x-ui/v2/util/crypto" - "github.com/mhsanaei/3x-ui/v2/web/entity" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/util/crypto" + "github.com/mhsanaei/3x-ui/v3/web/entity" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/controller/util.go b/web/controller/util.go index 5cc18250..20601471 100644 --- a/web/controller/util.go +++ b/web/controller/util.go @@ -7,8 +7,8 @@ import ( "net/netip" "strings" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/entity" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/entity" "github.com/gin-gonic/gin" ) diff --git a/web/controller/websocket.go b/web/controller/websocket.go index f2b4ee0e..3fa57ec7 100644 --- a/web/controller/websocket.go +++ b/web/controller/websocket.go @@ -6,9 +6,9 @@ import ( "net/url" "strings" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-gonic/gin" ws "github.com/gorilla/websocket" diff --git a/web/controller/xray_setting.go b/web/controller/xray_setting.go index 10871951..f161c5eb 100644 --- a/web/controller/xray_setting.go +++ b/web/controller/xray_setting.go @@ -3,8 +3,8 @@ package controller import ( "encoding/json" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/web/service" "github.com/gin-gonic/gin" ) diff --git a/web/controller/xui.go b/web/controller/xui.go index fd633e7b..d385cd50 100644 --- a/web/controller/xui.go +++ b/web/controller/xui.go @@ -3,9 +3,9 @@ package controller import ( "net/http" - "github.com/mhsanaei/3x-ui/v2/web/entity" - "github.com/mhsanaei/3x-ui/v2/web/middleware" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/web/entity" + "github.com/mhsanaei/3x-ui/v3/web/middleware" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/entity/entity.go b/web/entity/entity.go index 8b340279..77e1d661 100644 --- a/web/entity/entity.go +++ b/web/entity/entity.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mhsanaei/3x-ui/v2/util/common" + "github.com/mhsanaei/3x-ui/v3/util/common" ) // Msg represents a standard API response message with success status, message text, and optional data object. diff --git a/web/job/check_client_ip_job.go b/web/job/check_client_ip_job.go index e16cced2..3f1064ff 100644 --- a/web/job/check_client_ip_job.go +++ b/web/job/check_client_ip_job.go @@ -13,10 +13,10 @@ import ( "sort" "time" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/xray" ) // IPWithTimestamp tracks an IP address with its last seen timestamp diff --git a/web/job/check_client_ip_job_integration_test.go b/web/job/check_client_ip_job_integration_test.go index 5a7aa705..830ab8bb 100644 --- a/web/job/check_client_ip_job_integration_test.go +++ b/web/job/check_client_ip_job_integration_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - xuilogger "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + xuilogger "github.com/mhsanaei/3x-ui/v3/logger" "github.com/op/go-logging" ) diff --git a/web/job/check_cpu_usage.go b/web/job/check_cpu_usage.go index b2208f31..2b4592f9 100644 --- a/web/job/check_cpu_usage.go +++ b/web/job/check_cpu_usage.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/web/service" "github.com/shirou/gopsutil/v4/cpu" ) diff --git a/web/job/check_hash_storage.go b/web/job/check_hash_storage.go index 2112079e..1489217e 100644 --- a/web/job/check_hash_storage.go +++ b/web/job/check_hash_storage.go @@ -1,7 +1,7 @@ package job import ( - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/web/service" ) // CheckHashStorageJob periodically cleans up expired hash entries from the Telegram bot's hash storage. diff --git a/web/job/check_xray_running_job.go b/web/job/check_xray_running_job.go index 5b53b0c6..0fefea70 100644 --- a/web/job/check_xray_running_job.go +++ b/web/job/check_xray_running_job.go @@ -3,8 +3,8 @@ package job import ( - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/service" ) // CheckXrayRunningJob monitors Xray process health and restarts it if it crashes. diff --git a/web/job/clear_logs_job.go b/web/job/clear_logs_job.go index 4ec0ec7f..64baacee 100644 --- a/web/job/clear_logs_job.go +++ b/web/job/clear_logs_job.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/xray" ) // ClearLogsJob clears old log files to prevent disk space issues. diff --git a/web/job/ldap_sync_job.go b/web/job/ldap_sync_job.go index 7edb8178..142e9524 100644 --- a/web/job/ldap_sync_job.go +++ b/web/job/ldap_sync_job.go @@ -5,10 +5,10 @@ import ( "strings" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - ldaputil "github.com/mhsanaei/3x-ui/v2/util/ldap" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + ldaputil "github.com/mhsanaei/3x-ui/v3/util/ldap" + "github.com/mhsanaei/3x-ui/v3/web/service" "strconv" diff --git a/web/job/node_heartbeat_job.go b/web/job/node_heartbeat_job.go index 1fa04169..02e7532e 100644 --- a/web/job/node_heartbeat_job.go +++ b/web/job/node_heartbeat_job.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/websocket" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/websocket" ) // nodeHeartbeatConcurrency caps how many remote panels we probe at once. diff --git a/web/job/node_traffic_sync_job.go b/web/job/node_traffic_sync_job.go index 15881072..ff4c225e 100644 --- a/web/job/node_traffic_sync_job.go +++ b/web/job/node_traffic_sync_job.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/runtime" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/websocket" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/runtime" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/websocket" ) // nodeTrafficSyncConcurrency caps how many nodes we sync simultaneously. diff --git a/web/job/periodic_traffic_reset_job.go b/web/job/periodic_traffic_reset_job.go index 48aab2a1..50780765 100644 --- a/web/job/periodic_traffic_reset_job.go +++ b/web/job/periodic_traffic_reset_job.go @@ -1,8 +1,8 @@ package job import ( - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/service" ) // Period represents the time period for traffic resets. diff --git a/web/job/stats_notify_job.go b/web/job/stats_notify_job.go index b93f05cb..14da6dd4 100644 --- a/web/job/stats_notify_job.go +++ b/web/job/stats_notify_job.go @@ -1,7 +1,7 @@ package job import ( - "github.com/mhsanaei/3x-ui/v2/web/service" + "github.com/mhsanaei/3x-ui/v3/web/service" ) // LoginStatus represents the status of a login attempt. diff --git a/web/job/xray_traffic_job.go b/web/job/xray_traffic_job.go index f3b04868..f4f0998d 100644 --- a/web/job/xray_traffic_job.go +++ b/web/job/xray_traffic_job.go @@ -3,10 +3,10 @@ package job import ( "encoding/json" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/websocket" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/websocket" + "github.com/mhsanaei/3x-ui/v3/xray" "github.com/valyala/fasthttp" ) diff --git a/web/locale/locale.go b/web/locale/locale.go index 69aeabff..c530f5ae 100644 --- a/web/locale/locale.go +++ b/web/locale/locale.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/logger" "github.com/gin-gonic/gin" "github.com/nicksnyder/go-i18n/v2/i18n" diff --git a/web/middleware/security.go b/web/middleware/security.go index ec2fa013..c1ac9dc2 100644 --- a/web/middleware/security.go +++ b/web/middleware/security.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/middleware/security_test.go b/web/middleware/security_test.go index 304ae485..ff08049d 100644 --- a/web/middleware/security_test.go +++ b/web/middleware/security_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/mhsanaei/3x-ui/v2/web/session" + "github.com/mhsanaei/3x-ui/v3/web/session" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/cookie" diff --git a/web/runtime/local.go b/web/runtime/local.go index bd88e46a..45e550c3 100644 --- a/web/runtime/local.go +++ b/web/runtime/local.go @@ -6,8 +6,8 @@ import ( "errors" "sync" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/xray" ) // LocalDeps wires the runtime to the panel's xray process and the diff --git a/web/runtime/manager.go b/web/runtime/manager.go index c89499ec..d8739f21 100644 --- a/web/runtime/manager.go +++ b/web/runtime/manager.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" ) // Manager is the entry point for service code that needs a Runtime. diff --git a/web/runtime/remote.go b/web/runtime/remote.go index 2195528a..57ce17be 100644 --- a/web/runtime/remote.go +++ b/web/runtime/remote.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" ) // remoteHTTPTimeout bounds a single remote API call. Generous enough for diff --git a/web/runtime/runtime.go b/web/runtime/runtime.go index dd86d4c1..17d99274 100644 --- a/web/runtime/runtime.go +++ b/web/runtime/runtime.go @@ -12,7 +12,7 @@ package runtime import ( "context" - "github.com/mhsanaei/3x-ui/v2/database/model" + "github.com/mhsanaei/3x-ui/v3/database/model" ) // Runtime is the live-engine adapter for one inbound's worth of diff --git a/web/service/custom_geo.go b/web/service/custom_geo.go index fe7202e6..b52a4ff7 100644 --- a/web/service/custom_geo.go +++ b/web/service/custom_geo.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" ) const ( diff --git a/web/service/custom_geo_test.go b/web/service/custom_geo_test.go index c935b86a..a1e15b8c 100644 --- a/web/service/custom_geo_test.go +++ b/web/service/custom_geo_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/mhsanaei/3x-ui/v2/database/model" + "github.com/mhsanaei/3x-ui/v3/database/model" ) // disableSSRFCheck disables the SSRF guard for the duration of a test, diff --git a/web/service/inbound.go b/web/service/inbound.go index 9c44e840..47311980 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -12,12 +12,12 @@ import ( "time" "github.com/google/uuid" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/web/runtime" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/web/runtime" + "github.com/mhsanaei/3x-ui/v3/xray" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/web/service/node.go b/web/service/node.go index 3fd77f67..afb76f3c 100644 --- a/web/service/node.go +++ b/web/service/node.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/web/runtime" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/web/runtime" ) // HeartbeatPatch is the slice of fields a single Probe() result writes diff --git a/web/service/nord.go b/web/service/nord.go index db0a48f9..d5c49957 100644 --- a/web/service/nord.go +++ b/web/service/nord.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/mhsanaei/3x-ui/v2/util/common" + "github.com/mhsanaei/3x-ui/v3/util/common" ) type NordService struct { diff --git a/web/service/outbound.go b/web/service/outbound.go index ba0205e5..86449f06 100644 --- a/web/service/outbound.go +++ b/web/service/outbound.go @@ -11,13 +11,13 @@ import ( "sync" "time" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/util/json_util" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/util/json_util" + "github.com/mhsanaei/3x-ui/v3/xray" "gorm.io/gorm" ) diff --git a/web/service/panel.go b/web/service/panel.go index 75f2f155..5331eb23 100644 --- a/web/service/panel.go +++ b/web/service/panel.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/logger" ) // PanelService provides business logic for panel management operations. diff --git a/web/service/port_conflict.go b/web/service/port_conflict.go index 12336515..0eb01464 100644 --- a/web/service/port_conflict.go +++ b/web/service/port_conflict.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/util/common" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/util/common" ) // transportBits is a bitmask of L4 transports an inbound listens on. diff --git a/web/service/port_conflict_test.go b/web/service/port_conflict_test.go index d9de3457..984ea52f 100644 --- a/web/service/port_conflict_test.go +++ b/web/service/port_conflict_test.go @@ -5,9 +5,9 @@ import ( "sync" "testing" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - xuilogger "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + xuilogger "github.com/mhsanaei/3x-ui/v3/logger" "github.com/op/go-logging" ) diff --git a/web/service/server.go b/web/service/server.go index b2e04370..e828cc39 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -20,12 +20,12 @@ import ( "sync" "time" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/util/sys" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/util/sys" + "github.com/mhsanaei/3x-ui/v3/xray" "github.com/google/uuid" "github.com/shirou/gopsutil/v4/cpu" diff --git a/web/service/setting.go b/web/service/setting.go index 7c88efc1..0e0ca8f8 100644 --- a/web/service/setting.go +++ b/web/service/setting.go @@ -12,14 +12,14 @@ import ( "strings" "time" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/util/random" - "github.com/mhsanaei/3x-ui/v2/util/reflect_util" - "github.com/mhsanaei/3x-ui/v2/web/entity" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/util/random" + "github.com/mhsanaei/3x-ui/v3/util/reflect_util" + "github.com/mhsanaei/3x-ui/v3/web/entity" + "github.com/mhsanaei/3x-ui/v3/xray" ) //go:embed config.json diff --git a/web/service/tgbot.go b/web/service/tgbot.go index a1a06f1b..bb9028a5 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -22,14 +22,14 @@ import ( "sync" "time" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/web/global" - "github.com/mhsanaei/3x-ui/v2/web/locale" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/web/global" + "github.com/mhsanaei/3x-ui/v3/web/locale" + "github.com/mhsanaei/3x-ui/v3/xray" "github.com/google/uuid" "github.com/mymmrac/telego" diff --git a/web/service/user.go b/web/service/user.go index 6fcf17e7..e5544d5a 100644 --- a/web/service/user.go +++ b/web/service/user.go @@ -3,11 +3,11 @@ package service import ( "errors" - "github.com/mhsanaei/3x-ui/v2/database" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/crypto" - ldaputil "github.com/mhsanaei/3x-ui/v2/util/ldap" + "github.com/mhsanaei/3x-ui/v3/database" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/crypto" + ldaputil "github.com/mhsanaei/3x-ui/v3/util/ldap" "github.com/xlzd/gotp" "gorm.io/gorm" ) diff --git a/web/service/warp.go b/web/service/warp.go index cee716fa..6d36774a 100644 --- a/web/service/warp.go +++ b/web/service/warp.go @@ -9,7 +9,7 @@ import ( "os" "time" - "github.com/mhsanaei/3x-ui/v2/util/common" + "github.com/mhsanaei/3x-ui/v3/util/common" ) // WarpService provides business logic for Cloudflare WARP integration. diff --git a/web/service/websocket.go b/web/service/websocket.go index 0f86322c..cc7d4f72 100644 --- a/web/service/websocket.go +++ b/web/service/websocket.go @@ -7,9 +7,9 @@ package service import ( "time" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/web/websocket" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/web/websocket" "github.com/google/uuid" ws "github.com/gorilla/websocket" diff --git a/web/service/xray.go b/web/service/xray.go index 4601483a..8abb7d8a 100644 --- a/web/service/xray.go +++ b/web/service/xray.go @@ -6,8 +6,8 @@ import ( "runtime" "sync" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/xray" "go.uber.org/atomic" ) diff --git a/web/service/xray_setting.go b/web/service/xray_setting.go index da77404a..4249f018 100644 --- a/web/service/xray_setting.go +++ b/web/service/xray_setting.go @@ -4,8 +4,8 @@ import ( _ "embed" "encoding/json" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/xray" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/xray" ) // XraySettingService provides business logic for Xray configuration management. diff --git a/web/session/session.go b/web/session/session.go index 44684e2e..6ca43e78 100644 --- a/web/session/session.go +++ b/web/session/session.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "github.com/mhsanaei/3x-ui/v2/database/model" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/database/model" + "github.com/mhsanaei/3x-ui/v3/logger" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" diff --git a/web/web.go b/web/web.go index 8c7577f1..784d7210 100644 --- a/web/web.go +++ b/web/web.go @@ -15,17 +15,17 @@ import ( "strings" "time" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" - "github.com/mhsanaei/3x-ui/v2/web/controller" - "github.com/mhsanaei/3x-ui/v2/web/job" - "github.com/mhsanaei/3x-ui/v2/web/locale" - "github.com/mhsanaei/3x-ui/v2/web/middleware" - "github.com/mhsanaei/3x-ui/v2/web/network" - "github.com/mhsanaei/3x-ui/v2/web/runtime" - "github.com/mhsanaei/3x-ui/v2/web/service" - "github.com/mhsanaei/3x-ui/v2/web/websocket" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" + "github.com/mhsanaei/3x-ui/v3/web/controller" + "github.com/mhsanaei/3x-ui/v3/web/job" + "github.com/mhsanaei/3x-ui/v3/web/locale" + "github.com/mhsanaei/3x-ui/v3/web/middleware" + "github.com/mhsanaei/3x-ui/v3/web/network" + "github.com/mhsanaei/3x-ui/v3/web/runtime" + "github.com/mhsanaei/3x-ui/v3/web/service" + "github.com/mhsanaei/3x-ui/v3/web/websocket" "github.com/gin-contrib/gzip" "github.com/gin-contrib/sessions" diff --git a/web/websocket/hub.go b/web/websocket/hub.go index 1aed8f2e..7d43e3e6 100644 --- a/web/websocket/hub.go +++ b/web/websocket/hub.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/logger" ) // MessageType identifies the kind of WebSocket message. diff --git a/web/websocket/notifier.go b/web/websocket/notifier.go index 069aaf73..65f53d9e 100644 --- a/web/websocket/notifier.go +++ b/web/websocket/notifier.go @@ -2,8 +2,8 @@ package websocket import ( - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/web/global" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/web/global" ) // GetHub returns the global WebSocket hub instance. diff --git a/xray/api.go b/xray/api.go index bfb64665..d9c35cb9 100644 --- a/xray/api.go +++ b/xray/api.go @@ -11,8 +11,8 @@ import ( "regexp" "time" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" "github.com/xtls/xray-core/app/proxyman/command" statsService "github.com/xtls/xray-core/app/stats/command" diff --git a/xray/config.go b/xray/config.go index 2b4a6673..35ebfd7d 100644 --- a/xray/config.go +++ b/xray/config.go @@ -3,7 +3,7 @@ package xray import ( "bytes" - "github.com/mhsanaei/3x-ui/v2/util/json_util" + "github.com/mhsanaei/3x-ui/v3/util/json_util" ) // Config represents the complete Xray configuration structure. diff --git a/xray/inbound.go b/xray/inbound.go index cbe4392d..d69e3afc 100644 --- a/xray/inbound.go +++ b/xray/inbound.go @@ -3,7 +3,7 @@ package xray import ( "bytes" - "github.com/mhsanaei/3x-ui/v2/util/json_util" + "github.com/mhsanaei/3x-ui/v3/util/json_util" ) // InboundConfig represents an Xray inbound configuration. diff --git a/xray/log_writer.go b/xray/log_writer.go index b2b3b04a..759507dd 100644 --- a/xray/log_writer.go +++ b/xray/log_writer.go @@ -5,7 +5,7 @@ import ( "runtime" "strings" - "github.com/mhsanaei/3x-ui/v2/logger" + "github.com/mhsanaei/3x-ui/v3/logger" ) // NewLogWriter returns a new LogWriter for processing Xray log output. diff --git a/xray/process.go b/xray/process.go index a60fea03..e76ffcf3 100644 --- a/xray/process.go +++ b/xray/process.go @@ -14,9 +14,9 @@ import ( "syscall" "time" - "github.com/mhsanaei/3x-ui/v2/config" - "github.com/mhsanaei/3x-ui/v2/logger" - "github.com/mhsanaei/3x-ui/v2/util/common" + "github.com/mhsanaei/3x-ui/v3/config" + "github.com/mhsanaei/3x-ui/v3/logger" + "github.com/mhsanaei/3x-ui/v3/util/common" ) // GetBinaryName returns the Xray binary filename for the current OS and architecture.