mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-12-23 14:52:43 +00:00
Compare commits
No commits in common. "d5c532c64f1b068cb6baa7c34698059c1abcb8d9" and "aa285914fac42c8f4be0971ad6c5ad2fdf31057c" have entirely different histories.
d5c532c64f
...
aa285914fa
3 changed files with 5 additions and 13 deletions
4
web/assets/axios/axios.min.js
vendored
4
web/assets/axios/axios.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1710,7 +1710,7 @@ class Inbound extends XrayCommonClass {
|
||||||
|
|
||||||
toJson() {
|
toJson() {
|
||||||
let streamSettings;
|
let streamSettings;
|
||||||
if (this.canEnableStream() || this.stream?.sockopt) {
|
if (this.canEnableStream()) {
|
||||||
streamSettings = this.stream.toJson();
|
streamSettings = this.stream.toJson();
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
|
|
@ -1119,11 +1119,7 @@
|
||||||
protocol: inbound.protocol,
|
protocol: inbound.protocol,
|
||||||
settings: inbound.settings.toString(),
|
settings: inbound.settings.toString(),
|
||||||
};
|
};
|
||||||
if (inbound.canEnableStream()){
|
if (inbound.canEnableStream()) data.streamSettings = inbound.stream.toString();
|
||||||
data.streamSettings = inbound.stream.toString();
|
|
||||||
} else if (inbound.stream?.sockopt) {
|
|
||||||
data.streamSettings = JSON.stringify({ sockopt: inbound.stream.sockopt.toJson() }, null, 2);
|
|
||||||
}
|
|
||||||
data.sniffing = inbound.sniffing.toString();
|
data.sniffing = inbound.sniffing.toString();
|
||||||
data.allocate = inbound.allocate.toString();
|
data.allocate = inbound.allocate.toString();
|
||||||
|
|
||||||
|
|
@ -1143,11 +1139,7 @@
|
||||||
protocol: inbound.protocol,
|
protocol: inbound.protocol,
|
||||||
settings: inbound.settings.toString(),
|
settings: inbound.settings.toString(),
|
||||||
};
|
};
|
||||||
if (inbound.canEnableStream()){
|
if (inbound.canEnableStream()) data.streamSettings = inbound.stream.toString();
|
||||||
data.streamSettings = inbound.stream.toString();
|
|
||||||
} else if (inbound.stream?.sockopt) {
|
|
||||||
data.streamSettings = JSON.stringify({ sockopt: inbound.stream.sockopt.toJson() }, null, 2);
|
|
||||||
}
|
|
||||||
data.sniffing = inbound.sniffing.toString();
|
data.sniffing = inbound.sniffing.toString();
|
||||||
data.allocate = inbound.allocate.toString();
|
data.allocate = inbound.allocate.toString();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue