mirror of
https://github.com/wyx2685/V2bX.git
synced 2026-02-04 04:30:08 +00:00
test: update go 1.25.0
This commit is contained in:
@@ -2,10 +2,11 @@ package panel
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"github.com/goccy/go-json"
|
||||
"encoding/json/jsontext"
|
||||
"encoding/json/v2"
|
||||
|
||||
"github.com/vmihailenco/msgpack/v5"
|
||||
)
|
||||
|
||||
@@ -56,12 +57,33 @@ func (c *Client) GetUserList() ([]UserInfo, error) {
|
||||
return nil, fmt.Errorf("decode user list error: %w", err)
|
||||
}
|
||||
} else {
|
||||
bodyBytes, err := io.ReadAll(r.RawResponse.Body)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read response body error: %w", err)
|
||||
dec := jsontext.NewDecoder(r.RawResponse.Body)
|
||||
for {
|
||||
tok, err := dec.ReadToken()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("decode user list error: %w", err)
|
||||
}
|
||||
if tok.Kind() == '"' && tok.String() == "users" {
|
||||
break
|
||||
}
|
||||
}
|
||||
if err := json.Unmarshal(bodyBytes, userlist); err != nil {
|
||||
return nil, fmt.Errorf("unmarshal user list error: %w", err)
|
||||
tok, err := dec.ReadToken()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("decode user list error: %w", err)
|
||||
}
|
||||
if tok.Kind() != '[' {
|
||||
return nil, fmt.Errorf(`decode user list error: expected "users" array`)
|
||||
}
|
||||
for dec.PeekKind() != ']' {
|
||||
val, err := dec.ReadValue()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("decode user list error: read user object: %w", err)
|
||||
}
|
||||
var u UserInfo
|
||||
if err := json.Unmarshal(val, &u); err != nil {
|
||||
return nil, fmt.Errorf("decode user list error: unmarshal user error: %w", err)
|
||||
}
|
||||
userlist.Users = append(userlist.Users, u)
|
||||
}
|
||||
}
|
||||
c.userEtag = r.Header().Get("ETag")
|
||||
|
||||
Reference in New Issue
Block a user