Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-04-19 13:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

removed - alterId

Browse source 
https://github.com/XTLS/Xray-core/pull/2199
9112cfd39c
This commit is contained in:
MHSanaei 2023-06-13 17:26:50 +03:30
parent b5657ab87d
commit ad9134bc1a
8 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
database/model/model.go
View file

@ -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"`

1
sub/subService.go
View file

@ -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 := ""

5
web/assets/js/model/xray.js
View file

@ -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,

3
web/html/xui/form/client.html
View file

@ -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>

4
web/html/xui/form/protocol/vmess.html
View file

@ -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>

3
web/service/inbound.go
View file

@ -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,
})

2
web/service/xray.go
View file

@ -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" {

1
xray/api.go
View file

@ -58,7 +58,6 @@ func (x *XrayAPI) AddUser(Protocol string, inboundTag string, user map[string]in
case "vmess":
account = serial.ToTypedMessage(&vmess.Account{
Id: user["id"].(string),
AlterId: uint32(user["alterId"].(uint16)),
})
case "vless":
account = serial.ToTypedMessage(&vless.Account{