Merge pull request #1596 from alireza0/test

go package correction
This commit is contained in:
Alireza Ahmadi
2025-09-18 22:45:53 +02:00
committed by GitHub
38 changed files with 113 additions and 112 deletions

View File

@@ -7,9 +7,9 @@ import (
"os"
"path"
"x-ui/config"
"x-ui/database/model"
"x-ui/xray"
"github.com/alireza0/x-ui/config"
"github.com/alireza0/x-ui/database/model"
"github.com/alireza0/x-ui/xray"
"gorm.io/driver/sqlite"
"gorm.io/gorm"

View File

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

2
go.mod
View File

@@ -1,4 +1,4 @@
module x-ui
module github.com/alireza0/x-ui
go 1.25.1

14
main.go
View File

@@ -12,13 +12,13 @@ import (
"syscall"
_ "unsafe"
"x-ui/config"
"x-ui/database"
"x-ui/logger"
"x-ui/sub"
"x-ui/web"
"x-ui/web/global"
"x-ui/web/service"
"github.com/alireza0/x-ui/config"
"github.com/alireza0/x-ui/database"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/sub"
"github.com/alireza0/x-ui/web"
"github.com/alireza0/x-ui/web/global"
"github.com/alireza0/x-ui/web/service"
"github.com/op/go-logging"
"github.com/shirou/gopsutil/v4/net"

View File

@@ -8,12 +8,12 @@ import (
"net/http"
"strconv"
"x-ui/config"
"x-ui/logger"
"x-ui/util/common"
"x-ui/web/middleware"
"x-ui/web/network"
"x-ui/web/service"
"github.com/alireza0/x-ui/config"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/common"
"github.com/alireza0/x-ui/web/middleware"
"github.com/alireza0/x-ui/web/network"
"github.com/alireza0/x-ui/web/service"
"github.com/gin-gonic/gin"
)

View File

@@ -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/alireza0/x-ui/database/model"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/json_util"
"github.com/alireza0/x-ui/util/random"
"github.com/alireza0/x-ui/web/service"
"github.com/alireza0/x-ui/xray"
)
//go:embed default.json

View File

@@ -7,13 +7,13 @@ import (
"strings"
"time"
"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/alireza0/x-ui/database"
"github.com/alireza0/x-ui/database/model"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/common"
"github.com/alireza0/x-ui/util/random"
"github.com/alireza0/x-ui/web/service"
"github.com/alireza0/x-ui/xray"
"github.com/goccy/go-json"
)

View File

@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"x-ui/logger"
"github.com/alireza0/x-ui/logger"
)
func NewErrorf(format string, a ...interface{}) error {

View File

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

View File

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

View File

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

View File

@@ -5,9 +5,9 @@ import (
"text/template"
"time"
"x-ui/logger"
"x-ui/web/service"
"x-ui/web/session"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/web/service"
"github.com/alireza0/x-ui/web/session"
"github.com/gin-gonic/gin"
)

View File

@@ -6,8 +6,8 @@ import (
"regexp"
"time"
"x-ui/web/global"
"x-ui/web/service"
"github.com/alireza0/x-ui/web/global"
"github.com/alireza0/x-ui/web/service"
"github.com/gin-gonic/gin"
)

View File

@@ -4,9 +4,9 @@ import (
"errors"
"time"
"x-ui/web/entity"
"x-ui/web/service"
"x-ui/web/session"
"github.com/alireza0/x-ui/web/entity"
"github.com/alireza0/x-ui/web/service"
"github.com/alireza0/x-ui/web/session"
"github.com/gin-gonic/gin"
)

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
package job
import "x-ui/web/service"
import "github.com/alireza0/x-ui/web/service"
type CheckXrayRunningJob struct {
xrayService service.XrayService

View File

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

View File

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

View File

@@ -5,7 +5,7 @@ import (
"io/fs"
"strings"
"x-ui/logger"
"github.com/alireza0/x-ui/logger"
"github.com/gin-gonic/gin"
"github.com/nicksnyder/go-i18n/v2/i18n"

View File

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

View File

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

View File

@@ -17,12 +17,12 @@ import (
"strings"
"time"
"x-ui/config"
"x-ui/database"
"x-ui/logger"
"x-ui/util/common"
"x-ui/util/sys"
"x-ui/xray"
"github.com/alireza0/x-ui/config"
"github.com/alireza0/x-ui/database"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/common"
"github.com/alireza0/x-ui/util/sys"
"github.com/alireza0/x-ui/xray"
"github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/disk"

View File

@@ -10,13 +10,13 @@ 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"
"github.com/alireza0/x-ui/database"
"github.com/alireza0/x-ui/database/model"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/common"
"github.com/alireza0/x-ui/util/random"
"github.com/alireza0/x-ui/util/reflect_util"
"github.com/alireza0/x-ui/web/entity"
)
//go:embed config.json

View File

@@ -9,13 +9,13 @@ import (
"strings"
"time"
"x-ui/config"
"x-ui/database"
"x-ui/database/model"
"x-ui/logger"
"x-ui/util/common"
"x-ui/web/locale"
"x-ui/xray"
"github.com/alireza0/x-ui/config"
"github.com/alireza0/x-ui/database"
"github.com/alireza0/x-ui/database/model"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/common"
"github.com/alireza0/x-ui/web/locale"
"github.com/alireza0/x-ui/xray"
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
)

View File

@@ -3,9 +3,9 @@ package service
import (
"errors"
"x-ui/database"
"x-ui/database/model"
"x-ui/logger"
"github.com/alireza0/x-ui/database"
"github.com/alireza0/x-ui/database/model"
"github.com/alireza0/x-ui/logger"
"gorm.io/gorm"
)

View File

@@ -7,8 +7,9 @@ import (
"net/http"
"os"
"time"
"x-ui/logger"
"x-ui/util/common"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/common"
)
type WarpService struct {

View File

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

View File

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

View File

@@ -3,7 +3,7 @@ package session
import (
"encoding/gob"
"x-ui/database/model"
"github.com/alireza0/x-ui/database/model"
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"

View File

@@ -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/alireza0/x-ui/config"
"github.com/alireza0/x-ui/logger"
"github.com/alireza0/x-ui/util/common"
"github.com/alireza0/x-ui/web/controller"
"github.com/alireza0/x-ui/web/job"
"github.com/alireza0/x-ui/web/locale"
"github.com/alireza0/x-ui/web/middleware"
"github.com/alireza0/x-ui/web/network"
"github.com/alireza0/x-ui/web/service"
"github.com/gin-contrib/gzip"
"github.com/gin-contrib/sessions"

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@ import (
"regexp"
"strings"
"x-ui/logger"
"github.com/alireza0/x-ui/logger"
)
func NewLogWriter() *LogWriter {

View File

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