diff --git a/README.md b/README.md index 7305ad00..697455fa 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install. # Install custom version -To install your desired version you can add the version to the end of install command. Example for ver `v1.7.6`: +To install your desired version you can add the version to the end of install command. Example for ver `v1.7.7`: ``` -bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.7.6 +bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) v1.7.7 ``` # SSL diff --git a/config/version b/config/version index d2634851..73c8b4f9 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.7.6 \ No newline at end of file +1.7.7 \ No newline at end of file diff --git a/sub/subService.go b/sub/subService.go index 0565100e..4cb14030 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -804,7 +804,7 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin } } } - return strings.Join(remark, "-") + return strings.Join(remark, " : ") } func searchKey(data interface{}, key string) (interface{}, bool) { diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 9027e6b7..2b337c9f 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1748,7 +1748,6 @@ Inbound.VmessSettings = class extends Inbound.Settings { vmesses=[new Inbound.VmessSettings.Vmess()]) { super(protocol); this.vmesses = vmesses; - this.disableInsecure = disableInsecureEncryption; } indexOfVmessById(id) { @@ -1773,14 +1772,12 @@ Inbound.VmessSettings = class extends Inbound.Settings { return new Inbound.VmessSettings( Protocols.VMESS, json.clients.map(client => Inbound.VmessSettings.Vmess.fromJson(client)), - ObjectUtil.isEmpty(json.disableInsecureEncryption) ? false : json.disableInsecureEncryption, ); } toJson() { return { clients: Inbound.VmessSettings.toJsonArray(this.vmesses), - disableInsecureEncryption: this.disableInsecure, }; } }; diff --git a/web/html/common/qrcode_modal.html b/web/html/common/qrcode_modal.html index 0b815690..51dc38cb 100644 --- a/web/html/common/qrcode_modal.html +++ b/web/html/common/qrcode_modal.html @@ -87,7 +87,7 @@ }, genSubLink(subID) { const { domain: host, port, tls: isTLS, path: base } = app.subSettings; - return buildURL({ host, port, isTLS, base, path: subID+'?name='+subID }); + return buildURL({ host, port, isTLS, base, path: subID+'?name='+remark }); } }, updated() { diff --git a/web/html/xui/inbound_info_modal.html b/web/html/xui/inbound_info_modal.html index c162c1af..a82451b3 100644 --- a/web/html/xui/inbound_info_modal.html +++ b/web/html/xui/inbound_info_modal.html @@ -296,7 +296,7 @@ }, genSubLink(subID) { const { domain: host, port, tls: isTLS, path: base } = app.subSettings; - return buildURL({ host, port, isTLS, base, path: subID+'?name='+subID }); + return buildURL({ host, port, isTLS, base, path: subID+'?name='+remark }); } };