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

Merge pull request #183 from masoud-hidden/main

Browse Source 
Fix some problems.
This commit is contained in:
Alireza Ahmadi
2023-04-11 04:27:31 +02:00
committed by GitHub
parent 3a002c886d 2be3df59be
commit 61fd029e28
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/html/xui/index.html
View File

@@ -424,7 +424,7 @@
txtModal.show('config.json',JSON.stringify(msg.obj, null, 2),'config.json');
},
getBackup(){
window.location = '/server/getDb';
window.location = basePath + 'server/getDb';
}
},
async mounted() {

22
web/service/inbound.go
View File

@@ -426,19 +426,21 @@ func (s *InboundService) adjustTraffics(traffics []*xray.ClientTraffic) (full_tr
continue
}
// get settings clients
settings := map[string][]model.Client{}
settings := map[string]interface{}{}
json.Unmarshal([]byte(inbound.Settings), &settings)
clients := settings["clients"]
clients, ok := settings["clients"].([]model.Client)
needUpdate := false
for client_index, client := range clients {
if traffic.Email == client.Email {
if client.ExpiryTime < 0 {
clients[client_index].ExpiryTime = (time.Now().Unix() * 1000) - client.ExpiryTime
needUpdate = true
if ok {
for client_index, client := range clients {
if traffic.Email == client.Email {
if client.ExpiryTime < 0 {
clients[client_index].ExpiryTime = (time.Now().Unix() * 1000) - client.ExpiryTime
needUpdate = true
}
client_traffic.ExpiryTime = client.ExpiryTime
client_traffic.Total = client.TotalGB
break
}
client_traffic.ExpiryTime = client.ExpiryTime
client_traffic.Total = client.TotalGB
break
}
}