diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23d1df97..383bb309 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/XTLS/Xray-core/releases/download/v1.8.4/Xray-linux-64.zip + wget https://github.com/XTLS/Xray-core/releases/download/v1.8.6/Xray-linux-64.zip unzip Xray-linux-64.zip rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat @@ -67,7 +67,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/xtls/xray-core/releases/download/v1.8.4/Xray-linux-arm64-v8a.zip + wget https://github.com/xtls/xray-core/releases/download/v1.8.6/Xray-linux-arm64-v8a.zip unzip Xray-linux-arm64-v8a.zip rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat @@ -108,7 +108,7 @@ jobs: mv xui-release x-ui mkdir bin cd bin - wget https://github.com/xtls/xray-core/releases/download/v1.8.4/Xray-linux-s390x.zip + wget https://github.com/xtls/xray-core/releases/download/v1.8.6/Xray-linux-s390x.zip unzip Xray-linux-s390x.zip rm -f Xray-linux-64.zip geoip.dat geosite.dat iran.dat wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat diff --git a/DockerInitFiles.sh b/DockerInitFiles.sh index e6a5b456..c01714b3 100755 --- a/DockerInitFiles.sh +++ b/DockerInitFiles.sh @@ -11,7 +11,7 @@ else fi mkdir -p build/bin cd build/bin -wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.4/Xray-linux-${ARCH}.zip" +wget "https://github.com/XTLS/Xray-core/releases/download/v1.8.6/Xray-linux-${ARCH}.zip" unzip "Xray-linux-${ARCH}.zip" rm -f "Xray-linux-${ARCH}.zip" geoip.dat geosite.dat iran.dat mv xray "xray-linux-${FNAME}" diff --git a/config/version b/config/version index ce6a70b9..2eda823f 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.6.0 \ No newline at end of file +1.6.1 \ No newline at end of file diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 5908fc3e..60fab197 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1379,13 +1379,13 @@ class Inbound extends XrayCommonClass { if(this.clients){ let links = []; this.clients.forEach((client) => { - genAllLinks(remark,client).forEach(l => { + this.genAllLinks(remark,client).forEach(l => { links.push(l.link); }) }); return links.join('\r\n'); } else { - if(this.protocol == Protocols.SHADOWSOCKS && !this.isSSMultiUser) return this.genSSLink(this.listen, this.port, forceTls, remark); + if(this.protocol == Protocols.SHADOWSOCKS && !this.isSSMultiUser) return this.genSSLink(this.listen, this.port, 'same', remark); return ''; } } diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html index 4a90222a..7873b740 100644 --- a/web/html/xui/inbounds.html +++ b/web/html/xui/inbounds.html @@ -978,7 +978,7 @@ newDbInbound = new DBInbound(dbInbound); if (dbInbound.listen.startsWith("@")){ rootInbound = this.inbounds.find((i) => - i.tls && + i.stream.isTls && ['trojan','vless'].includes(i.protocol) && i.settings.fallbacks.find(f => f.dest === dbInbound.listen) ); diff --git a/web/html/xui/xray_reverse_modal.html b/web/html/xui/xray_reverse_modal.html index fa708b74..7b1aaed1 100644 --- a/web/html/xui/xray_reverse_modal.html +++ b/web/html/xui/xray_reverse_modal.html @@ -64,7 +64,7 @@ - {{ i18n "pages.xray.rules.outbound" }} + {{ i18n "pages.xray.rules.inbound" }}