go package correction v2
Some checks are pending
Release 3X-UI / build (386) (push) Waiting to run
Release 3X-UI / build (amd64) (push) Waiting to run
Release 3X-UI / build (arm64) (push) Waiting to run
Release 3X-UI / build (armv5) (push) Waiting to run
Release 3X-UI / build (armv6) (push) Waiting to run
Release 3X-UI / build (armv7) (push) Waiting to run
Release 3X-UI / build (s390x) (push) Waiting to run
Release 3X-UI / Build for Windows (push) Waiting to run

This commit is contained in:
mhsanaei 2025-09-19 10:05:43 +02:00
parent 0ffd27c0aa
commit 7447cec17e
No known key found for this signature in database
GPG key ID: D875CD086CF668A0
44 changed files with 135 additions and 135 deletions

View file

@ -9,10 +9,10 @@ import (
"path" "path"
"slices" "slices"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/util/crypto" "github.com/mhsanaei/3x-ui/v2/util/crypto"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
"gorm.io/driver/sqlite" "gorm.io/driver/sqlite"
"gorm.io/gorm" "gorm.io/gorm"

View file

@ -3,8 +3,8 @@ package model
import ( import (
"fmt" "fmt"
"github.com/mhsanaei/3x-ui/util/json_util" "github.com/mhsanaei/3x-ui/v2/util/json_util"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
) )
type Protocol string type Protocol string

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/mhsanaei/3x-ui module github.com/mhsanaei/3x-ui/v2
go 1.25.1 go 1.25.1

16
main.go
View file

@ -9,14 +9,14 @@ import (
"syscall" "syscall"
_ "unsafe" _ "unsafe"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/sub" "github.com/mhsanaei/3x-ui/v2/sub"
"github.com/mhsanaei/3x-ui/util/crypto" "github.com/mhsanaei/3x-ui/v2/util/crypto"
"github.com/mhsanaei/3x-ui/web" "github.com/mhsanaei/3x-ui/v2/web"
"github.com/mhsanaei/3x-ui/web/global" "github.com/mhsanaei/3x-ui/v2/web/global"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/joho/godotenv" "github.com/joho/godotenv"
"github.com/op/go-logging" "github.com/op/go-logging"

View file

@ -13,13 +13,13 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
webpkg "github.com/mhsanaei/3x-ui/web" webpkg "github.com/mhsanaei/3x-ui/v2/web"
"github.com/mhsanaei/3x-ui/web/locale" "github.com/mhsanaei/3x-ui/v2/web/locale"
"github.com/mhsanaei/3x-ui/web/middleware" "github.com/mhsanaei/3x-ui/v2/web/middleware"
"github.com/mhsanaei/3x-ui/web/network" "github.com/mhsanaei/3x-ui/v2/web/network"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -6,12 +6,12 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/json_util" "github.com/mhsanaei/3x-ui/v2/util/json_util"
"github.com/mhsanaei/3x-ui/util/random" "github.com/mhsanaei/3x-ui/v2/util/random"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
) )
//go:embed default.json //go:embed default.json

View file

@ -11,13 +11,13 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/goccy/go-json" "github.com/goccy/go-json"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/mhsanaei/3x-ui/util/random" "github.com/mhsanaei/3x-ui/v2/util/random"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
) )
type SubService struct { type SubService struct {

View file

@ -4,7 +4,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
) )
func NewErrorf(format string, a ...any) error { func NewErrorf(format string, a ...any) error {

View file

@ -1,7 +1,7 @@
package controller package controller
import ( import (
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -3,9 +3,9 @@ package controller
import ( import (
"net/http" "net/http"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/web/locale" "github.com/mhsanaei/3x-ui/v2/web/locale"
"github.com/mhsanaei/3x-ui/web/session" "github.com/mhsanaei/3x-ui/v2/web/session"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/mhsanaei/3x-ui/web/session" "github.com/mhsanaei/3x-ui/v2/web/session"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -5,9 +5,9 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/mhsanaei/3x-ui/web/session" "github.com/mhsanaei/3x-ui/v2/web/session"
"github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"

View file

@ -7,8 +7,8 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/mhsanaei/3x-ui/web/global" "github.com/mhsanaei/3x-ui/v2/web/global"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -4,10 +4,10 @@ import (
"errors" "errors"
"time" "time"
"github.com/mhsanaei/3x-ui/util/crypto" "github.com/mhsanaei/3x-ui/v2/util/crypto"
"github.com/mhsanaei/3x-ui/web/entity" "github.com/mhsanaei/3x-ui/v2/web/entity"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/mhsanaei/3x-ui/web/session" "github.com/mhsanaei/3x-ui/v2/web/session"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -5,9 +5,9 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/web/entity" "github.com/mhsanaei/3x-ui/v2/web/entity"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -1,7 +1,7 @@
package controller package controller
import ( import (
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

View file

@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
) )
type Msg struct { type Msg struct {

View file

@ -12,10 +12,10 @@ import (
"sort" "sort"
"time" "time"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
) )
type CheckClientIpJob struct { type CheckClientIpJob struct {

View file

@ -4,7 +4,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"
) )

View file

@ -1,7 +1,7 @@
package job package job
import ( import (
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
) )
type CheckHashStorageJob struct { type CheckHashStorageJob struct {

View file

@ -1,8 +1,8 @@
package job package job
import ( import (
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
) )
type CheckXrayRunningJob struct { type CheckXrayRunningJob struct {

View file

@ -5,8 +5,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
) )
type ClearLogsJob struct{} type ClearLogsJob struct{}

View file

@ -1,8 +1,8 @@
package job package job
import ( import (
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
) )
type Period string type Period string

View file

@ -1,7 +1,7 @@
package job package job
import ( import (
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
) )
type LoginStatus byte type LoginStatus byte

View file

@ -3,9 +3,9 @@ package job
import ( import (
"encoding/json" "encoding/json"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
) )

View file

@ -6,7 +6,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n"

View file

@ -8,11 +8,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
"gorm.io/gorm" "gorm.io/gorm"
) )

View file

@ -1,10 +1,10 @@
package service package service
import ( import (
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
"gorm.io/gorm" "gorm.io/gorm"
) )

View file

@ -5,7 +5,7 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
) )
type PanelService struct{} type PanelService struct{}

View file

@ -19,12 +19,12 @@ import (
"sync" "sync"
"time" "time"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/mhsanaei/3x-ui/util/sys" "github.com/mhsanaei/3x-ui/v2/util/sys"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"

View file

@ -10,14 +10,14 @@ import (
"strings" "strings"
"time" "time"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/mhsanaei/3x-ui/util/random" "github.com/mhsanaei/3x-ui/v2/util/random"
"github.com/mhsanaei/3x-ui/util/reflect_util" "github.com/mhsanaei/3x-ui/v2/util/reflect_util"
"github.com/mhsanaei/3x-ui/web/entity" "github.com/mhsanaei/3x-ui/v2/web/entity"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
) )
//go:embed config.json //go:embed config.json

View file

@ -18,14 +18,14 @@ import (
"strings" "strings"
"time" "time"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/mhsanaei/3x-ui/web/global" "github.com/mhsanaei/3x-ui/v2/web/global"
"github.com/mhsanaei/3x-ui/web/locale" "github.com/mhsanaei/3x-ui/v2/web/locale"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/mymmrac/telego" "github.com/mymmrac/telego"

View file

@ -3,10 +3,10 @@ package service
import ( import (
"errors" "errors"
"github.com/mhsanaei/3x-ui/database" "github.com/mhsanaei/3x-ui/v2/database"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/crypto" "github.com/mhsanaei/3x-ui/v2/util/crypto"
"github.com/xlzd/gotp" "github.com/xlzd/gotp"
"gorm.io/gorm" "gorm.io/gorm"

View file

@ -8,8 +8,8 @@ import (
"os" "os"
"time" "time"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
) )
type WarpService struct { type WarpService struct {

View file

@ -6,8 +6,8 @@ import (
"runtime" "runtime"
"sync" "sync"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
"go.uber.org/atomic" "go.uber.org/atomic"
) )

View file

@ -4,8 +4,8 @@ import (
_ "embed" _ "embed"
"encoding/json" "encoding/json"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/mhsanaei/3x-ui/xray" "github.com/mhsanaei/3x-ui/v2/xray"
) )
type XraySettingService struct { type XraySettingService struct {

View file

@ -4,7 +4,7 @@ import (
"encoding/gob" "encoding/gob"
"net/http" "net/http"
"github.com/mhsanaei/3x-ui/database/model" "github.com/mhsanaei/3x-ui/v2/database/model"
"github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"

View file

@ -14,15 +14,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/mhsanaei/3x-ui/web/controller" "github.com/mhsanaei/3x-ui/v2/web/controller"
"github.com/mhsanaei/3x-ui/web/job" "github.com/mhsanaei/3x-ui/v2/web/job"
"github.com/mhsanaei/3x-ui/web/locale" "github.com/mhsanaei/3x-ui/v2/web/locale"
"github.com/mhsanaei/3x-ui/web/middleware" "github.com/mhsanaei/3x-ui/v2/web/middleware"
"github.com/mhsanaei/3x-ui/web/network" "github.com/mhsanaei/3x-ui/v2/web/network"
"github.com/mhsanaei/3x-ui/web/service" "github.com/mhsanaei/3x-ui/v2/web/service"
"github.com/gin-contrib/gzip" "github.com/gin-contrib/gzip"
"github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions"

View file

@ -8,8 +8,8 @@ import (
"regexp" "regexp"
"time" "time"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
"github.com/xtls/xray-core/app/proxyman/command" "github.com/xtls/xray-core/app/proxyman/command"
statsService "github.com/xtls/xray-core/app/stats/command" statsService "github.com/xtls/xray-core/app/stats/command"

View file

@ -3,7 +3,7 @@ package xray
import ( import (
"bytes" "bytes"
"github.com/mhsanaei/3x-ui/util/json_util" "github.com/mhsanaei/3x-ui/v2/util/json_util"
) )
type Config struct { type Config struct {

View file

@ -3,7 +3,7 @@ package xray
import ( import (
"bytes" "bytes"
"github.com/mhsanaei/3x-ui/util/json_util" "github.com/mhsanaei/3x-ui/v2/util/json_util"
) )
type InboundConfig struct { type InboundConfig struct {

View file

@ -5,7 +5,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
) )
func NewLogWriter() *LogWriter { func NewLogWriter() *LogWriter {

View file

@ -13,9 +13,9 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/mhsanaei/3x-ui/config" "github.com/mhsanaei/3x-ui/v2/config"
"github.com/mhsanaei/3x-ui/logger" "github.com/mhsanaei/3x-ui/v2/logger"
"github.com/mhsanaei/3x-ui/util/common" "github.com/mhsanaei/3x-ui/v2/util/common"
) )
func GetBinaryName() string { func GetBinaryName() string {