Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-04-19 13:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #34 from MHSanaei/dev

Browse source 
i hate myself
This commit is contained in:
MHSanaei 2023-03-19 14:39:51 +03:30 committed by GitHub
commit c5bbee354f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
web/assets/js/model/xray.js
View file

@ -1157,8 +1157,11 @@ class Inbound extends XrayCommonClass {
}
if (this.XTLS) {
params.set("flow", this.settings.vlesses[clientIndex].flow);
if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
address = this.stream.tls.server;
}
params.set("flow", this.settings.vlesses[clientIndex].flow);
}
const link = `vless://${uuid}@${address}:${port}`;
const url = new URL(link);
@ -1246,8 +1249,11 @@ class Inbound extends XrayCommonClass {
}
}
if (this.XTLS) {
params.set("flow", this.settings.trojans[clientIndex].flow);
if (this.XTLS) {
if (!ObjectUtil.isEmpty(this.stream.tls.server)) {
address = this.stream.tls.server;
}
params.set("flow", this.settings.trojans[clientIndex].flow);
}
const link = `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;