diff options
| -rw-r--r-- | main.go | 20 | ||||
| -rw-r--r-- | v2ui/db.go | 28 | ||||
| -rw-r--r-- | v2ui/models.go | 41 | ||||
| -rw-r--r-- | v2ui/v2ui.go | 51 |
4 files changed, 1 insertions, 139 deletions
@@ -12,7 +12,6 @@ import ( "x-ui/database" "x-ui/logger" "x-ui/sub" - "x-ui/v2ui" "x-ui/web" "x-ui/web/global" "x-ui/web/service" @@ -270,10 +269,6 @@ func main() { runCmd := flag.NewFlagSet("run", flag.ExitOnError) - v2uiCmd := flag.NewFlagSet("v2-ui", flag.ExitOnError) - var dbPath string - v2uiCmd.StringVar(&dbPath, "db", fmt.Sprintf("%s/v2-ui.db", config.GetDBFolderPath()), "set v2-ui db file path") - settingCmd := flag.NewFlagSet("setting", flag.ExitOnError) var port int var username string @@ -301,7 +296,6 @@ func main() { fmt.Println() fmt.Println("Commands:") fmt.Println(" run run web panel") - fmt.Println(" v2-ui migrate form v2-ui") fmt.Println(" migrate migrate form other/old x-ui") fmt.Println(" setting set settings") } @@ -322,16 +316,6 @@ func main() { runWebServer() case "migrate": migrateDb() - case "v2-ui": - err := v2uiCmd.Parse(os.Args[2:]) - if err != nil { - fmt.Println(err) - return - } - err = v2ui.MigrateFromV2UI(dbPath) - if err != nil { - fmt.Println("migrate from v2-ui failed:", err) - } case "setting": err := settingCmd.Parse(os.Args[2:]) if err != nil { @@ -356,12 +340,10 @@ func main() { updateTgbotEnableSts(enabletgbot) } default: - fmt.Println("except 'run' or 'v2-ui' or 'setting' subcommands") + fmt.Println("except 'run' or 'setting' subcommands") fmt.Println() runCmd.Usage() fmt.Println() - v2uiCmd.Usage() - fmt.Println() settingCmd.Usage() } } diff --git a/v2ui/db.go b/v2ui/db.go deleted file mode 100644 index 2745b9de..00000000 --- a/v2ui/db.go +++ /dev/null @@ -1,28 +0,0 @@ -package v2ui - -import ( - "gorm.io/driver/sqlite" - "gorm.io/gorm" - "gorm.io/gorm/logger" -) - -var v2db *gorm.DB - -func initDB(dbPath string) error { - c := &gorm.Config{ - Logger: logger.Discard, - } - var err error - v2db, err = gorm.Open(sqlite.Open(dbPath), c) - if err != nil { - return err - } - - return nil -} - -func getV2Inbounds() ([]*V2Inbound, error) { - inbounds := make([]*V2Inbound, 0) - err := v2db.Model(V2Inbound{}).Find(&inbounds).Error - return inbounds, err -} diff --git a/v2ui/models.go b/v2ui/models.go deleted file mode 100644 index 9ac50ed7..00000000 --- a/v2ui/models.go +++ /dev/null @@ -1,41 +0,0 @@ -package v2ui - -import "x-ui/database/model" - -type V2Inbound struct { - Id int `gorm:"primaryKey;autoIncrement"` - Port int `gorm:"unique"` - Listen string - Protocol string - Settings string - StreamSettings string - Tag string `gorm:"unique"` - Sniffing string - Remark string - Up int64 - Down int64 - Enable bool -} - -func (i *V2Inbound) TableName() string { - return "inbound" -} - -func (i *V2Inbound) ToInbound(userId int) *model.Inbound { - return &model.Inbound{ - UserId: userId, - Up: i.Up, - Down: i.Down, - Total: 0, - Remark: i.Remark, - Enable: i.Enable, - ExpiryTime: 0, - Listen: i.Listen, - Port: i.Port, - Protocol: model.Protocol(i.Protocol), - Settings: i.Settings, - StreamSettings: i.StreamSettings, - Tag: i.Tag, - Sniffing: i.Sniffing, - } -} diff --git a/v2ui/v2ui.go b/v2ui/v2ui.go deleted file mode 100644 index 57d673cf..00000000 --- a/v2ui/v2ui.go +++ /dev/null @@ -1,51 +0,0 @@ -package v2ui - -import ( - "fmt" - "x-ui/config" - "x-ui/database" - "x-ui/database/model" - "x-ui/util/common" - "x-ui/web/service" -) - -func MigrateFromV2UI(dbPath string) error { - err := initDB(dbPath) - if err != nil { - return common.NewError("init v2-ui database failed:", err) - } - err = database.InitDB(config.GetDBPath()) - if err != nil { - return common.NewError("init x-ui database failed:", err) - } - - v2Inbounds, err := getV2Inbounds() - if err != nil { - return common.NewError("get v2-ui inbounds failed:", err) - } - if len(v2Inbounds) == 0 { - fmt.Println("migrate v2-ui inbounds success: 0") - return nil - } - - userService := service.UserService{} - user, err := userService.GetFirstUser() - if err != nil { - return common.NewError("get x-ui user failed:", err) - } - - inbounds := make([]*model.Inbound, 0) - for _, v2inbound := range v2Inbounds { - inbounds = append(inbounds, v2inbound.ToInbound(user.Id)) - } - - inboundService := service.InboundService{} - err = inboundService.AddInbounds(inbounds) - if err != nil { - return common.NewError("add x-ui inbounds failed:", err) - } - - fmt.Println("migrate v2-ui inbounds success:", len(inbounds)) - - return nil -} |