Buriburizaemon/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2026-02-04 04:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix old, fix config tag

Browse Source
This commit is contained in:
yuzuki999
2023-06-02 23:26:02 +08:00
parent 85bde00ded
commit f034bbd39b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/conf_test.go
View File

@@ -7,7 +7,7 @@ import (
func TestConf_LoadFromPath(t *testing.T) { func TestConf_LoadFromPath(t *testing.T) {
c := New() c := New()
t.Log(c.LoadFromPath("../example/config.yml.example"), c.NodesConfig[0].ControllerConfig.LimitConfig.IPLimit) t.Log(c.LoadFromPath("../example/config.yml.example"), c.NodesConfig[0].ControllerConfig.EnableXtls)
} }
func TestConf_Watch(t *testing.T) { func TestConf_Watch(t *testing.T) {

2
conf/node.go
View File

@@ -20,7 +20,7 @@ type ControllerConfig struct {
EnableDNS bool `yaml:"EnableDNS"` EnableDNS bool `yaml:"EnableDNS"`
DNSType string `yaml:"DNSType"` DNSType string `yaml:"DNSType"`
EnableVless bool `yaml:"EnableVless"` EnableVless bool `yaml:"EnableVless"`
EnableXtls bool `json:"EnableXtls"` EnableXtls bool `yaml:"EnableXtls"`
LimitConfig LimitConfig `yaml:"LimitConfig"` LimitConfig LimitConfig `yaml:"LimitConfig"`
DisableUploadTraffic bool `yaml:"DisableUploadTraffic"` DisableUploadTraffic bool `yaml:"DisableUploadTraffic"`
DisableGetRule bool `yaml:"DisableGetRule"` DisableGetRule bool `yaml:"DisableGetRule"`

6
conf/old.go
View File

@@ -48,7 +48,7 @@ func migrateOldConfig(c *Conf, old *OldConfig) {
break break
} }
// node option // node option
if !old.NodesConfig[i].ApiConfig.EnableVless { if old.NodesConfig[i].ApiConfig.EnableVless {
n.ControllerConfig.EnableVless = true n.ControllerConfig.EnableVless = true
changed = true changed = true
} }
@@ -61,7 +61,7 @@ func migrateOldConfig(c *Conf, old *OldConfig) {
n.ControllerConfig.LimitConfig.IPLimit = old.NodesConfig[i].ApiConfig.DeviceLimit n.ControllerConfig.LimitConfig.IPLimit = old.NodesConfig[i].ApiConfig.DeviceLimit
changed = true changed = true
} }
if !old.NodesConfig[i].ControllerConfig.EnableDynamicSpeedLimit { if old.NodesConfig[i].ControllerConfig.EnableDynamicSpeedLimit {
n.ControllerConfig.LimitConfig.EnableDynamicSpeedLimit = true n.ControllerConfig.LimitConfig.EnableDynamicSpeedLimit = true
changed = true changed = true
} }
@@ -70,7 +70,7 @@ func migrateOldConfig(c *Conf, old *OldConfig) {
old.NodesConfig[i].ControllerConfig.DynamicSpeedLimitConfig old.NodesConfig[i].ControllerConfig.DynamicSpeedLimitConfig
changed = true changed = true
} }
if !old.NodesConfig[i].ControllerConfig.EnableIpRecorder { if old.NodesConfig[i].ControllerConfig.EnableIpRecorder {
n.ControllerConfig.LimitConfig.EnableIpRecorder = true n.ControllerConfig.LimitConfig.EnableIpRecorder = true
changed = true changed = true
} }