From 58856612e2c1e7ee3013dc7b89fe11ed08bca5d2 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Sat, 9 May 2020 10:35:18 +0800 Subject: [PATCH 1/3] Feat: create empty file in web panel (#305) --- assets | 2 +- routers/controllers/file.go | 11 +++++++++++ routers/router.go | 2 ++ service/explorer/file.go | 38 ++++++++++++++++++++++++++++++++++++- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/assets b/assets index 6d23b07b..538bd95a 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 6d23b07b7ae655d1ecba23c21a0482950587b4f0 +Subproject commit 538bd95a7ba1712bf8b079375d1aa419d803273a diff --git a/routers/controllers/file.go b/routers/controllers/file.go index c7bb701b..92fdf4bf 100644 --- a/routers/controllers/file.go +++ b/routers/controllers/file.go @@ -353,3 +353,14 @@ func SearchFile(c *gin.Context) { c.JSON(200, ErrorResponse(err)) } } + +// CreateFile 创建空白文件 +func CreateFile(c *gin.Context) { + var service explorer.SingleFileService + if err := c.ShouldBindJSON(&service); err == nil { + res := service.Create(c) + c.JSON(200, res) + } else { + c.JSON(200, ErrorResponse(err)) + } +} diff --git a/routers/router.go b/routers/router.go index 9e824cf2..ad0da4b4 100644 --- a/routers/router.go +++ b/routers/router.go @@ -445,6 +445,8 @@ func InitMasterRouter() *gin.Engine { file.GET("upload/credential", controllers.GetUploadCredential) // 更新文件 file.PUT("update/:id", controllers.PutContent) + // 创建空白文件 + file.POST("create", controllers.CreateFile) // 创建文件下载会话 file.PUT("download/:id", controllers.CreateDownloadSession) // 预览文件 diff --git a/service/explorer/file.go b/service/explorer/file.go index 507b49c1..164fbfea 100644 --- a/service/explorer/file.go +++ b/service/explorer/file.go @@ -13,15 +13,18 @@ import ( "github.com/HFO4/cloudreve/pkg/serializer" "github.com/gin-gonic/gin" "github.com/jinzhu/gorm" + "io/ioutil" "net/http" "net/url" + "path" "strconv" + "strings" "time" ) // SingleFileService 对单文件进行操作的五福，path为文件完整路径 type SingleFileService struct { - Path string `uri:"path" binding:"required,min=1,max=65535"` + Path string `uri:"path" json:"path" binding:"required,min=1,max=65535"` } // FileIDService 通过文件ID对文件进行操作的服务 @@ -62,6 +65,39 @@ type SlaveListService struct { Recursive bool `json:"recursive"` } +// New 创建新文件 +func (service *SingleFileService) Create(c *gin.Context) serializer.Response { + // 创建文件系统 + fs, err := filesystem.NewFileSystemFromContext(c) + if err != nil { + return serializer.Err(serializer.CodePolicyNotAllowed, err.Error(), err) + } + defer fs.Recycle() + + // 上下文 + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + // 给文件系统分配钩子 + fs.Use("BeforeUpload", filesystem.HookValidateFile) + fs.Use("AfterUpload", filesystem.GenericAfterUpload) + + // 上传空文件 + err = fs.Upload(ctx, local.FileStream{ + File: ioutil.NopCloser(strings.NewReader("")), + Size: 0, + VirtualPath: path.Dir(service.Path), + Name: path.Base(service.Path), + }) + if err != nil { + return serializer.Err(serializer.CodeUploadFailed, err.Error(), err) + } + + return serializer.Response{ + Code: 0, + } +} + // List 列出从机上的文件 func (service *SlaveListService) List(c *gin.Context) serializer.Response { // 创建文件系统 From 1172765c580ed680ef1efa4e00925fb6e93b90af Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Mon, 11 May 2020 09:29:19 +0800 Subject: [PATCH 2/3] Feat: option for using SSL connection in mail queue --- assets | 2 +- models/migration.go | 1 + pkg/conf/version.go | 2 +- pkg/email/init.go | 18 ++++++++++-------- pkg/email/smtp.go | 7 ++++++- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/assets b/assets index 538bd95a..0e8e26e4 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 538bd95a7ba1712bf8b079375d1aa419d803273a +Subproject commit 0e8e26e4dee4100dcff1089f83fc34fe165de65a diff --git a/models/migration.go b/models/migration.go index e40f283e..b50041ef 100644 --- a/models/migration.go +++ b/models/migration.go @@ -90,6 +90,7 @@ func addDefaultSettings() { {Name: "replyTo", Value: `abslant@126.com`, Type: "mail"}, {Name: "smtpUser", Value: `no-reply@acg.blue`, Type: "mail"}, {Name: "smtpPass", Value: ``, Type: "mail"}, + {Name: "smtpEncryption", Value: `0`, Type: "mail"}, {Name: "maxEditSize", Value: `4194304`, Type: "file_edit"}, {Name: "archive_timeout", Value: `60`, Type: "timeout"}, {Name: "download_timeout", Value: `60`, Type: "timeout"}, diff --git a/pkg/conf/version.go b/pkg/conf/version.go index 953ad086..280ed728 100644 --- a/pkg/conf/version.go +++ b/pkg/conf/version.go @@ -4,7 +4,7 @@ package conf var BackendVersion = "3.0.0-beta1" // RequiredDBVersion 与当前版本匹配的数据库版本 -var RequiredDBVersion = "3.0.0" +var RequiredDBVersion = "3.0.0-33-g5885661" // RequiredStaticVersion 与当前版本匹配的静态资源版本 var RequiredStaticVersion = "3.0.0" diff --git a/pkg/email/init.go b/pkg/email/init.go index c90a4cf2..65abd756 100644 --- a/pkg/email/init.go +++ b/pkg/email/init.go @@ -30,19 +30,21 @@ func Init() { "replyTo", "smtpUser", "smtpPass", + "smtpEncryption", ) port := model.GetIntSetting("smtpPort", 25) keepAlive := model.GetIntSetting("mail_keepalive", 30) client := NewSMTPClient(SMTPConfig{ - Name: options["fromName"], - Address: options["fromAdress"], - ReplyTo: options["replyTo"], - Host: options["smtpHost"], - Port: port, - User: options["smtpUser"], - Password: options["smtpPass"], - Keepalive: keepAlive, + Name: options["fromName"], + Address: options["fromAdress"], + ReplyTo: options["replyTo"], + Host: options["smtpHost"], + Port: port, + User: options["smtpUser"], + Password: options["smtpPass"], + Keepalive: keepAlive, + Encryption: model.IsTrueVal(options["smtpEncryption"]), }) Client = client diff --git a/pkg/email/smtp.go b/pkg/email/smtp.go index 0da10332..26946acc 100644 --- a/pkg/email/smtp.go +++ b/pkg/email/smtp.go @@ -22,7 +22,7 @@ type SMTPConfig struct { Port int // 服务器端口 User string // 用户名 Password string // 密码 - Encryption string // 是否启用加密 + Encryption bool // 是否启用加密 Keepalive int // SMTP 连接保留时长 } @@ -77,6 +77,11 @@ func (client *SMTP) Init() { d.Timeout = time.Duration(client.Config.Keepalive+5) * time.Second client.chOpen = true + // 是否启用 SSL + if client.Config.Encryption { + d.SSL = true + } + var s mail.SendCloser var err error open := false From 280308bc05afb6b04cae2361d0f78690e7b65e91 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Wed, 13 May 2020 09:09:11 +0800 Subject: [PATCH 3/3] Modify: increase OneDrive client uploading chunk size to 100MB --- assets | 2 +- pkg/filesystem/driver/onedrive/api.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets b/assets index 0e8e26e4..63ee122d 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 0e8e26e4dee4100dcff1089f83fc34fe165de65a +Subproject commit 63ee122d977284e3ccf20f4c1ed228584e705c4d diff --git a/pkg/filesystem/driver/onedrive/api.go b/pkg/filesystem/driver/onedrive/api.go index 989e2395..51d69a10 100644 --- a/pkg/filesystem/driver/onedrive/api.go +++ b/pkg/filesystem/driver/onedrive/api.go @@ -24,7 +24,7 @@ import ( const ( // SmallFileSize 单文件上传接口最大尺寸 SmallFileSize uint64 = 4 * 1024 * 1024 - // ChunkSize 分片上传分片大小 + // ChunkSize 服务端中转分片上传分片大小 ChunkSize uint64 = 10 * 1024 * 1024 // ListRetry 列取请求重试次数 ListRetry = 1