diff --git a/database/model/model.go b/database/model/model.go index bf555515..ca7f0a27 100644 --- a/database/model/model.go +++ b/database/model/model.go @@ -70,7 +70,6 @@ type Client struct { ID string `json:"id"` Password string `json:"password"` Flow string `json:"flow"` - AlterIds uint16 `json:"alterId"` Email string `json:"email"` TotalGB int64 `json:"totalGB" form:"totalGB"` ExpiryTime int64 `json:"expiryTime" form:"expiryTime"` diff --git a/sub/subService.go b/sub/subService.go index 3d909bca..c1413eed 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 56e9f8db..76969c46 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -1055,7 +1055,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, @@ -1530,10 +1529,9 @@ Inbound.VmessSettings = class extends Inbound.Settings { } }; Inbound.VmessSettings.Vmess = class extends XrayCommonClass { - constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomText(), totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomText(16,16)) { + constructor(id=RandomUtil.randomUUID(), email=RandomUtil.randomText(), totalGB=0, expiryTime=0, enable=true, tgId='', subId=RandomUtil.randomText(16,16)) { super(); this.id = id; - this.alterId = alterId; this.email = email; this.totalGB = totalGB; this.expiryTime = expiryTime; @@ -1545,7 +1543,6 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass { static fromJson(json={}) { return new Inbound.VmessSettings.Vmess( json.id, - json.alterId, json.email, json.totalGB, json.expiryTime, diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html index db2a6a73..7225f193 100644 --- a/web/html/xui/form/client.html +++ b/web/html/xui/form/client.html @@ -46,14 +46,6 @@ - - {{ i18n "additional" }} - - - - - - Subscription diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html index d20b2f47..047936c4 100644 --- a/web/html/xui/form/protocol/vmess.html +++ b/web/html/xui/form/protocol/vmess.html @@ -27,14 +27,6 @@ - - {{ i18n "additional" }} - - - - - - Subscription diff --git a/web/service/inbound.go b/web/service/inbound.go index 0d61ef0a..4b230fe9 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -382,7 +382,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, }) @@ -561,7 +560,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, }) @@ -824,7 +822,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/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index 69b430f5..c35d5295 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -40,7 +40,6 @@ "depleted" = "Depleted" "depletingSoon" = "Depleting soon" "domainName" = "Domain name" -"additional" = "Alter ID" "monitor" = "Listen IP" "certificate" = "Certificate" "fail" = " Fail" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index 4b8053f0..c4d8a79f 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -40,7 +40,6 @@ "depleted" = "منقضی" "depletingSoon" = "در حال انقضا" "domainName" = "آدرس دامنه" -"additional" = "آی دی جایگزین" "monitor" = "آی پی اتصال" "certificate" = "گواهی دیجیتال" "fail" = "خطا" diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index c25a48d8..b80298e1 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -40,7 +40,6 @@ "depleted" = "исчерпано" "depletingSoon" = "почти исчерпано" "domainName" = "домен" -"additional" = "допольнительно" "monitor" = "порт IP" "certificate" = "сертификат" "fail" = "неудача" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index b17db591..5dcd1522 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -40,7 +40,6 @@ "depleted" = "耗尽" "depletingSoon" = "即将耗尽" "domainName" = "域名" -"additional" = "额外 ID" "monitor" = "监听" "certificate" = "证书" "fail" = "失败" diff --git a/xray/api.go b/xray/api.go index 68ac8be3..6a5014b0 100644 --- a/xray/api.go +++ b/xray/api.go @@ -56,8 +56,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{