Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/MHSanaei/3x-ui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorMHSanaei <ho3ein.sanaei@gmail.com>2023-06-13 16:56:50 +0300
committerMHSanaei <ho3ein.sanaei@gmail.com>2023-06-13 16:56:50 +0300
commitad9134bc1add038cf65e1e94def94bddceca989e (patch)
tree4d2a5b2a10b7a9b1acf16c6d558762fbf81fefa4 /web
parentb5657ab87d902a6b82fdbe0bbd82c17e3aee4a4d (diff)
removed - alterId
https://github.com/XTLS/Xray-core/pull/2199 https://github.com/XTLS/Xray-core/commit/9112cfd39c2105d5b513275f9659b26e92fa7b67
Diffstat (limited to 'web')
-rw-r--r--web/assets/js/model/xray.js5
-rw-r--r--web/html/xui/form/client.html3
-rw-r--r--web/html/xui/form/protocol/vmess.html4
-rw-r--r--web/service/inbound.go3
-rw-r--r--web/service/xray.go2
5 files changed, 2 insertions, 15 deletions
diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index 0e737bb0..12857d64 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -1222,7 +1222,6 @@ class Inbound extends XrayCommonClass {
add: address,
port: this.port,
id: this.settings.vmesses[clientIndex].id,
- aid: this.settings.vmesses[clientIndex].alterId,
net: this.stream.network,
type: 'none',
tls: this.stream.security,
@@ -1668,10 +1667,9 @@ Inbound.VmessSettings = class extends Inbound.Settings {
}
};
Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
- constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16)) {
+ constructor(id=RandomUtil.randomUUID(), email=RandomUtil.randomLowerAndNum(8),limitIp=0, totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomLowerAndNum(16)) {
super();
this.id = id;
- this.alterId = alterId;
this.email = email;
this.limitIp = limitIp;
this.totalGB = totalGB;
@@ -1684,7 +1682,6 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
static fromJson(json={}) {
return new Inbound.VmessSettings.Vmess(
json.id,
- json.alterId,
json.email,
json.limitIp,
json.totalGB,
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
index bd6b08af..4fd5b8e3 100644
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -27,9 +27,6 @@
<a-input v-model.trim="client.password" style="width: 300px;"></a-input>
</a-form-item>
<br>
- <a-form-item label='{{ i18n "additional" }} ID' v-if="inbound.protocol === Protocols.VMESS">
- <a-input-number v-model="client.alterId"></a-input-number>
- </a-form-item>
<a-form-item label="ID" v-if="inbound.protocol === Protocols.VMESS || inbound.protocol === Protocols.VLESS">
<a-icon @click="client.id = RandomUtil.randomUUID()" type="sync"> </a-icon>
<a-input v-model.trim="client.id" style="width: 300px;"></a-input>
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index 6dd31307..b58ecaee 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -15,10 +15,6 @@
<a-input v-model.trim="client.email" style="width: 200px;"></a-input>
</a-form-item>
<br>
- <a-form-item label='{{ i18n "additional" }} ID'>
- <a-input-number v-model="client.alterId"></a-input-number>
- </a-form-item>
- <br>
<a-form-item label="ID">
<a-icon @click="client.id = RandomUtil.randomUUID()" type="sync"> </a-icon>
<a-input v-model.trim="client.id" style="width: 300px;"></a-input>
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 57384128..802e753d 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -396,7 +396,6 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) (bool, error) {
err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{
"email": client.Email,
"id": client.ID,
- "alterId": client.AlterIds,
"flow": client.Flow,
"password": client.Password,
})
@@ -589,7 +588,6 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin
err1 := s.xrayApi.AddUser(string(oldInbound.Protocol), oldInbound.Tag, map[string]interface{}{
"email": clients[0].Email,
"id": clients[0].ID,
- "alterId": clients[0].AlterIds,
"flow": clients[0].Flow,
"password": clients[0].Password,
})
@@ -1169,7 +1167,6 @@ func (s *InboundService) ResetClientTraffic(id int, clientEmail string) (bool, e
err1 := s.xrayApi.AddUser(string(inbound.Protocol), inbound.Tag, map[string]interface{}{
"email": client.Email,
"id": client.ID,
- "alterId": client.AlterIds,
"flow": client.Flow,
"password": client.Password,
})
diff --git a/web/service/xray.go b/web/service/xray.go
index 5475891f..668d6952 100644
--- a/web/service/xray.go
+++ b/web/service/xray.go
@@ -116,7 +116,7 @@ func (s *XrayService) GetXrayConfig() (*xray.Config, error) {
}
}
for key := range c {
- if key != "email" && key != "id" && key != "password" && key != "flow" && key != "alterId" {
+ if key != "email" && key != "id" && key != "password" && key != "flow" {
delete(c, key)
}
if c["flow"] == "xtls-rprx-vision-udp443" {