From 054cb1dea0d93062e89b915c22f9f318bd82f563 Mon Sep 17 00:00:00 2001 From: mhsanaei Date: Thu, 18 Sep 2025 22:06:01 +0200 Subject: [PATCH] go package correction --- database/db.go | 11 +++--- database/model/model.go | 4 +-- go.mod | 2 +- main.go | 16 ++++----- sub/sub.go | 14 ++++---- sub/subController.go | 3 +- sub/subJsonService.go | 12 +++---- sub/subService.go | 14 ++++---- util/common/err.go | 2 +- web/controller/api.go | 2 +- web/controller/base.go | 6 ++-- web/controller/inbound.go | 6 ++-- web/controller/index.go | 12 +++---- web/controller/server.go | 4 +-- web/controller/setting.go | 8 ++--- web/controller/util.go | 6 ++-- web/controller/xray_setting.go | 2 +- web/entity/entity.go | 2 +- web/job/check_client_ip_job.go | 8 ++--- web/job/check_cpu_usage.go | 2 +- web/job/check_hash_storage.go | 2 +- web/job/check_xray_running_job.go | 4 +-- web/job/clear_logs_job.go | 4 +-- web/job/periodic_traffic_reset_job.go | 4 +-- web/job/stats_notify_job.go | 2 +- web/job/xray_traffic_job.go | 7 ++-- web/locale/locale.go | 2 +- web/service/inbound.go | 10 +++--- web/service/outbound.go | 8 ++--- web/service/panel.go | 2 +- web/service/server.go | 12 +++---- web/service/setting.go | 16 ++++----- web/service/tgbot.go | 49 +++++++++++++-------------- web/service/user.go | 8 ++--- web/service/warp.go | 5 +-- web/service/xray.go | 4 +-- web/service/xray_setting.go | 4 +-- web/session/session.go | 2 +- web/web.go | 18 +++++----- xray/api.go | 6 ++-- xray/config.go | 2 +- xray/inbound.go | 2 +- xray/log_writer.go | 2 +- xray/process.go | 6 ++-- 44 files changed, 161 insertions(+), 156 deletions(-) diff --git a/database/db.go b/database/db.go index c72d28cf..e85f0049 100644 --- a/database/db.go +++ b/database/db.go @@ -9,10 +9,10 @@ import ( "path" "slices" - "x-ui/config" - "x-ui/database/model" - "x-ui/util/crypto" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/config" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/util/crypto" + "github.com/mhsanaei/3x-ui/xray" "gorm.io/driver/sqlite" "gorm.io/gorm" @@ -141,6 +141,9 @@ func InitDB(dbPath string) error { } isUsersEmpty, err := isTableEmpty("users") + if err != nil { + return err + } if err := initUser(); err != nil { return err diff --git a/database/model/model.go b/database/model/model.go index dcb795c7..7ea7fd55 100644 --- a/database/model/model.go +++ b/database/model/model.go @@ -3,8 +3,8 @@ package model import ( "fmt" - "x-ui/util/json_util" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/util/json_util" + "github.com/mhsanaei/3x-ui/xray" ) type Protocol string diff --git a/go.mod b/go.mod index 41b9fee9..9fed4e54 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module x-ui +module github.com/mhsanaei/3x-ui go 1.25.1 diff --git a/main.go b/main.go index 9986ede1..ea7e57a4 100644 --- a/main.go +++ b/main.go @@ -9,14 +9,14 @@ import ( "syscall" _ "unsafe" - "x-ui/config" - "x-ui/database" - "x-ui/logger" - "x-ui/sub" - "x-ui/util/crypto" - "x-ui/web" - "x-ui/web/global" - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/config" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/sub" + "github.com/mhsanaei/3x-ui/util/crypto" + "github.com/mhsanaei/3x-ui/web" + "github.com/mhsanaei/3x-ui/web/global" + "github.com/mhsanaei/3x-ui/web/service" "github.com/joho/godotenv" "github.com/op/go-logging" diff --git a/sub/sub.go b/sub/sub.go index e2876a61..5c2e0aa0 100644 --- a/sub/sub.go +++ b/sub/sub.go @@ -13,13 +13,13 @@ import ( "strconv" "strings" - "x-ui/logger" - "x-ui/util/common" - webpkg "x-ui/web" - "x-ui/web/locale" - "x-ui/web/middleware" - "x-ui/web/network" - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" + webpkg "github.com/mhsanaei/3x-ui/web" + "github.com/mhsanaei/3x-ui/web/locale" + "github.com/mhsanaei/3x-ui/web/middleware" + "github.com/mhsanaei/3x-ui/web/network" + "github.com/mhsanaei/3x-ui/web/service" "github.com/gin-gonic/gin" ) diff --git a/sub/subController.go b/sub/subController.go index b29d019e..481ef9ab 100644 --- a/sub/subController.go +++ b/sub/subController.go @@ -4,7 +4,8 @@ import ( "encoding/base64" "fmt" "strings" - "x-ui/config" + + "github.com/mhsanaei/3x-ui/config" "github.com/gin-gonic/gin" ) diff --git a/sub/subJsonService.go b/sub/subJsonService.go index d3eceb55..4cb2bada 100644 --- a/sub/subJsonService.go +++ b/sub/subJsonService.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "x-ui/database/model" - "x-ui/logger" - "x-ui/util/json_util" - "x-ui/util/random" - "x-ui/web/service" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/json_util" + "github.com/mhsanaei/3x-ui/util/random" + "github.com/mhsanaei/3x-ui/web/service" + "github.com/mhsanaei/3x-ui/xray" ) //go:embed default.json diff --git a/sub/subService.go b/sub/subService.go index 201fa09d..da5cd592 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -11,13 +11,13 @@ import ( "github.com/gin-gonic/gin" "github.com/goccy/go-json" - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - "x-ui/util/common" - "x-ui/util/random" - "x-ui/web/service" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" + "github.com/mhsanaei/3x-ui/util/random" + "github.com/mhsanaei/3x-ui/web/service" + "github.com/mhsanaei/3x-ui/xray" ) type SubService struct { diff --git a/util/common/err.go b/util/common/err.go index 618bf8f3..078a0652 100644 --- a/util/common/err.go +++ b/util/common/err.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "x-ui/logger" + "github.com/mhsanaei/3x-ui/logger" ) func NewErrorf(format string, a ...any) error { diff --git a/web/controller/api.go b/web/controller/api.go index 6edd7939..121cb420 100644 --- a/web/controller/api.go +++ b/web/controller/api.go @@ -1,7 +1,7 @@ package controller import ( - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/service" "github.com/gin-gonic/gin" ) diff --git a/web/controller/base.go b/web/controller/base.go index 492fc2dc..cd4a2ba6 100644 --- a/web/controller/base.go +++ b/web/controller/base.go @@ -3,9 +3,9 @@ package controller import ( "net/http" - "x-ui/logger" - "x-ui/web/locale" - "x-ui/web/session" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/web/locale" + "github.com/mhsanaei/3x-ui/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/controller/inbound.go b/web/controller/inbound.go index 8d610e7d..172e76bc 100644 --- a/web/controller/inbound.go +++ b/web/controller/inbound.go @@ -5,9 +5,9 @@ import ( "fmt" "strconv" - "x-ui/database/model" - "x-ui/web/service" - "x-ui/web/session" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/controller/index.go b/web/controller/index.go index c19d1b6e..ee39875a 100644 --- a/web/controller/index.go +++ b/web/controller/index.go @@ -5,18 +5,18 @@ import ( "text/template" "time" - "x-ui/logger" - "x-ui/web/service" - "x-ui/web/session" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/session" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" ) type LoginForm struct { - Username string `json:"username" form:"username"` - Password string `json:"password" form:"password"` - TwoFactorCode string `json:"twoFactorCode" form:"twoFactorCode"` + Username string `json:"username" form:"username"` + Password string `json:"password" form:"password"` + TwoFactorCode string `json:"twoFactorCode" form:"twoFactorCode"` } type IndexController struct { diff --git a/web/controller/server.go b/web/controller/server.go index 169a1ae7..46a879bd 100644 --- a/web/controller/server.go +++ b/web/controller/server.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "x-ui/web/global" - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/global" + "github.com/mhsanaei/3x-ui/web/service" "github.com/gin-gonic/gin" ) diff --git a/web/controller/setting.go b/web/controller/setting.go index ddd9f55a..5bf226cc 100644 --- a/web/controller/setting.go +++ b/web/controller/setting.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "x-ui/util/crypto" - "x-ui/web/entity" - "x-ui/web/service" - "x-ui/web/session" + "github.com/mhsanaei/3x-ui/util/crypto" + "github.com/mhsanaei/3x-ui/web/entity" + "github.com/mhsanaei/3x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/session" "github.com/gin-gonic/gin" ) diff --git a/web/controller/util.go b/web/controller/util.go index a77d0e35..eb9b1d0a 100644 --- a/web/controller/util.go +++ b/web/controller/util.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "x-ui/config" - "x-ui/logger" - "x-ui/web/entity" + "github.com/mhsanaei/3x-ui/config" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/web/entity" "github.com/gin-gonic/gin" ) diff --git a/web/controller/xray_setting.go b/web/controller/xray_setting.go index 2b5e0db1..8d0bb19a 100644 --- a/web/controller/xray_setting.go +++ b/web/controller/xray_setting.go @@ -1,7 +1,7 @@ package controller import ( - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/service" "github.com/gin-gonic/gin" ) diff --git a/web/entity/entity.go b/web/entity/entity.go index dd6885f6..be89a582 100644 --- a/web/entity/entity.go +++ b/web/entity/entity.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "x-ui/util/common" + "github.com/mhsanaei/3x-ui/util/common" ) type Msg struct { diff --git a/web/job/check_client_ip_job.go b/web/job/check_client_ip_job.go index a9b7302b..aa133291 100644 --- a/web/job/check_client_ip_job.go +++ b/web/job/check_client_ip_job.go @@ -12,10 +12,10 @@ import ( "sort" "time" - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/xray" ) type CheckClientIpJob struct { diff --git a/web/job/check_cpu_usage.go b/web/job/check_cpu_usage.go index cd9fcc9a..eb93f331 100644 --- a/web/job/check_cpu_usage.go +++ b/web/job/check_cpu_usage.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/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 468aa2e0..bffd9586 100644 --- a/web/job/check_hash_storage.go +++ b/web/job/check_hash_storage.go @@ -1,7 +1,7 @@ package job import ( - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/service" ) type CheckHashStorageJob struct { diff --git a/web/job/check_xray_running_job.go b/web/job/check_xray_running_job.go index b28caf2b..a2f8b08c 100644 --- a/web/job/check_xray_running_job.go +++ b/web/job/check_xray_running_job.go @@ -1,8 +1,8 @@ package job import ( - "x-ui/logger" - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/web/service" ) type CheckXrayRunningJob struct { diff --git a/web/job/clear_logs_job.go b/web/job/clear_logs_job.go index c6f1d7cc..d40260e1 100644 --- a/web/job/clear_logs_job.go +++ b/web/job/clear_logs_job.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "x-ui/logger" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/xray" ) type ClearLogsJob struct{} diff --git a/web/job/periodic_traffic_reset_job.go b/web/job/periodic_traffic_reset_job.go index 1369c200..32225139 100644 --- a/web/job/periodic_traffic_reset_job.go +++ b/web/job/periodic_traffic_reset_job.go @@ -1,8 +1,8 @@ package job import ( - "x-ui/logger" - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/web/service" ) type Period string diff --git a/web/job/stats_notify_job.go b/web/job/stats_notify_job.go index ae5eba70..996a19aa 100644 --- a/web/job/stats_notify_job.go +++ b/web/job/stats_notify_job.go @@ -1,7 +1,7 @@ package job import ( - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/web/service" ) type LoginStatus byte diff --git a/web/job/xray_traffic_job.go b/web/job/xray_traffic_job.go index 76022bc9..da56e148 100644 --- a/web/job/xray_traffic_job.go +++ b/web/job/xray_traffic_job.go @@ -2,9 +2,10 @@ package job import ( "encoding/json" - "x-ui/logger" - "x-ui/web/service" - "x-ui/xray" + + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/web/service" + "github.com/mhsanaei/3x-ui/xray" "github.com/valyala/fasthttp" ) diff --git a/web/locale/locale.go b/web/locale/locale.go index c071dc68..fa41dba1 100644 --- a/web/locale/locale.go +++ b/web/locale/locale.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "x-ui/logger" + "github.com/mhsanaei/3x-ui/logger" "github.com/gin-gonic/gin" "github.com/nicksnyder/go-i18n/v2/i18n" diff --git a/web/service/inbound.go b/web/service/inbound.go index d6955992..8dafae9d 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - "x-ui/util/common" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" + "github.com/mhsanaei/3x-ui/xray" "gorm.io/gorm" ) diff --git a/web/service/outbound.go b/web/service/outbound.go index 506cf618..d7e738f1 100644 --- a/web/service/outbound.go +++ b/web/service/outbound.go @@ -1,10 +1,10 @@ package service import ( - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/xray" "gorm.io/gorm" ) diff --git a/web/service/panel.go b/web/service/panel.go index 3b0c75a5..08c59f5e 100644 --- a/web/service/panel.go +++ b/web/service/panel.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - "x-ui/logger" + "github.com/mhsanaei/3x-ui/logger" ) type PanelService struct{} diff --git a/web/service/server.go b/web/service/server.go index 670e622e..084a2ee2 100644 --- a/web/service/server.go +++ b/web/service/server.go @@ -19,12 +19,12 @@ import ( "sync" "time" - "x-ui/config" - "x-ui/database" - "x-ui/logger" - "x-ui/util/common" - "x-ui/util/sys" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/config" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" + "github.com/mhsanaei/3x-ui/util/sys" + "github.com/mhsanaei/3x-ui/xray" "github.com/google/uuid" "github.com/shirou/gopsutil/v4/cpu" diff --git a/web/service/setting.go b/web/service/setting.go index 39961ad5..c3dc6a1d 100644 --- a/web/service/setting.go +++ b/web/service/setting.go @@ -10,14 +10,14 @@ import ( "strings" "time" - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - "x-ui/util/common" - "x-ui/util/random" - "x-ui/util/reflect_util" - "x-ui/web/entity" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" + "github.com/mhsanaei/3x-ui/util/random" + "github.com/mhsanaei/3x-ui/util/reflect_util" + "github.com/mhsanaei/3x-ui/web/entity" + "github.com/mhsanaei/3x-ui/xray" ) //go:embed config.json diff --git a/web/service/tgbot.go b/web/service/tgbot.go index dd6ac196..bb2d89cf 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -18,14 +18,14 @@ import ( "strings" "time" - "x-ui/config" - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - "x-ui/util/common" - "x-ui/web/global" - "x-ui/web/locale" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/config" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" + "github.com/mhsanaei/3x-ui/web/global" + "github.com/mhsanaei/3x-ui/web/locale" + "github.com/mhsanaei/3x-ui/xray" "github.com/google/uuid" "github.com/mymmrac/telego" @@ -1581,23 +1581,6 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool ) prompt_message := t.I18nBot("tgbot.messages.comment_prompt", "ClientComment=="+client_Comment) t.SendMsgToTgbot(chatId, prompt_message, cancel_btn_markup) - default: - // dynamic callbacks - if strings.HasPrefix(callbackQuery.Data, "client_sub_links ") { - email := strings.TrimPrefix(callbackQuery.Data, "client_sub_links ") - t.sendClientSubLinks(chatId, email) - return - } - if strings.HasPrefix(callbackQuery.Data, "client_individual_links ") { - email := strings.TrimPrefix(callbackQuery.Data, "client_individual_links ") - t.sendClientIndividualLinks(chatId, email) - return - } - if strings.HasPrefix(callbackQuery.Data, "client_qr_links ") { - email := strings.TrimPrefix(callbackQuery.Data, "client_qr_links ") - t.sendClientQRLinks(chatId, email) - return - } case "add_client_ch_default_traffic": inlineKeyboard := tu.InlineKeyboard( tu.InlineKeyboardRow( @@ -1813,6 +1796,22 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool t.SendMsgToTgbot(chatId, msg, tu.ReplyKeyboardRemove()) } + default: + if after, ok := strings.CutPrefix(callbackQuery.Data, "client_sub_links "); ok { + email := after + t.sendClientSubLinks(chatId, email) + return + } + if after, ok := strings.CutPrefix(callbackQuery.Data, "client_individual_links "); ok { + email := after + t.sendClientIndividualLinks(chatId, email) + return + } + if after, ok := strings.CutPrefix(callbackQuery.Data, "client_qr_links "); ok { + email := after + t.sendClientQRLinks(chatId, email) + return + } } } diff --git a/web/service/user.go b/web/service/user.go index ff5b8531..cfce219a 100644 --- a/web/service/user.go +++ b/web/service/user.go @@ -3,10 +3,10 @@ package service import ( "errors" - "x-ui/database" - "x-ui/database/model" - "x-ui/logger" - "x-ui/util/crypto" + "github.com/mhsanaei/3x-ui/database" + "github.com/mhsanaei/3x-ui/database/model" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/crypto" "github.com/xlzd/gotp" "gorm.io/gorm" diff --git a/web/service/warp.go b/web/service/warp.go index 0ed8bee2..302d5cf3 100644 --- a/web/service/warp.go +++ b/web/service/warp.go @@ -7,8 +7,9 @@ import ( "net/http" "os" "time" - "x-ui/logger" - "x-ui/util/common" + + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" ) type WarpService struct { diff --git a/web/service/xray.go b/web/service/xray.go index f23ce9c4..8367d061 100644 --- a/web/service/xray.go +++ b/web/service/xray.go @@ -6,8 +6,8 @@ import ( "runtime" "sync" - "x-ui/logger" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/xray" "go.uber.org/atomic" ) diff --git a/web/service/xray_setting.go b/web/service/xray_setting.go index f497bf84..aadecd8d 100644 --- a/web/service/xray_setting.go +++ b/web/service/xray_setting.go @@ -4,8 +4,8 @@ import ( _ "embed" "encoding/json" - "x-ui/util/common" - "x-ui/xray" + "github.com/mhsanaei/3x-ui/util/common" + "github.com/mhsanaei/3x-ui/xray" ) type XraySettingService struct { diff --git a/web/session/session.go b/web/session/session.go index c793c713..961b01da 100644 --- a/web/session/session.go +++ b/web/session/session.go @@ -4,7 +4,7 @@ import ( "encoding/gob" "net/http" - "x-ui/database/model" + "github.com/mhsanaei/3x-ui/database/model" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" diff --git a/web/web.go b/web/web.go index 9d49cb80..1aa18fe7 100644 --- a/web/web.go +++ b/web/web.go @@ -14,15 +14,15 @@ import ( "strings" "time" - "x-ui/config" - "x-ui/logger" - "x-ui/util/common" - "x-ui/web/controller" - "x-ui/web/job" - "x-ui/web/locale" - "x-ui/web/middleware" - "x-ui/web/network" - "x-ui/web/service" + "github.com/mhsanaei/3x-ui/config" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" + "github.com/mhsanaei/3x-ui/web/controller" + "github.com/mhsanaei/3x-ui/web/job" + "github.com/mhsanaei/3x-ui/web/locale" + "github.com/mhsanaei/3x-ui/web/middleware" + "github.com/mhsanaei/3x-ui/web/network" + "github.com/mhsanaei/3x-ui/web/service" "github.com/gin-contrib/gzip" "github.com/gin-contrib/sessions" diff --git a/xray/api.go b/xray/api.go index d68b1f96..2a220e67 100644 --- a/xray/api.go +++ b/xray/api.go @@ -4,12 +4,12 @@ import ( "context" "encoding/json" "fmt" + "math" "regexp" "time" - "math" - "x-ui/logger" - "x-ui/util/common" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/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 a246b845..041036b8 100644 --- a/xray/config.go +++ b/xray/config.go @@ -3,7 +3,7 @@ package xray import ( "bytes" - "x-ui/util/json_util" + "github.com/mhsanaei/3x-ui/util/json_util" ) type Config struct { diff --git a/xray/inbound.go b/xray/inbound.go index ea11449d..db1d421c 100644 --- a/xray/inbound.go +++ b/xray/inbound.go @@ -3,7 +3,7 @@ package xray import ( "bytes" - "x-ui/util/json_util" + "github.com/mhsanaei/3x-ui/util/json_util" ) type InboundConfig struct { diff --git a/xray/log_writer.go b/xray/log_writer.go index d91ace3b..2e30c922 100644 --- a/xray/log_writer.go +++ b/xray/log_writer.go @@ -5,7 +5,7 @@ import ( "runtime" "strings" - "x-ui/logger" + "github.com/mhsanaei/3x-ui/logger" ) func NewLogWriter() *LogWriter { diff --git a/xray/process.go b/xray/process.go index 319f96d0..c8c7bb30 100644 --- a/xray/process.go +++ b/xray/process.go @@ -13,9 +13,9 @@ import ( "syscall" "time" - "x-ui/config" - "x-ui/logger" - "x-ui/util/common" + "github.com/mhsanaei/3x-ui/config" + "github.com/mhsanaei/3x-ui/logger" + "github.com/mhsanaei/3x-ui/util/common" ) func GetBinaryName() string {