mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-04-20 05:52:24 +00:00
removed - timeout
This commit is contained in:
parent
e5835c299c
commit
16b4795956
4 changed files with 1 additions and 15 deletions
|
@ -851,14 +851,12 @@ Outbound.Settings = class extends CommonClass {
|
||||||
Outbound.FreedomSettings = class extends CommonClass {
|
Outbound.FreedomSettings = class extends CommonClass {
|
||||||
constructor(
|
constructor(
|
||||||
domainStrategy = '',
|
domainStrategy = '',
|
||||||
timeout = 10,
|
|
||||||
redirect = '',
|
redirect = '',
|
||||||
fragment = {},
|
fragment = {},
|
||||||
noises = []
|
noises = []
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
this.domainStrategy = domainStrategy;
|
this.domainStrategy = domainStrategy;
|
||||||
this.timeout = timeout;
|
|
||||||
this.redirect = redirect;
|
this.redirect = redirect;
|
||||||
this.fragment = fragment;
|
this.fragment = fragment;
|
||||||
this.noises = noises;
|
this.noises = noises;
|
||||||
|
@ -875,7 +873,6 @@ Outbound.FreedomSettings = class extends CommonClass {
|
||||||
static fromJson(json = {}) {
|
static fromJson(json = {}) {
|
||||||
return new Outbound.FreedomSettings(
|
return new Outbound.FreedomSettings(
|
||||||
json.domainStrategy,
|
json.domainStrategy,
|
||||||
json.timeout,
|
|
||||||
json.redirect,
|
json.redirect,
|
||||||
json.fragment ? Outbound.FreedomSettings.Fragment.fromJson(json.fragment) : undefined,
|
json.fragment ? Outbound.FreedomSettings.Fragment.fromJson(json.fragment) : undefined,
|
||||||
json.noises ? json.noises.map(noise => Outbound.FreedomSettings.Noise.fromJson(noise)) : [new Outbound.FreedomSettings.Noise()],
|
json.noises ? json.noises.map(noise => Outbound.FreedomSettings.Noise.fromJson(noise)) : [new Outbound.FreedomSettings.Noise()],
|
||||||
|
@ -885,7 +882,6 @@ Outbound.FreedomSettings = class extends CommonClass {
|
||||||
toJson() {
|
toJson() {
|
||||||
return {
|
return {
|
||||||
domainStrategy: ObjectUtil.isEmpty(this.domainStrategy) ? undefined : this.domainStrategy,
|
domainStrategy: ObjectUtil.isEmpty(this.domainStrategy) ? undefined : this.domainStrategy,
|
||||||
timeout: this.timeout,
|
|
||||||
redirect: this.redirect,
|
redirect: this.redirect,
|
||||||
fragment: Object.keys(this.fragment).length === 0 ? undefined : this.fragment,
|
fragment: Object.keys(this.fragment).length === 0 ? undefined : this.fragment,
|
||||||
noises: Outbound.FreedomSettings.Noise.toJsonArray(this.noises),
|
noises: Outbound.FreedomSettings.Noise.toJsonArray(this.noises),
|
||||||
|
|
|
@ -2513,15 +2513,13 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
|
||||||
address,
|
address,
|
||||||
port,
|
port,
|
||||||
network = 'tcp,udp',
|
network = 'tcp,udp',
|
||||||
followRedirect = false,
|
followRedirect = false
|
||||||
timeout = 30
|
|
||||||
) {
|
) {
|
||||||
super(protocol);
|
super(protocol);
|
||||||
this.address = address;
|
this.address = address;
|
||||||
this.port = port;
|
this.port = port;
|
||||||
this.network = network;
|
this.network = network;
|
||||||
this.followRedirect = followRedirect;
|
this.followRedirect = followRedirect;
|
||||||
this.timeout = timeout;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static fromJson(json = {}) {
|
static fromJson(json = {}) {
|
||||||
|
@ -2531,7 +2529,6 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
|
||||||
json.port,
|
json.port,
|
||||||
json.network,
|
json.network,
|
||||||
json.followRedirect,
|
json.followRedirect,
|
||||||
json.timeout,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2541,7 +2538,6 @@ Inbound.DokodemoSettings = class extends Inbound.Settings {
|
||||||
port: this.port,
|
port: this.port,
|
||||||
network: this.network,
|
network: this.network,
|
||||||
followRedirect: this.followRedirect,
|
followRedirect: this.followRedirect,
|
||||||
timeout: this.timeout,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,9 +22,6 @@
|
||||||
<a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
|
<a-select-option v-for="s in OutboundDomainStrategies" :value="s">[[ s ]]</a-select-option>
|
||||||
</a-select>
|
</a-select>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item label='Timeout'>
|
|
||||||
<a-input-number v-model.number="outbound.settings.timeout" min="0" ></a-input-number>
|
|
||||||
</a-form-item>
|
|
||||||
<a-form-item label='Redirect'>
|
<a-form-item label='Redirect'>
|
||||||
<a-input v-model="outbound.settings.redirect"></a-input>
|
<a-input v-model="outbound.settings.redirect"></a-input>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
|
|
|
@ -16,8 +16,5 @@
|
||||||
<a-form-item label='Follow Redirect'>
|
<a-form-item label='Follow Redirect'>
|
||||||
<a-switch v-model="inbound.settings.followRedirect"></a-switch>
|
<a-switch v-model="inbound.settings.followRedirect"></a-switch>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item label='Timeout'>
|
|
||||||
<a-input-number v-model.number="inbound.settings.timeout" :min="0"></a-input-number>
|
|
||||||
</a-form-item>
|
|
||||||
</a-form>
|
</a-form>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
Loading…
Reference in a new issue