| @@ -25,20 +25,20 @@ func (c *Client) Object() *ObjectService { | |||||
| } | } | ||||
| } | } | ||||
| const ObjectListPath = "/object/list" | |||||
| const ObjectListPathByPath = "/object/listByPath" | |||||
| type ObjectList struct { | |||||
| type ObjectListByPath struct { | |||||
| UserID cdssdk.UserID `form:"userID" binding:"required"` | UserID cdssdk.UserID `form:"userID" binding:"required"` | ||||
| PackageID cdssdk.PackageID `form:"packageID" binding:"required"` | PackageID cdssdk.PackageID `form:"packageID" binding:"required"` | ||||
| Path string `form:"path"` // 允许为空字符串 | Path string `form:"path"` // 允许为空字符串 | ||||
| IsPrefix bool `form:"isPrefix"` | IsPrefix bool `form:"isPrefix"` | ||||
| } | } | ||||
| type ObjectListResp struct { | |||||
| type ObjectListByPathResp struct { | |||||
| Objects []cdssdk.Object `json:"objects"` | Objects []cdssdk.Object `json:"objects"` | ||||
| } | } | ||||
| func (c *ObjectService) List(req ObjectList) (*ObjectListResp, error) { | |||||
| url, err := url.JoinPath(c.baseURL, ObjectListPath) | |||||
| func (c *ObjectService) ListByPath(req ObjectListByPath) (*ObjectListByPathResp, error) { | |||||
| url, err := url.JoinPath(c.baseURL, ObjectListPathByPath) | |||||
| if err != nil { | if err != nil { | ||||
| return nil, err | return nil, err | ||||
| } | } | ||||
| @@ -50,7 +50,7 @@ func (c *ObjectService) List(req ObjectList) (*ObjectListResp, error) { | |||||
| return nil, err | return nil, err | ||||
| } | } | ||||
| jsonResp, err := ParseJSONResponse[response[ObjectListResp]](resp) | |||||
| jsonResp, err := ParseJSONResponse[response[ObjectListByPathResp]](resp) | |||||
| if err != nil { | if err != nil { | ||||
| return nil, err | return nil, err | ||||
| } | } | ||||
| @@ -55,19 +55,19 @@ func (c *PackageService) Get(req PackageGetReq) (*PackageGetResp, error) { | |||||
| return nil, codeResp.ToError() | return nil, codeResp.ToError() | ||||
| } | } | ||||
| const PackageGetByNamePath = "/package/getByName" | |||||
| const PackageGetByFullNamePath = "/package/getByFullName" | |||||
| type PackageGetByName struct { | |||||
| type PackageGetByFullName struct { | |||||
| UserID cdssdk.UserID `form:"userID" json:"userID" binding:"required"` | UserID cdssdk.UserID `form:"userID" json:"userID" binding:"required"` | ||||
| BucketName string `form:"bucketName" json:"bucketName" binding:"required"` | BucketName string `form:"bucketName" json:"bucketName" binding:"required"` | ||||
| PackageName string `form:"packageName" json:"packageName" binding:"required"` | PackageName string `form:"packageName" json:"packageName" binding:"required"` | ||||
| } | } | ||||
| type PackageGetByNameResp struct { | |||||
| type PackageGetByFullNameResp struct { | |||||
| Package cdssdk.Package `json:"package"` | Package cdssdk.Package `json:"package"` | ||||
| } | } | ||||
| func (c *PackageService) GetByName(req PackageGetByName) (*PackageGetByNameResp, error) { | |||||
| url, err := url.JoinPath(c.baseURL, PackageGetByNamePath) | |||||
| func (c *PackageService) GetByName(req PackageGetByFullName) (*PackageGetByFullNameResp, error) { | |||||
| url, err := url.JoinPath(c.baseURL, PackageGetByFullNamePath) | |||||
| if err != nil { | if err != nil { | ||||
| return nil, err | return nil, err | ||||
| } | } | ||||
| @@ -79,7 +79,7 @@ func (c *PackageService) GetByName(req PackageGetByName) (*PackageGetByNameResp, | |||||
| return nil, err | return nil, err | ||||
| } | } | ||||
| codeResp, err := ParseJSONResponse[response[PackageGetByNameResp]](resp) | |||||
| codeResp, err := ParseJSONResponse[response[PackageGetByFullNameResp]](resp) | |||||
| if err != nil { | if err != nil { | ||||
| return nil, err | return nil, err | ||||
| } | } | ||||
| @@ -131,7 +131,7 @@ func Test_ObjectList(t *testing.T) { | |||||
| URL: "http://localhost:7890", | URL: "http://localhost:7890", | ||||
| }) | }) | ||||
| resp, err := cli.Object().List(ObjectList{ | |||||
| resp, err := cli.Object().ListByPath(ObjectListByPath{ | |||||
| UserID: 1, | UserID: 1, | ||||
| PackageID: 10, | PackageID: 10, | ||||
| Path: "100x100K/zexema", | Path: "100x100K/zexema", | ||||