From ad9134bc1add038cf65e1e94def94bddceca989e Mon Sep 17 00:00:00 2001 From: MHSanaei Date: Tue, 13 Jun 2023 17:26:50 +0330 Subject: [PATCH] removed - alterId https://github.com/XTLS/Xray-core/pull/2199 https://github.com/XTLS/Xray-core/commit/9112cfd39c2105d5b513275f9659b26e92fa7b67 --- database/model/model.go | 1 - sub/subService.go | 1 - web/assets/js/model/xray.js | 5 +---- web/html/xui/form/client.html | 3 --- web/html/xui/form/protocol/vmess.html | 4 ---- web/service/inbound.go | 3 --- web/service/xray.go | 2 +- xray/api.go | 3 +-- 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/database/model/model.go b/database/model/model.go index d1498b06..087e8b07 100644 --- a/database/model/model.go +++ b/database/model/model.go @@ -76,7 +76,6 @@ type Client struct { ID string `json:"id"` Password string `json:"password"` Flow string `json:"flow"` - AlterIds uint16 `json:"alterId"` Email string `json:"email"` LimitIP int `json:"limitIp"` TotalGB int64 `json:"totalGB" form:"totalGB"` diff --git a/sub/subService.go b/sub/subService.go index 7f8dbc46..1cd340aa 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -236,7 +236,6 @@ func (s *SubService) genVmessLink(inbound *model.Inbound, email string) string { } } obj["id"] = clients[clientIndex].ID - obj["aid"] = clients[clientIndex].AlterIds if len(domains) > 0 { links := "" 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 @@
- - - 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 @@
- - - -
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" { diff --git a/xray/api.go b/xray/api.go index a84435f9..c2e2b4ca 100644 --- a/xray/api.go +++ b/xray/api.go @@ -57,8 +57,7 @@ func (x *XrayAPI) AddUser(Protocol string, inboundTag string, user map[string]in switch Protocol { case "vmess": account = serial.ToTypedMessage(&vmess.Account{ - Id: user["id"].(string), - AlterId: uint32(user["alterId"].(uint16)), + Id: user["id"].(string), }) case "vless": account = serial.ToTypedMessage(&vless.Account{