From 6a54ed87f3e4d340d2ab62ec63ccc63c7e9ecf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E5=87=89?= <927625802@qq.com> Date: Wed, 29 Dec 2021 19:47:47 +0800 Subject: [PATCH] :art: change NeedSetLink to NoNeedSetLink --- drivers/123/driver.go | 3 +-- drivers/189/driver.go | 3 +-- drivers/alidrive/driver.go | 3 +-- drivers/alist/driver.go | 6 +++--- drivers/base/driver.go | 12 ++++++------ drivers/ftp/driver.go | 7 ++++--- drivers/google/driver.go | 7 ++++--- drivers/lanzou/driver.go | 5 ++--- drivers/native/driver.go | 7 ++++--- drivers/onedrive/driver.go | 3 ++- drivers/pikpak/driver.go | 5 ++--- server/controllers/path.go | 6 +++--- 12 files changed, 33 insertions(+), 34 deletions(-) diff --git a/drivers/123/driver.go b/drivers/123/driver.go index 7037f9eb..0277be40 100644 --- a/drivers/123/driver.go +++ b/drivers/123/driver.go @@ -22,8 +22,7 @@ type Pan123 struct{} func (driver Pan123) Config() base.DriverConfig { return base.DriverConfig{ - Name: "123Pan", - NeedSetLink: true, + Name: "123Pan", } } diff --git a/drivers/189/driver.go b/drivers/189/driver.go index c030d09e..30e25dbe 100644 --- a/drivers/189/driver.go +++ b/drivers/189/driver.go @@ -26,8 +26,7 @@ type Cloud189 struct{} func (driver Cloud189) Config() base.DriverConfig { return base.DriverConfig{ - Name: "189Cloud", - NeedSetLink: true, + Name: "189Cloud", } } diff --git a/drivers/alidrive/driver.go b/drivers/alidrive/driver.go index 8f01c0fa..8a417a0c 100644 --- a/drivers/alidrive/driver.go +++ b/drivers/alidrive/driver.go @@ -21,8 +21,7 @@ type AliDrive struct{} func (driver AliDrive) Config() base.DriverConfig { return base.DriverConfig{ - Name: "AliDrive", - NeedSetLink: true, + Name: "AliDrive", } } diff --git a/drivers/alist/driver.go b/drivers/alist/driver.go index ca9b8131..51d34d68 100644 --- a/drivers/alist/driver.go +++ b/drivers/alist/driver.go @@ -17,9 +17,9 @@ type Alist struct{} func (driver Alist) Config() base.DriverConfig { return base.DriverConfig{ - Name: "Alist", - OnlyProxy: false, - NoCors: true, + Name: "Alist", + NoNeedSetLink: true, + NoCors: true, } } diff --git a/drivers/base/driver.go b/drivers/base/driver.go index 2d977ccf..a2988fd7 100644 --- a/drivers/base/driver.go +++ b/drivers/base/driver.go @@ -10,12 +10,12 @@ import ( ) type DriverConfig struct { - Name string - OnlyProxy bool - NoLink bool // 必须本机返回的 - ApiProxy bool // 使用API中转的 - NeedSetLink bool // 需要设置链接的 - NoCors bool // 不可以跨域 + Name string + OnlyProxy bool + NoLink bool // 必须本机返回的 + ApiProxy bool // 使用API中转的 + NoNeedSetLink bool // 不需要设置链接的 + NoCors bool // 不可以跨域 } type Args struct { diff --git a/drivers/ftp/driver.go b/drivers/ftp/driver.go index da6e747b..24c1fb9e 100644 --- a/drivers/ftp/driver.go +++ b/drivers/ftp/driver.go @@ -16,9 +16,10 @@ type FTP struct{} func (driver FTP) Config() base.DriverConfig { return base.DriverConfig{ - Name: "FTP", - OnlyProxy: true, - NoLink: true, + Name: "FTP", + OnlyProxy: true, + NoLink: true, + NoNeedSetLink: true, } } diff --git a/drivers/google/driver.go b/drivers/google/driver.go index 1c5d6e5d..f324aa5d 100644 --- a/drivers/google/driver.go +++ b/drivers/google/driver.go @@ -16,9 +16,10 @@ type GoogleDrive struct{} func (driver GoogleDrive) Config() base.DriverConfig { return base.DriverConfig{ - Name: "GoogleDrive", - OnlyProxy: true, - ApiProxy: true, + Name: "GoogleDrive", + OnlyProxy: true, + ApiProxy: true, + NoNeedSetLink: true, } } diff --git a/drivers/lanzou/driver.go b/drivers/lanzou/driver.go index 1582f9a2..760ec1d2 100644 --- a/drivers/lanzou/driver.go +++ b/drivers/lanzou/driver.go @@ -14,9 +14,8 @@ type Lanzou struct{} func (driver Lanzou) Config() base.DriverConfig { return base.DriverConfig{ - Name: "Lanzou", - NeedSetLink: true, - NoCors: true, + Name: "Lanzou", + NoCors: true, } } diff --git a/drivers/native/driver.go b/drivers/native/driver.go index 72d6f968..3cc84120 100644 --- a/drivers/native/driver.go +++ b/drivers/native/driver.go @@ -19,9 +19,10 @@ type Native struct{} func (driver Native) Config() base.DriverConfig { return base.DriverConfig{ - Name: "Native", - OnlyProxy: true, - NoLink: true, + Name: "Native", + OnlyProxy: true, + NoLink: true, + NoNeedSetLink: true, } } diff --git a/drivers/onedrive/driver.go b/drivers/onedrive/driver.go index fb450032..e96721f2 100644 --- a/drivers/onedrive/driver.go +++ b/drivers/onedrive/driver.go @@ -16,7 +16,8 @@ type Onedrive struct{} func (driver Onedrive) Config() base.DriverConfig { return base.DriverConfig{ - Name: "Onedrive", + Name: "Onedrive", + NoNeedSetLink: true, } } diff --git a/drivers/pikpak/driver.go b/drivers/pikpak/driver.go index bd1770d7..13327e46 100644 --- a/drivers/pikpak/driver.go +++ b/drivers/pikpak/driver.go @@ -15,9 +15,8 @@ type PikPak struct{} func (driver PikPak) Config() base.DriverConfig { return base.DriverConfig{ - Name: "PikPak", - NeedSetLink: true, - ApiProxy: true, + Name: "PikPak", + ApiProxy: true, } } diff --git a/server/controllers/path.go b/server/controllers/path.go index f9674435..b5e542ef 100644 --- a/server/controllers/path.go +++ b/server/controllers/path.go @@ -60,9 +60,9 @@ func Path(c *gin.Context) { if account.DownProxyUrl != "" { file.Url = fmt.Sprintf("%s%s?sign=%s", account.DownProxyUrl, req.Path, utils.SignWithToken(file.Name, conf.Token)) } else { - file.Url = fmt.Sprintf("//%s/d%s", c.Request.Host, req.Path) + file.Url = fmt.Sprintf("//%s/p%s?sign=%s", c.Request.Host, req.Path, utils.SignWithToken(file.Name, conf.Token)) } - } else if driver.Config().NeedSetLink { + } else if !driver.Config().NoNeedSetLink { link, err := driver.Link(base.Args{Path: path, IP: c.ClientIP()}, account) if err != nil { common.ErrorResp(c, err, 500) @@ -103,7 +103,7 @@ func Link(c *gin.Context) { } if driver.Config().NoLink { common.SuccessResp(c, base.Link{ - Url: fmt.Sprintf("//%s/d%s?d=1&sign=%s", c.Request.Host, req.Path, utils.SignWithToken(utils.Base(rawPath), conf.Token)), + Url: fmt.Sprintf("//%s/p%s?d=1&sign=%s", c.Request.Host, req.Path, utils.SignWithToken(utils.Base(rawPath), conf.Token)), }) return }