fix(baidu.photo):update download api

pull/1079/head
foxxorcat 2022-05-10 11:43:54 +08:00
parent 52dcbfe1a4
commit a9027c0f06
4 changed files with 15 additions and 15 deletions

View File

@ -87,7 +87,7 @@ func (driver Baidu) GetAllFile(account *model.Account) (files []File, err error)
for { for {
var resp FileListResp var resp FileListResp
_, err = driver.Request(http.MethodGet, FILE_API_URL+"/list", func(r *resty.Request) { _, err = driver.Request(http.MethodGet, FILE_API_URL_V1+"/list", func(r *resty.Request) {
r.SetQueryParams(map[string]string{ r.SetQueryParams(map[string]string{
"need_thumbnail": "1", "need_thumbnail": "1",
"need_filter_hidden": "0", "need_filter_hidden": "0",

View File

@ -224,13 +224,12 @@ func (driver Baidu) LinkFile(args base.Args, account *model.Account) (*base.Link
if err != nil { if err != nil {
return nil, err return nil, err
} }
// 获取文件下载地址
res, err := base.NoRedirectClient.R(). res, err := driver.Request(http.MethodGet, FILE_API_URL_V2+"/download", func(r *resty.Request) {
SetQueryParams(map[string]string{ r.SetQueryParams(map[string]string{
"access_token": account.AccessToken,
"fsid": fmt.Sprint(cfile.Fsid), "fsid": fmt.Sprint(cfile.Fsid),
}). })
Head(FILE_API_URL + "/download") }, account)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -238,7 +237,7 @@ func (driver Baidu) LinkFile(args base.Args, account *model.Account) (*base.Link
Headers: []base.Header{ Headers: []base.Header{
{Name: "User-Agent", Value: base.UserAgent}, {Name: "User-Agent", Value: base.UserAgent},
}, },
Url: res.Header().Get("location"), Url: utils.Json.Get(res.Body(), "dlink").ToString(),
}, nil }, nil
} }
@ -454,7 +453,7 @@ func (driver Baidu) Upload(file *model.FileStream, account *model.Account) error
// 预上传 // 预上传
var precreateResp PrecreateResp var precreateResp PrecreateResp
_, err = driver.Request(http.MethodPost, FILE_API_URL+"/precreate", func(r *resty.Request) { _, err = driver.Request(http.MethodPost, FILE_API_URL_V1+"/precreate", func(r *resty.Request) {
r.SetFormData(params) r.SetFormData(params)
r.SetResult(&precreateResp) r.SetResult(&precreateResp)
}, account) }, account)
@ -483,7 +482,7 @@ func (driver Baidu) Upload(file *model.FileStream, account *model.Account) error
fallthrough fallthrough
case 2: // 创建文件 case 2: // 创建文件
params["uploadid"] = precreateResp.UploadID params["uploadid"] = precreateResp.UploadID
_, err = driver.Request(http.MethodPost, FILE_API_URL+"/create", func(r *resty.Request) { _, err = driver.Request(http.MethodPost, FILE_API_URL_V1+"/create", func(r *resty.Request) {
r.SetFormData(params) r.SetFormData(params)
r.SetResult(&precreateResp) r.SetResult(&precreateResp)
}, account) }, account)

View File

@ -97,7 +97,7 @@ type (
type ( type (
UploadFile struct { UploadFile struct {
FsID int64 `json:"fs_id"` FsID int64 `json:"fs_id"`
Size int `json:"size"` Size int64 `json:"size"`
Md5 string `json:"md5"` Md5 string `json:"md5"`
ServerFilename string `json:"server_filename"` ServerFilename string `json:"server_filename"`
Path string `json:"path"` Path string `json:"path"`

View File

@ -15,7 +15,8 @@ import (
const ( const (
API_URL = "https://photo.baidu.com/youai" API_URL = "https://photo.baidu.com/youai"
ALBUM_API_URL = API_URL + "/album/v1" ALBUM_API_URL = API_URL + "/album/v1"
FILE_API_URL = API_URL + "/file/v1" FILE_API_URL_V1 = API_URL + "/file/v1"
FILE_API_URL_V2 = API_URL + "/file/v2"
) )
var ( var (