gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-14 05:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[sub] fix conflicts

Browse Source
This commit is contained in:
Alireza Ahmadi
2023-03-28 23:58:45 +02:00
parent efd1b06593
commit f1a87c7d92
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/model/model.go
View File

@@ -74,5 +74,7 @@ type Client struct {
Email string `json:"email"` Email string `json:"email"`
TotalGB int64 `json:"totalGB" form:"totalGB"` TotalGB int64 `json:"totalGB" form:"totalGB"`
ExpiryTime int64 `json:"expiryTime" form:"expiryTime"` ExpiryTime int64 `json:"expiryTime" form:"expiryTime"`
Enable bool `json:"enable" from:"enable"`
TgID string `json:"tgId" from:"tgId"`
SubID string `json:"subId" from:"subId"` SubID string `json:"subId" from:"subId"`
} }

21
web/assets/js/model/xray.js
View File

@@ -1431,13 +1431,15 @@ Inbound.VmessSettings = class extends Inbound.Settings {
} }
}; };
Inbound.VmessSettings.Vmess = class extends XrayCommonClass { Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
, subId='') { constructor(id=RandomUtil.randomUUID(), alterId=0, email=RandomUtil.randomText(), totalGB=0, expiryTime=0, enable=true, tgId='', subId='') {
super(); super();
this.id = id; this.id = id;
this.alterId = alterId; this.alterId = alterId;
this.email = email; this.email = email;
this.totalGB = totalGB; this.totalGB = totalGB;
this.expiryTime = expiryTime; this.expiryTime = expiryTime;
this.enable = enable;
this.tgId = tgId;
this.subId = subId; this.subId = subId;
} }
@@ -1448,6 +1450,8 @@ Inbound.VmessSettings.Vmess = class extends XrayCommonClass {
json.email, json.email,
json.totalGB, json.totalGB,
json.expiryTime, json.expiryTime,
json.enable,
json.tgId,
json.subId, json.subId,
); );
} }
@@ -1514,14 +1518,15 @@ Inbound.VLESSSettings = class extends Inbound.Settings {
}; };
Inbound.VLESSSettings.VLESS = class extends XrayCommonClass { Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
constructor(id=RandomUtil.randomUUID(), flow='', email=RandomUtil.randomText(), totalGB=0, expiryTime=0, enable=true, tgId='', subId='') {
, subId='') {
super(); super();
this.id = id; this.id = id;
this.flow = flow; this.flow = flow;
this.email = email; this.email = email;
this.totalGB = totalGB; this.totalGB = totalGB;
this.expiryTime = expiryTime; this.expiryTime = expiryTime;
this.enable = enable;
this.tgId = tgId;
this.subId = subId; this.subId = subId;
} }
@@ -1532,6 +1537,8 @@ Inbound.VLESSSettings.VLESS = class extends XrayCommonClass {
json.email, json.email,
json.totalGB, json.totalGB,
json.expiryTime, json.expiryTime,
json.enable,
json.tgId,
json.subId, json.subId,
); );
} }
@@ -1629,13 +1636,15 @@ Inbound.TrojanSettings = class extends Inbound.Settings {
} }
}; };
Inbound.TrojanSettings.Trojan = class extends XrayCommonClass { Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
, subId='') { constructor(password=RandomUtil.randomSeq(10), flow='', email=RandomUtil.randomText(), totalGB=0, expiryTime=0, enable=true, tgId='', subId='') {
super(); super();
this.password = password; this.password = password;
this.flow = flow; this.flow = flow;
this.email = email; this.email = email;
this.totalGB = totalGB; this.totalGB = totalGB;
this.expiryTime = expiryTime; this.expiryTime = expiryTime;
this.enable = enable;
this.tgId = tgId;
this.subId = subId; this.subId = subId;
} }
@@ -1646,6 +1655,8 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
email: this.email, email: this.email,
totalGB: this.totalGB, totalGB: this.totalGB,
expiryTime: this.expiryTime, expiryTime: this.expiryTime,
enable: this.enable,
tgId: this.tgId,
subId: this.subId, subId: this.subId,
}; };
} }
@@ -1657,6 +1668,8 @@ Inbound.TrojanSettings.Trojan = class extends XrayCommonClass {
json.email, json.email,
json.totalGB, json.totalGB,
json.expiryTime, json.expiryTime,
json.enable,
json.tgId,
json.subId, json.subId,
); );
} }