v1.1.1

README.md

@@ -56,7 +56,7 @@ xray panel supporting multi-protocol, **Multi-lang (English,Farsi,Chinese)**
 | `POST` | `"/addClient/"`                    | Add Client to inbound                       |
 | `POST` | `"/:id/delClient/:clientId"`       | Delete Client by UID/Password as clientId   |
 | `POST` | `"/updateClient/:clientId"`        | Update Client by UID/Password as clientId   |
-| `POST` | `"/:id/resetClientTraffic/:email"` | Reset Client's Traffic                      |
+| `POST` | `"/getClientTraffics/:email"`      | Get Client's Traffic                        |
 | `POST` | `"/resetAllTraffics"`              | Reset traffics of all inbounds              |
 | `POST` | `"/resetAllClientTraffics/:id"`    | Reset inbound clients traffics (-1: all)    |
 | `POST` | `"/delDepletedClients/:id"`        | Delete inbound depleted clients (-1: all)   |

config/version

@@ -1 +1 @@
-1.1.0
+1.1.1

web/controller/util.go

@@ -1,24 +1,16 @@
 package controller
 
 import (
-	"github.com/gin-gonic/gin"
 	"net"
 	"net/http"
 	"strings"
 	"x-ui/config"
 	"x-ui/logger"
 	"x-ui/web/entity"
+
+	"github.com/gin-gonic/gin"
 )
 
-func getUriId(c *gin.Context) int64 {
-	s := struct {
-		Id int64 `uri:"id"`
-	}{}
-
-	_ = c.BindUri(&s)
-	return s.Id
-}
-
 func getRemoteIp(c *gin.Context) string {
 	value := c.GetHeader("X-Forwarded-For")
 	if value != "" {
@@ -85,10 +77,8 @@ func getContext(h gin.H) gin.H {
 	a := gin.H{
 		"cur_ver": config.GetVersion(),
 	}
-	if h != nil {
-		for key, value := range h {
-			a[key] = value
-		}
+	for key, value := range h {
+		a[key] = value
 	}
 	return a
 }

web/service/inbound.go

@@ -528,7 +528,7 @@ func (s *InboundService) adjustTraffics(tx *gorm.DB, dbClientTraffics []*xray.Cl
 				for client_index := range clients {
 					c := clients[client_index].(map[string]interface{})
 					for traffic_index := range dbClientTraffics {
-						if c["email"] == dbClientTraffics[traffic_index].Email {
+						if dbClientTraffics[traffic_index].ExpiryTime < 0 && c["email"] == dbClientTraffics[traffic_index].Email {
 							oldExpiryTime := c["expiryTime"].(float64)
 							newExpiryTime := (time.Now().Unix() * 1000) - int64(oldExpiryTime)
 							c["expiryTime"] = newExpiryTime