gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-18 06:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize client settings

Browse Source
This commit is contained in:
Alireza Ahmadi
2023-04-19 00:42:54 +02:00
parent 7455a2baa3
commit f4f1d477b3
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/html/xui/inbounds.html
View File

@@ -655,8 +655,8 @@
inbound = dbInbound.toInbound();
clients = this.getClients(dbInbound.protocol, inbound.settings);
index = this.findIndexOfClient(clients, client);
clients[index].enable = ! clients[index].enable
await this.updateClient(inbound, dbInbound, index);
clients[index].enable = !clients[index].enable;
await this.updateClient(clients[index],dbInboundId, index);
this.loading(false);
},
async submit(url, data) {

46
web/service/inbound.go
View File

@@ -252,11 +252,18 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) error {
if err != nil {
return err
}
existEmail, err := s.checkEmailsExistForClients(clients)
var settings map[string]interface{}
err = json.Unmarshal([]byte(data.Settings), &settings)
if err != nil {
return err
}
interfaceClients := settings["clients"].([]interface{})
existEmail, err := s.checkEmailsExistForClients(clients)
if err != nil {
return err
}
if existEmail != "" {
return common.NewError("Duplicate email:", existEmail)
}
@@ -266,21 +273,18 @@ func (s *InboundService) AddInboundClient(data *model.Inbound) error {
return err
}
var settings map[string]interface{}
err = json.Unmarshal([]byte(oldInbound.Settings), &settings)
var oldSettings map[string]interface{}
err = json.Unmarshal([]byte(oldInbound.Settings), &oldSettings)
if err != nil {
return err
}
oldClients := settings["clients"].([]interface{})
var newClients []interface{}
for _, client := range clients {
newClients = append(newClients, client)
}
oldClients := oldSettings["clients"].([]interface{})
oldClients = append(oldClients, interfaceClients...)
settings["clients"] = append(oldClients, newClients...)
oldSettings["clients"] = oldClients
newSettings, err := json.MarshalIndent(settings, "", " ")
newSettings, err := json.MarshalIndent(oldSettings, "", " ")
if err != nil {
return err
}
@@ -321,6 +325,14 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, index int) err
return err
}
var settings map[string]interface{}
err = json.Unmarshal([]byte(data.Settings), &settings)
if err != nil {
return err
}
inerfaceClients := settings["clients"].([]interface{})
oldInbound, err := s.GetInbound(data.Id)
if err != nil {
return err
@@ -341,20 +353,18 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, index int) err
}
}
var settings map[string]interface{}
err = json.Unmarshal([]byte(oldInbound.Settings), &settings)
var oldSettings map[string]interface{}
err = json.Unmarshal([]byte(oldInbound.Settings), &oldSettings)
if err != nil {
return err
}
settingsClients := settings["clients"].([]interface{})
var newClients []interface{}
newClients = append(newClients, clients[0])
settingsClients[index] = newClients[0]
settingsClients := oldSettings["clients"].([]interface{})
settingsClients[index] = inerfaceClients[0]
settings["clients"] = settingsClients
oldSettings["clients"] = settingsClients
newSettings, err := json.MarshalIndent(settings, "", " ")
newSettings, err := json.MarshalIndent(oldSettings, "", " ")
if err != nil {
return err
}