diff --git a/web/html/xui/client_modal.html b/web/html/xui/client_modal.html
index 17381a88..e4ee8659 100644
--- a/web/html/xui/client_modal.html
+++ b/web/html/xui/client_modal.html
@@ -120,12 +120,12 @@
event.target.value = msg.obj
}
},
- async clearDBClientIps(email,event) {
+ async clearDBClientIps(email) {
const msg = await HttpUtil.post('/xui/inbound/clearClientIps/'+ email);
if (!msg.success) {
return;
}
- event.target.value = ""
+ document.getElementById("clientIPs").value = ""
},
},
});
diff --git a/web/html/xui/form/client.html b/web/html/xui/form/client.html
index 586f4fd4..fac830e2 100644
--- a/web/html/xui/form/client.html
+++ b/web/html/xui/form/client.html
@@ -50,12 +50,12 @@
Clear The Log
-
+
-
+
diff --git a/web/html/xui/form/protocol/trojan.html b/web/html/xui/form/protocol/trojan.html
index 76cc9b66..840ce17d 100644
--- a/web/html/xui/form/protocol/trojan.html
+++ b/web/html/xui/form/protocol/trojan.html
@@ -31,29 +31,6 @@
-
-
- IP log
-
-
- IPs history Log (before enabling inbound after it has been disabled by IP limit, you should clear the log)
-
-
-
-
-
- clear the log
-
-
-
-
-
-
-
-
-
-
-
{{ i18n "none" }}
diff --git a/web/html/xui/form/protocol/vless.html b/web/html/xui/form/protocol/vless.html
index 146587f7..6b3436f0 100644
--- a/web/html/xui/form/protocol/vless.html
+++ b/web/html/xui/form/protocol/vless.html
@@ -31,29 +31,6 @@
-
-
- IP log
-
-
- IPs history Log (before enabling inbound after it has been disabled by IP limit, you should clear the log)
-
-
-
-
-
- clear the log
-
-
-
-
-
-
-
-
-
-
-
{{ i18n "none" }}
diff --git a/web/html/xui/form/protocol/vmess.html b/web/html/xui/form/protocol/vmess.html
index 4c6779dd..59cf6d2b 100644
--- a/web/html/xui/form/protocol/vmess.html
+++ b/web/html/xui/form/protocol/vmess.html
@@ -34,29 +34,6 @@
-
-
- IP Log
-
-
- IPs history Log (before enabling inbound after it has been disabled by IP limit, you should clear the log)
-
-
-
-
-
- Clear The Log
-
-
-
-
-
-
-
-
-
-
-
{{ i18n "pages.inbounds.totalFlow" }}(GB)
diff --git a/web/service/inbound.go b/web/service/inbound.go
index 87440c84..b6f4f031 100644
--- a/web/service/inbound.go
+++ b/web/service/inbound.go
@@ -179,6 +179,20 @@ func (s *InboundService) DelInbound(id int) error {
if err != nil {
return err
}
+ inbound, err := s.GetInbound(id)
+ if err != nil {
+ return err
+ }
+ clients, err := s.getClients(inbound)
+ if err != nil {
+ return err
+ }
+ for _, client := range clients {
+ err := s.DelClientIPs(db, client.Email)
+ if err != nil {
+ return err
+ }
+ }
return db.Delete(model.Inbound{}, id).Error
}
@@ -286,6 +300,12 @@ func (s *InboundService) DelInboundClient(inbound *model.Inbound, email string)
oldInbound.Settings = inbound.Settings
+ err = s.DelClientIPs(db, email)
+ if err != nil {
+ logger.Error("Error in delete client IPs")
+ return err
+ }
+
return db.Save(oldInbound).Error
}
@@ -319,12 +339,26 @@ func (s *InboundService) UpdateInboundClient(inbound *model.Inbound, index int)
if len(clients[index].Email) > 0 {
if len(oldClients[index].Email) > 0 {
- s.UpdateClientStat(oldClients[index].Email, &clients[index])
+ err = s.UpdateClientStat(oldClients[index].Email, &clients[index])
+ if err != nil {
+ return err
+ }
+ err = s.UpdateClientIPs(db, oldClients[index].Email, clients[index].Email)
+ if err != nil {
+ return err
+ }
} else {
s.AddClientStat(inbound.Id, &clients[index])
}
} else {
- s.DelClientStat(db, oldClients[index].Email)
+ err = s.DelClientStat(db, oldClients[index].Email)
+ if err != nil {
+ return err
+ }
+ err = s.DelClientIPs(db, oldClients[index].Email)
+ if err != nil {
+ return err
+ }
}
return db.Save(oldInbound).Error
}
@@ -483,10 +517,20 @@ func (s *InboundService) UpdateClientStat(email string, client *model.Client) er
}
return nil
}
+
+func (s *InboundService) UpdateClientIPs(tx *gorm.DB, oldEmail string, newEmail string) error {
+ return tx.Model(model.InboundClientIps{}).Where("client_email = ?", oldEmail).Update("client_email", newEmail).Error
+}
+
func (s *InboundService) DelClientStat(tx *gorm.DB, email string) error {
return tx.Where("email = ?", email).Delete(xray.ClientTraffic{}).Error
}
+func (s *InboundService) DelClientIPs(tx *gorm.DB, email string) error {
+ logger.Warning(email)
+ return tx.Where("client_email = ?", email).Delete(model.InboundClientIps{}).Error
+}
+
func (s *InboundService) ResetClientTraffic(id int, clientEmail string) error {
db := database.GetDB()
@@ -567,6 +611,7 @@ func (s *InboundService) SearchClientTraffic(query string) (traffic *xray.Client
}
return traffic, err
}
+
func (s *InboundService) GetInboundClientIps(clientEmail string) (string, error) {
db := database.GetDB()
InboundClientIps := &model.InboundClientIps{}
@@ -576,7 +621,7 @@ func (s *InboundService) GetInboundClientIps(clientEmail string) (string, error)
}
return InboundClientIps.Ips, nil
}
-func (s *InboundService) ClearClientIps(clientEmail string) (error) {
+func (s *InboundService) ClearClientIps(clientEmail string) error {
db := database.GetDB()
result := db.Model(model.InboundClientIps{}).
@@ -584,7 +629,6 @@ func (s *InboundService) ClearClientIps(clientEmail string) (error) {
Update("ips", "")
err := result.Error
-
if err != nil {
return err
}