Merge branch 'cloudreve:master' into s3policy

pull/831/head
Songtao 4 years ago
commit b853c00aed

@ -1 +1 @@
Subproject commit 08a301d53a39d0a67a2714caef9866c1eeaa4ee3 Subproject commit 997b73312aad0fd8caae91cd1fde386701ce37c0

@ -77,11 +77,12 @@ func (client *SMTP) Init() {
d := mail.NewDialer(client.Config.Host, client.Config.Port, client.Config.User, client.Config.Password) d := mail.NewDialer(client.Config.Host, client.Config.Port, client.Config.User, client.Config.Password)
d.Timeout = time.Duration(client.Config.Keepalive+5) * time.Second d.Timeout = time.Duration(client.Config.Keepalive+5) * time.Second
client.chOpen = true client.chOpen = true
// 是否启用 SSL // 是否启用 SSL
d.SSL = false
if client.Config.Encryption { if client.Config.Encryption {
d.SSL = true d.SSL = true
} }
d.StartTLSPolicy = mail.OpportunisticStartTLS
var s mail.SendCloser var s mail.SendCloser
var err error var err error

@ -105,9 +105,6 @@ func (handler Driver) List(ctx context.Context, base string, recursive bool) ([]
// Get 获取文件 // Get 获取文件
func (handler Driver) Get(ctx context.Context, path string) (response.RSCloser, error) { func (handler Driver) Get(ctx context.Context, path string) (response.RSCloser, error) {
// 给文件名加上随机参数以强制拉取
path = fmt.Sprintf("%s?v=%d", path, time.Now().UnixNano())
// 获取文件源地址 // 获取文件源地址
downloadURL, err := handler.Source( downloadURL, err := handler.Source(
ctx, ctx,

Loading…
Cancel
Save