remove no need interface, fix interval type for v2board v1.7.4dev

api/panel/interface.go

@@ -1,9 +0,0 @@
-package panel
-
-type Panel interface {
-	GetNodeInfo() (nodeInfo *NodeInfo, err error)
-	GetUserList() (userList []UserInfo, err error)
-	ReportUserTraffic(userTraffic []UserTraffic) (err error)
-	Describe() ClientInfo
-	Debug()
-}

api/panel/node.go

@@ -2,9 +2,11 @@ package panel
 
 import (
 	"github.com/goccy/go-json"
+	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type NodeInfo struct {
@@ -73,13 +75,24 @@ func (c *Client) GetNodeInfo() (nodeInfo *NodeInfo, err error) {
 	}
 	nodeInfo.Routes = nil
 	if _, ok := nodeInfo.BaseConfig.PullInterval.(int); !ok {
-		i, _ := strconv.Atoi(nodeInfo.BaseConfig.PullInterval.(string))
-		nodeInfo.BaseConfig.PullInterval = i
+		nodeInfo.BaseConfig.PullInterval = intervalToTime(nodeInfo.BaseConfig.PullInterval)
 	}
 	if _, ok := nodeInfo.BaseConfig.PushInterval.(int); !ok {
-		i, _ := strconv.Atoi(nodeInfo.BaseConfig.PushInterval.(string))
-		nodeInfo.BaseConfig.PushInterval = i
+		nodeInfo.BaseConfig.PushInterval = intervalToTime(nodeInfo.BaseConfig.PullInterval)
 	}
 	c.etag = r.Header().Get("Etag")
 	return
 }
+
+func intervalToTime(i interface{}) time.Duration {
+	switch reflect.TypeOf(i).Kind() {
+	case reflect.Int:
+		return time.Duration(i.(int)) * time.Second
+	case reflect.String:
+		i, _ := strconv.Atoi(i.(string))
+		return time.Duration(i) * time.Second
+	case reflect.Float64:
+		return time.Duration(i.(float64)) * time.Second
+	}
+	return 0
+}

api/panel/node_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 )
 
-var client Panel
+var client *Client
 
 func init() {
 	c, err := New(&conf.ApiConfig{

api/panel/panel.go

@@ -32,7 +32,7 @@ type Client struct {
 	etag          string
 }
 
-func New(c *conf.ApiConfig) (Panel, error) {
+func New(c *conf.ApiConfig) (*Client, error) {
 	client := resty.New()
 	client.SetRetryCount(3)
 	if c.Timeout > 0 {