diff --git a/.gitignore b/.gitignore index 739cadf6..54c663a7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ bin/config.json dist/ x-ui-*.tar.gz /x-ui -/release.sh \ No newline at end of file +/release.sh +.sync* \ No newline at end of file diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 077343a8..7742fa7e 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1010,18 +1010,6 @@ class Inbound extends XrayCommonClass { params.set("flow", this.settings.vlesses[0].flow); } - for (const [key, value] of params) { - switch (key) { - case "host": - case "path": - case "seed": - case "key": - case "alpn": - params.set(key, encodeURIComponent(value)); - break; - } - } - const link = `vless://${uuid}@${address}:${port}`; const url = new URL(link); for (const [key, value] of params) { diff --git a/web/service/xray.go b/web/service/xray.go index 92100821..f67d3677 100644 --- a/web/service/xray.go +++ b/web/service/xray.go @@ -87,7 +87,7 @@ func (s *XrayService) GetXrayTraffic() ([]*xray.Traffic, error) { func (s *XrayService) RestartXray(isForce bool) error { lock.Lock() defer lock.Unlock() - logger.Debug("restart xray") + logger.Debug("restart xray, force:", isForce) xrayConfig, err := s.GetXrayConfig() if err != nil {