Merge branch 'dev_new' of github.com:wyx2685/V2bX into dev_new

api/panel/panel.go

@@ -3,6 +3,7 @@ package panel
 import (
 	"errors"
 	"fmt"
+	"net"
 	"strconv"
 	"strings"
 	"time"
@@ -18,6 +19,7 @@ import (
 type Client struct {
 	client           *resty.Client
 	APIHost          string
+	APISendIP        string
 	Token            string
 	NodeType         string
 	NodeId           int
@@ -29,7 +31,14 @@ type Client struct {
 }
 
 func New(c *conf.ApiConfig) (*Client, error) {
-	client := resty.New()
+	var client *resty.Client
+	if c.APISendIP != "" {
+		client = resty.NewWithLocalAddr(&net.TCPAddr{
+			IP: net.ParseIP(c.APISendIP),
+		})
+	} else {	
+		client = resty.New()
+	}
 	client.SetRetryCount(3)
 	if c.Timeout > 0 {
 		client.SetTimeout(time.Duration(c.Timeout) * time.Second)
@@ -69,12 +78,13 @@ func New(c *conf.ApiConfig) (*Client, error) {
 		"token":     c.Key,
 	})
 	return &Client{
-		client:   client,
+		client:    client,
-		Token:    c.Key,
+		Token:     c.Key,
-		APIHost:  c.APIHost,
+		APIHost:   c.APIHost,
-		NodeType: c.NodeType,
+		APISendIP: c.APISendIP,
-		NodeId:   c.NodeID,
+		NodeType:  c.NodeType,
-		UserList: &UserListBody{},
+		NodeId:    c.NodeID,
-		AliveMap: &AliveMap{},
+		UserList:  &UserListBody{},
+		AliveMap:  &AliveMap{},
 	}, nil
 }

common/rate/conn.go

@@ -19,11 +19,17 @@ type Conn struct {
 }
 
 func (c *Conn) Read(b []byte) (n int, err error) {
-	c.limiter.Wait(int64(len(b)))
+	n, err = c.Conn.Read(b)
-	return c.Conn.Read(b)
+	if n > 0 {
+		c.limiter.Wait(int64(n))
+	}
+	return n, err
 }
 
 func (c *Conn) Write(b []byte) (n int, err error) {
-	c.limiter.Wait(int64(len(b)))
+	n, err = c.Conn.Write(b)
-	return c.Conn.Write(b)
+	if n > 0 {
-}
+		c.limiter.Wait(int64(n))
+	}
+	return n, err
+}

conf/node.go

@@ -25,6 +25,7 @@ type rawNodeConfig struct {
 
 type ApiConfig struct {
 	APIHost      string `json:"ApiHost"`
+	APISendIP    string `json:"ApiSendIP"`
 	NodeID       int    `json:"NodeID"`
 	Key          string `json:"ApiKey"`
 	NodeType     string `json:"NodeType"`