gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-14 05:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1596 from alireza0/test

Browse Source 
go package correction
This commit is contained in:
Alireza Ahmadi
2025-09-18 22:45:53 +02:00
committed by GitHub
parent 832d561d52 b6252151f4
commit 1b0828eb3e
38 changed files with 113 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
database/db.go
View File

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

4
database/model/model.go
View File

@@ -3,8 +3,8 @@ package model
import ( import (
"fmt" "fmt"
"x-ui/util/json_util" "github.com/alireza0/x-ui/util/json_util"
"x-ui/xray" "github.com/alireza0/x-ui/xray"
) )
type Protocol string 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 go 1.25.1

14
main.go
View File

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

12
sub/sub.go
View File

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

12
sub/subJsonService.go
View File

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

14
sub/subService.go
View File

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

2
util/common/err.go
View File

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

2
web/controller/api.go
View File

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

6
web/controller/base.go
View File

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

6
web/controller/inbound.go
View File

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

6
web/controller/index.go
View File

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

4
web/controller/server.go
View File

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

6
web/controller/setting.go
View File

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

6
web/controller/util.go
View File

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

2
web/controller/xray_setting.go
View File

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

2
web/entity/entity.go
View File

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

2
web/job/check_cpu_usage.go
View File

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

2
web/job/check_xray_running_job.go
View File

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

2
web/job/stats_notify_job.go
View File

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

4
web/job/xray_traffic_job.go
View File

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

2
web/locale/locale.go
View File

@@ -5,7 +5,7 @@ import (
"io/fs" "io/fs"
"strings" "strings"
"x-ui/logger" "github.com/alireza0/x-ui/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"

10
web/service/inbound.go
View File

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

2
web/service/panel.go
View File

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

12
web/service/server.go
View File

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

14
web/service/setting.go
View File

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

14
web/service/tgbot.go
View File

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

6
web/service/user.go
View File

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

5
web/service/warp.go
View File

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

4
web/service/xray.go
View File

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

4
web/service/xray_setting.go
View File

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

2
web/session/session.go
View File

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

18
web/web.go
View File

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

4
xray/api.go
View File

@@ -7,8 +7,8 @@ import (
"regexp" "regexp"
"time" "time"
"x-ui/logger" "github.com/alireza0/x-ui/logger"
"x-ui/util/common" "github.com/alireza0/x-ui/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"

2
xray/config.go
View File

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

2
xray/inbound.go
View File

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

2
xray/log_writer.go
View File

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

6
xray/process.go
View File

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