diff --git a/api/v2raysocks/v2raysocks.go b/api/v2raysocks/v2raysocks.go index 83b1d2f..e0427a8 100644 --- a/api/v2raysocks/v2raysocks.go +++ b/api/v2raysocks/v2raysocks.go @@ -140,7 +140,7 @@ func (c *APIClient) parseResponse(res *resty.Response, path string, err error) ( return rtn, nil } -// GetNodeInfo will pull NodeInfo Config from sspanel +// GetNodeInfo will pull NodeInfo Config from panel func (c *APIClient) GetNodeInfo() (nodeInfo *api.NodeInfo, err error) { var nodeType string switch c.NodeType { @@ -184,7 +184,7 @@ func (c *APIClient) GetNodeInfo() (nodeInfo *api.NodeInfo, err error) { return nodeInfo, nil } -// GetUserList will pull user form sspanel +// GetUserList will pull user form panel func (c *APIClient) GetUserList() (UserList *[]api.UserInfo, err error) { var nodeType string switch c.NodeType { @@ -215,16 +215,16 @@ func (c *APIClient) GetUserList() (UserList *[]api.UserInfo, err error) { user.Email = response.Get("data").GetIndex(i).Get("shadowsocks_user").Get("secret").MustString() user.Passwd = response.Get("data").GetIndex(i).Get("shadowsocks_user").Get("secret").MustString() user.Method = response.Get("data").GetIndex(i).Get("shadowsocks_user").Get("cipher").MustString() - user.SpeedLimit = uint64(response.Get("data").GetIndex(i).Get("shadowsocks_user").Get("speed_limit").MustUint64() * 1000000 / 8) + user.SpeedLimit = response.Get("data").GetIndex(i).Get("shadowsocks_user").Get("speed_limit").MustUint64() * 1000000 / 8 case "Trojan": user.UUID = response.Get("data").GetIndex(i).Get("trojan_user").Get("password").MustString() user.Email = response.Get("data").GetIndex(i).Get("trojan_user").Get("password").MustString() - user.SpeedLimit = uint64(response.Get("data").GetIndex(i).Get("trojan_user").Get("speed_limit").MustUint64() * 1000000 / 8) + user.SpeedLimit = response.Get("data").GetIndex(i).Get("trojan_user").Get("speed_limit").MustUint64() * 1000000 / 8 case "V2ray": user.UUID = response.Get("data").GetIndex(i).Get("v2ray_user").Get("uuid").MustString() user.Email = response.Get("data").GetIndex(i).Get("v2ray_user").Get("email").MustString() user.AlterID = uint16(response.Get("data").GetIndex(i).Get("v2ray_user").Get("alter_id").MustUint64()) - user.SpeedLimit = uint64(response.Get("data").GetIndex(i).Get("v2ray_user").Get("speed_limit").MustUint64() * 1000000 / 8) + user.SpeedLimit = response.Get("data").GetIndex(i).Get("v2ray_user").Get("speed_limit").MustUint64() * 1000000 / 8 } if c.SpeedLimit > 0 { user.SpeedLimit = uint64((c.SpeedLimit * 1000000) / 8) @@ -269,7 +269,7 @@ func (c *APIClient) GetNodeRule() (*[]api.DetectRule, error) { return &ruleList, nil } - // V2board only support the rule for v2ray + // Only support the rule for v2ray // fix: reuse config response c.access.Lock() defer c.access.Unlock() @@ -300,7 +300,7 @@ func (c *APIClient) ReportIllegal(detectResultList *[]api.DetectResult) error { return nil } -// ParseTrojanNodeResponse parse the response for the given nodeinfor format +// ParseTrojanNodeResponse parse the response for the given nodeInfo format func (c *APIClient) ParseTrojanNodeResponse(nodeInfoResponse *simplejson.Json) (*api.NodeInfo, error) { var TLSType = "tls" if c.EnableXTLS { @@ -315,7 +315,7 @@ func (c *APIClient) ParseTrojanNodeResponse(nodeInfoResponse *simplejson.Json) ( host := inboundInfo.Get("streamSettings").Get("tlsSettings").Get("serverName").MustString() // Create GeneralNodeInfo - nodeinfo := &api.NodeInfo{ + nodeInfo := &api.NodeInfo{ NodeType: c.NodeType, NodeID: c.NodeID, Port: port, @@ -324,10 +324,10 @@ func (c *APIClient) ParseTrojanNodeResponse(nodeInfoResponse *simplejson.Json) ( TLSType: TLSType, Host: host, } - return nodeinfo, nil + return nodeInfo, nil } -// ParseSSNodeResponse parse the response for the given nodeinfo format +// ParseSSNodeResponse parse the response for the given nodeInfo format func (c *APIClient) ParseSSNodeResponse(nodeInfoResponse *simplejson.Json) (*api.NodeInfo, error) { var method, serverPsk string tmpInboundInfo := nodeInfoResponse.Get("inbounds").MustArray() @@ -350,7 +350,7 @@ func (c *APIClient) ParseSSNodeResponse(nodeInfoResponse *simplejson.Json) (*api } // Create GeneralNodeInfo - nodeinfo := &api.NodeInfo{ + nodeInfo := &api.NodeInfo{ NodeType: c.NodeType, NodeID: c.NodeID, Port: port, @@ -359,12 +359,12 @@ func (c *APIClient) ParseSSNodeResponse(nodeInfoResponse *simplejson.Json) (*api ServerKey: serverPsk, } - return nodeinfo, nil + return nodeInfo, nil } -// ParseV2rayNodeResponse parse the response for the given nodeinfor format +// ParseV2rayNodeResponse parse the response for the given nodeInfo format func (c *APIClient) ParseV2rayNodeResponse(nodeInfoResponse *simplejson.Json) (*api.NodeInfo, error) { - var TLSType string = "tls" + var TLSType = "tls" var path, host, serviceName string var header json.RawMessage var enableTLS bool