mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-03-11 10:53:11 +00:00
Compare commits
No commits in common. "cf879f9527b2d2f06d0d9c77e9e13ac7c60ad873" and "2ab1a174dbed37c455a95356ff6b995eafd23440" have entirely different histories.
cf879f9527
...
2ab1a174db
4 changed files with 1 additions and 27 deletions
|
|
@ -98,6 +98,5 @@ type Client struct {
|
||||||
Enable bool `json:"enable" form:"enable"`
|
Enable bool `json:"enable" form:"enable"`
|
||||||
TgID int64 `json:"tgId" form:"tgId"`
|
TgID int64 `json:"tgId" form:"tgId"`
|
||||||
SubID string `json:"subId" form:"subId"`
|
SubID string `json:"subId" form:"subId"`
|
||||||
Comment string `json:"comment" form:"comment"`
|
|
||||||
Reset int `json:"reset" form:"reset"`
|
Reset int `json:"reset" form:"reset"`
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1278,7 +1278,7 @@ class Inbound extends XrayCommonClass {
|
||||||
obj.mode = xhttp.mode;
|
obj.mode = xhttp.mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tls === 'tls') {
|
if (security === 'tls') {
|
||||||
if (!ObjectUtil.isEmpty(this.stream.tls.sni)) {
|
if (!ObjectUtil.isEmpty(this.stream.tls.sni)) {
|
||||||
obj.sni = this.stream.tls.sni;
|
obj.sni = this.stream.tls.sni;
|
||||||
}
|
}
|
||||||
|
|
@ -1778,7 +1778,6 @@ Inbound.VmessSettings.VMESS = class extends XrayCommonClass {
|
||||||
enable = true,
|
enable = true,
|
||||||
tgId = '',
|
tgId = '',
|
||||||
subId = RandomUtil.randomLowerAndNum(16),
|
subId = RandomUtil.randomLowerAndNum(16),
|
||||||
comment = '',
|
|
||||||
reset = 0
|
reset = 0
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
|
|
@ -1791,7 +1790,6 @@ Inbound.VmessSettings.VMESS = class extends XrayCommonClass {
|
||||||
this.enable = enable;
|
this.enable = enable;
|
||||||
this.tgId = tgId;
|
this.tgId = tgId;
|
||||||
this.subId = subId;
|
this.subId = subId;
|
||||||
this.comment = comment;
|
|
||||||
this.reset = reset;
|
this.reset = reset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1806,7 +1804,6 @@ Inbound.VmessSettings.VMESS = class extends XrayCommonClass {
|
||||||
json.enable,
|
json.enable,
|
||||||
json.tgId,
|
json.tgId,
|
||||||
json.subId,
|
json.subId,
|
||||||
json.comment,
|
|
||||||
json.reset,
|
json.reset,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -1887,7 +1884,6 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
|
||||||
enable = true,
|
enable = true,
|
||||||
tgId = '',
|
tgId = '',
|
||||||
subId = RandomUtil.randomLowerAndNum(16),
|
subId = RandomUtil.randomLowerAndNum(16),
|
||||||
comment = '',
|
|
||||||
reset = 0
|
reset = 0
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
|
|
@ -1900,7 +1896,6 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
|
||||||
this.enable = enable;
|
this.enable = enable;
|
||||||
this.tgId = tgId;
|
this.tgId = tgId;
|
||||||
this.subId = subId;
|
this.subId = subId;
|
||||||
this.comment = comment;
|
|
||||||
this.reset = reset;
|
this.reset = reset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1915,7 +1910,6 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
|
||||||
json.enable,
|
json.enable,
|
||||||
json.tgId,
|
json.tgId,
|
||||||
json.subId,
|
json.subId,
|
||||||
json.comment,
|
|
||||||
json.reset,
|
json.reset,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -2026,7 +2020,6 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
|
||||||
enable = true,
|
enable = true,
|
||||||
tgId = '',
|
tgId = '',
|
||||||
subId = RandomUtil.randomLowerAndNum(16),
|
subId = RandomUtil.randomLowerAndNum(16),
|
||||||
comment = '',
|
|
||||||
reset = 0
|
reset = 0
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
|
|
@ -2038,7 +2031,6 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
|
||||||
this.enable = enable;
|
this.enable = enable;
|
||||||
this.tgId = tgId;
|
this.tgId = tgId;
|
||||||
this.subId = subId;
|
this.subId = subId;
|
||||||
this.comment = comment;
|
|
||||||
this.reset = reset;
|
this.reset = reset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2052,7 +2044,6 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
|
||||||
enable: this.enable,
|
enable: this.enable,
|
||||||
tgId: this.tgId,
|
tgId: this.tgId,
|
||||||
subId: this.subId,
|
subId: this.subId,
|
||||||
comment: this.comment,
|
|
||||||
reset: this.reset,
|
reset: this.reset,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -2067,7 +2058,6 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
|
||||||
json.enable,
|
json.enable,
|
||||||
json.tgId,
|
json.tgId,
|
||||||
json.subId,
|
json.subId,
|
||||||
json.comment,
|
|
||||||
json.reset,
|
json.reset,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -2187,7 +2177,6 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
|
||||||
enable = true,
|
enable = true,
|
||||||
tgId = '',
|
tgId = '',
|
||||||
subId = RandomUtil.randomLowerAndNum(16),
|
subId = RandomUtil.randomLowerAndNum(16),
|
||||||
comment = '',
|
|
||||||
reset = 0
|
reset = 0
|
||||||
) {
|
) {
|
||||||
super();
|
super();
|
||||||
|
|
@ -2200,7 +2189,6 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
|
||||||
this.enable = enable;
|
this.enable = enable;
|
||||||
this.tgId = tgId;
|
this.tgId = tgId;
|
||||||
this.subId = subId;
|
this.subId = subId;
|
||||||
this.comment = comment;
|
|
||||||
this.reset = reset;
|
this.reset = reset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2215,7 +2203,6 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
|
||||||
enable: this.enable,
|
enable: this.enable,
|
||||||
tgId: this.tgId,
|
tgId: this.tgId,
|
||||||
subId: this.subId,
|
subId: this.subId,
|
||||||
comment: this.comment,
|
|
||||||
reset: this.reset,
|
reset: this.reset,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -2231,7 +2218,6 @@ Inbound.ShadowsocksSettings.Shadowsocks = class extends XrayCommonClass {
|
||||||
json.enable,
|
json.enable,
|
||||||
json.tgId,
|
json.tgId,
|
||||||
json.subId,
|
json.subId,
|
||||||
json.comment,
|
|
||||||
json.reset,
|
json.reset,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -68,9 +68,6 @@
|
||||||
</template>
|
</template>
|
||||||
<a-input-number style="width: 50%" v-model="client.tgId" min="0"></a-input-number>
|
<a-input-number style="width: 50%" v-model="client.tgId" min="0"></a-input-number>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
<a-form-item v-if="client.email" label='Comment'>
|
|
||||||
<a-input v-model.trim="client.comment"></a-input>
|
|
||||||
</a-form-item>
|
|
||||||
<a-form-item v-if="app.ipLimitEnable">
|
<a-form-item v-if="app.ipLimitEnable">
|
||||||
<template slot="label">
|
<template slot="label">
|
||||||
<a-tooltip>
|
<a-tooltip>
|
||||||
|
|
|
||||||
|
|
@ -185,14 +185,6 @@
|
||||||
<a-tag>↑ [[ sizeFormat(infoModal.clientStats.up) ]] / [[ sizeFormat(infoModal.clientStats.down) ]] ↓</a-tag>
|
<a-tag>↑ [[ sizeFormat(infoModal.clientStats.up) ]] / [[ sizeFormat(infoModal.clientStats.down) ]] ↓</a-tag>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr v-if="infoModal.clientSettings.comment">
|
|
||||||
<td>Comment</td>
|
|
||||||
<td>
|
|
||||||
<a-tooltip :title="[[ infoModal.clientSettings.comment ]]">
|
|
||||||
<a-tag class="info-large-tag">[[ infoModal.clientSettings.comment ]]</a-tag>
|
|
||||||
</a-tooltip>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr v-if="app.ipLimitEnable">
|
<tr v-if="app.ipLimitEnable">
|
||||||
<td>{{ i18n "pages.inbounds.IPLimit" }}</td>
|
<td>{{ i18n "pages.inbounds.IPLimit" }}</td>
|
||||||
<td>
|
<td>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue