Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-10-13 19:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

go package correction

Browse source
This commit is contained in:
mhsanaei 2025-09-18 22:06:01 +02:00
parent 3757ae0b11
commit 054cb1dea0
No known key found for this signature in database
GPG key ID: D875CD086CF668A0
44 changed files with 161 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
database/db.go
View file

@ -9,10 +9,10 @@ import (
"path" "path"
"slices" "slices"
"x-ui/config" "github.com/mhsanaei/3x-ui/config"
"x-ui/database/model" "github.com/mhsanaei/3x-ui/database/model"
"x-ui/util/crypto" "github.com/mhsanaei/3x-ui/util/crypto"
"x-ui/xray" "github.com/mhsanaei/3x-ui/xray"
"gorm.io/driver/sqlite" "gorm.io/driver/sqlite"
"gorm.io/gorm" "gorm.io/gorm"
@ -141,6 +141,9 @@ func InitDB(dbPath string) error {
} }
isUsersEmpty, err := isTableEmpty("users") isUsersEmpty, err := isTableEmpty("users")
if err != nil {
return err
}
if err := initUser(); err != nil { if err := initUser(); err != nil {
return err return err

4
database/model/model.go
View file

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

2
go.mod
View file

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

16
main.go
View file

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

14
sub/sub.go
View file

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

3
sub/subController.go
View file

@ -4,7 +4,8 @@ import (
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"strings" "strings"
"x-ui/config"
"github.com/mhsanaei/3x-ui/config"
"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/mhsanaei/3x-ui/database/model"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/util/json_util" "github.com/mhsanaei/3x-ui/util/json_util"
"x-ui/util/random" "github.com/mhsanaei/3x-ui/util/random"
"x-ui/web/service" "github.com/mhsanaei/3x-ui/web/service"
"x-ui/xray" "github.com/mhsanaei/3x-ui/xray"
) )
//go:embed default.json //go:embed default.json

14
sub/subService.go
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"
"x-ui/database" "github.com/mhsanaei/3x-ui/database"
"x-ui/database/model" "github.com/mhsanaei/3x-ui/database/model"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/util/common" "github.com/mhsanaei/3x-ui/util/common"
"x-ui/util/random" "github.com/mhsanaei/3x-ui/util/random"
"x-ui/web/service" "github.com/mhsanaei/3x-ui/web/service"
"x-ui/xray" "github.com/mhsanaei/3x-ui/xray"
) )
type SubService struct { type SubService struct {

2
util/common/err.go
View file

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

2
web/controller/api.go
View file

@ -1,7 +1,7 @@
package controller package controller
import ( import (
"x-ui/web/service" "github.com/mhsanaei/3x-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/mhsanaei/3x-ui/logger"
"x-ui/web/locale" "github.com/mhsanaei/3x-ui/web/locale"
"x-ui/web/session" "github.com/mhsanaei/3x-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/mhsanaei/3x-ui/database/model"
"x-ui/web/service" "github.com/mhsanaei/3x-ui/web/service"
"x-ui/web/session" "github.com/mhsanaei/3x-ui/web/session"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

12
web/controller/index.go
View file

@ -5,18 +5,18 @@ import (
"text/template" "text/template"
"time" "time"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/web/service" "github.com/mhsanaei/3x-ui/web/service"
"x-ui/web/session" "github.com/mhsanaei/3x-ui/web/session"
"github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
type LoginForm struct { type LoginForm struct {
Username string `json:"username" form:"username"` Username string `json:"username" form:"username"`
Password string `json:"password" form:"password"` Password string `json:"password" form:"password"`
TwoFactorCode string `json:"twoFactorCode" form:"twoFactorCode"` TwoFactorCode string `json:"twoFactorCode" form:"twoFactorCode"`
} }
type IndexController struct { type IndexController struct {

4
web/controller/server.go
View file

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

8
web/controller/setting.go
View file

@ -4,10 +4,10 @@ import (
"errors" "errors"
"time" "time"
"x-ui/util/crypto" "github.com/mhsanaei/3x-ui/util/crypto"
"x-ui/web/entity" "github.com/mhsanaei/3x-ui/web/entity"
"x-ui/web/service" "github.com/mhsanaei/3x-ui/web/service"
"x-ui/web/session" "github.com/mhsanaei/3x-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/mhsanaei/3x-ui/config"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/web/entity" "github.com/mhsanaei/3x-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/mhsanaei/3x-ui/web/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )

2
web/entity/entity.go
View file

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

8
web/job/check_client_ip_job.go
View file

@ -12,10 +12,10 @@ import (
"sort" "sort"
"time" "time"
"x-ui/database" "github.com/mhsanaei/3x-ui/database"
"x-ui/database/model" "github.com/mhsanaei/3x-ui/database/model"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/xray" "github.com/mhsanaei/3x-ui/xray"
) )
type CheckClientIpJob struct { type CheckClientIpJob 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/mhsanaei/3x-ui/web/service"
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"
) )

2
web/job/check_hash_storage.go
View file

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

4
web/job/check_xray_running_job.go
View file

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

4
web/job/clear_logs_job.go
View file

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

4
web/job/periodic_traffic_reset_job.go
View file

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

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/mhsanaei/3x-ui/web/service"
) )
type LoginStatus byte type LoginStatus byte

7
web/job/xray_traffic_job.go
View file

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

2
web/locale/locale.go
View file

@ -6,7 +6,7 @@ import (
"os" "os"
"strings" "strings"
"x-ui/logger" "github.com/mhsanaei/3x-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

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

8
web/service/outbound.go
View file

@ -1,10 +1,10 @@
package service package service
import ( import (
"x-ui/database" "github.com/mhsanaei/3x-ui/database"
"x-ui/database/model" "github.com/mhsanaei/3x-ui/database/model"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/xray" "github.com/mhsanaei/3x-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/mhsanaei/3x-ui/logger"
) )
type PanelService struct{} type PanelService struct{}

12
web/service/server.go
View file

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

16
web/service/setting.go
View file

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

49
web/service/tgbot.go
View file

@ -18,14 +18,14 @@ import (
"strings" "strings"
"time" "time"
"x-ui/config" "github.com/mhsanaei/3x-ui/config"
"x-ui/database" "github.com/mhsanaei/3x-ui/database"
"x-ui/database/model" "github.com/mhsanaei/3x-ui/database/model"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/util/common" "github.com/mhsanaei/3x-ui/util/common"
"x-ui/web/global" "github.com/mhsanaei/3x-ui/web/global"
"x-ui/web/locale" "github.com/mhsanaei/3x-ui/web/locale"
"x-ui/xray" "github.com/mhsanaei/3x-ui/xray"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/mymmrac/telego" "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) prompt_message := t.I18nBot("tgbot.messages.comment_prompt", "ClientComment=="+client_Comment)
t.SendMsgToTgbot(chatId, prompt_message, cancel_btn_markup) 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": case "add_client_ch_default_traffic":
inlineKeyboard := tu.InlineKeyboard( inlineKeyboard := tu.InlineKeyboard(
tu.InlineKeyboardRow( tu.InlineKeyboardRow(
@ -1813,6 +1796,22 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
t.SendMsgToTgbot(chatId, msg, tu.ReplyKeyboardRemove()) 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
}
} }
} }

8
web/service/user.go
View file

@ -3,10 +3,10 @@ package service
import ( import (
"errors" "errors"
"x-ui/database" "github.com/mhsanaei/3x-ui/database"
"x-ui/database/model" "github.com/mhsanaei/3x-ui/database/model"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/util/crypto" "github.com/mhsanaei/3x-ui/util/crypto"
"github.com/xlzd/gotp" "github.com/xlzd/gotp"
"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/mhsanaei/3x-ui/logger"
"github.com/mhsanaei/3x-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/mhsanaei/3x-ui/logger"
"x-ui/xray" "github.com/mhsanaei/3x-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/mhsanaei/3x-ui/util/common"
"x-ui/xray" "github.com/mhsanaei/3x-ui/xray"
) )
type XraySettingService struct { type XraySettingService struct {

2
web/session/session.go
View file

@ -4,7 +4,7 @@ import (
"encoding/gob" "encoding/gob"
"net/http" "net/http"
"x-ui/database/model" "github.com/mhsanaei/3x-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/mhsanaei/3x-ui/config"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/util/common" "github.com/mhsanaei/3x-ui/util/common"
"x-ui/web/controller" "github.com/mhsanaei/3x-ui/web/controller"
"x-ui/web/job" "github.com/mhsanaei/3x-ui/web/job"
"x-ui/web/locale" "github.com/mhsanaei/3x-ui/web/locale"
"x-ui/web/middleware" "github.com/mhsanaei/3x-ui/web/middleware"
"x-ui/web/network" "github.com/mhsanaei/3x-ui/web/network"
"x-ui/web/service" "github.com/mhsanaei/3x-ui/web/service"
"github.com/gin-contrib/gzip" "github.com/gin-contrib/gzip"
"github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions"

6
xray/api.go
View file

@ -4,12 +4,12 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"math"
"regexp" "regexp"
"time" "time"
"math"
"x-ui/logger" "github.com/mhsanaei/3x-ui/logger"
"x-ui/util/common" "github.com/mhsanaei/3x-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/mhsanaei/3x-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/mhsanaei/3x-ui/util/json_util"
) )
type InboundConfig struct { type InboundConfig struct {

2
xray/log_writer.go
View file

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

6
xray/process.go
View file

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