From 79b2dc0624deaeee016926945af98e6b467c5ffb Mon Sep 17 00:00:00 2001 From: SiHuaN Date: Tue, 31 Dec 2024 23:04:46 +0800 Subject: [PATCH] support 115 internal upload --- drivers/115/meta.go | 11 ++++++----- drivers/115/util.go | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/115/meta.go b/drivers/115/meta.go index bcea1749..3cdd12f2 100644 --- a/drivers/115/meta.go +++ b/drivers/115/meta.go @@ -6,11 +6,12 @@ import ( ) type Addition struct { - Cookie string `json:"cookie" type:"text" help:"one of QR code token and cookie required"` - QRCodeToken string `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"` - QRCodeSource string `json:"qrcode_source" type:"select" options:"web,android,ios,tv,alipaymini,wechatmini,qandroid" default:"linux" help:"select the QR code device, default linux"` - PageSize int64 `json:"page_size" type:"number" default:"1000" help:"list api per page size of 115 driver"` - LimitRate float64 `json:"limit_rate" type:"float" default:"2" help:"limit all api request rate ([limit]r/1s)"` + Cookie string `json:"cookie" type:"text" help:"one of QR code token and cookie required"` + QRCodeToken string `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"` + QRCodeSource string `json:"qrcode_source" type:"select" options:"web,android,ios,tv,alipaymini,wechatmini,qandroid" default:"linux" help:"select the QR code device, default linux"` + PageSize int64 `json:"page_size" type:"number" default:"1000" help:"list api per page size of 115 driver"` + LimitRate float64 `json:"limit_rate" type:"float" default:"2" help:"limit all api request rate ([limit]r/1s)"` + UseInternalUpload bool `json:"use_internal_upload" type:"bool" default:"false" help:"use internal upload api"` driver.RootID } diff --git a/drivers/115/util.go b/drivers/115/util.go index d7a1adff..4425f439 100644 --- a/drivers/115/util.go +++ b/drivers/115/util.go @@ -277,7 +277,7 @@ func (c *Pan115) UploadByOSS(params *driver115.UploadOSSParams, r io.Reader, dir if err != nil { return nil, err } - ossClient, err := oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret) + ossClient, err := oss.New(c.client.GetOSSEndpoint(c.Addition.UseInternalUpload), ossToken.AccessKeyID, ossToken.AccessKeySecret) if err != nil { return nil, err } @@ -332,7 +332,7 @@ func (d *Pan115) UploadByMultipart(params *driver115.UploadOSSParams, fileSize i return nil, err } - if ossClient, err = oss.New(driver115.OSSEndpoint, ossToken.AccessKeyID, ossToken.AccessKeySecret, oss.EnableMD5(true), oss.EnableCRC(true)); err != nil { + if ossClient, err = oss.New(d.client.GetOSSEndpoint(d.Addition.UseInternalUpload), ossToken.AccessKeyID, ossToken.AccessKeySecret, oss.EnableMD5(true), oss.EnableCRC(true)); err != nil { return nil, err }