From 161c55c037d2b2ca4f9c745feeca1c6ba32abe56 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Wed, 15 Jul 2020 14:48:31 +0800 Subject: [PATCH] 'commit' --- .../PreviewController/PreviewController.go | 11 ++++++++--- dsSupport/CronTask/CleanPreviewFile.go | 10 ++++++++++ dsSupport/Utils/ObsUtil/ObsUtil.go | 1 - dsSupport/go.mod | 1 + dsSupport/go.sum | 2 ++ dsSupport/main.go | 16 ++++++++++++++++ 6 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 dsSupport/CronTask/CleanPreviewFile.go diff --git a/dsSupport/Business/Preview/PreviewController/PreviewController.go b/dsSupport/Business/Preview/PreviewController/PreviewController.go index 8cb70164..0a02a7b9 100644 --- a/dsSupport/Business/Preview/PreviewController/PreviewController.go +++ b/dsSupport/Business/Preview/PreviewController/PreviewController.go @@ -15,12 +15,17 @@ import ( func Routers(r *gin.RouterGroup) { rr := r.Group("/preview") //配置接口 - rr.GET("/preview", preview) + rr.GET("/previewOffice", previewOffice) return } -// http://127.0.0.1:9000/support/preview/preview -func preview(c *gin.Context) { +// http://127.0.0.1:9000/support/preview/previewOffice +/** +功能:提供Office系列文件的预览功能 +作者:黄海 +时间:2020-07-15 + */ +func previewOffice(c *gin.Context) { //本地物理路径 uEnc :=c.Query("p") uDec, err := base64.URLEncoding.DecodeString(uEnc) diff --git a/dsSupport/CronTask/CleanPreviewFile.go b/dsSupport/CronTask/CleanPreviewFile.go new file mode 100644 index 00000000..4701606c --- /dev/null +++ b/dsSupport/CronTask/CleanPreviewFile.go @@ -0,0 +1,10 @@ +package CronTask + +import ( + "fmt" + "time" +) + +func Task (){ + fmt.Println("hello world", time.Now()) +} \ No newline at end of file diff --git a/dsSupport/Utils/ObsUtil/ObsUtil.go b/dsSupport/Utils/ObsUtil/ObsUtil.go index e4d70f27..6ea50a04 100644 --- a/dsSupport/Utils/ObsUtil/ObsUtil.go +++ b/dsSupport/Utils/ObsUtil/ObsUtil.go @@ -122,7 +122,6 @@ func UploadFileMultiPart(key string,sourceFile string){ close(partChan) } } - completeMultipartUploadInput := &obs.CompleteMultipartUploadInput{} completeMultipartUploadInput.Bucket = ConfigUtil.Bucket completeMultipartUploadInput.Key = key diff --git a/dsSupport/go.mod b/dsSupport/go.mod index 6148b620..f859cc42 100644 --- a/dsSupport/go.mod +++ b/dsSupport/go.mod @@ -9,6 +9,7 @@ require ( github.com/json-iterator/go v1.1.10 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/robfig/cron/v3 v3.0.0 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect google.golang.org/protobuf v1.25.0 // indirect gopkg.in/ini.v1 v1.57.0 diff --git a/dsSupport/go.sum b/dsSupport/go.sum index 5a24d2c8..d90cd535 100644 --- a/dsSupport/go.sum +++ b/dsSupport/go.sum @@ -57,6 +57,8 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E= +github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= diff --git a/dsSupport/main.go b/dsSupport/main.go index 9d820291..6bb358ea 100644 --- a/dsSupport/main.go +++ b/dsSupport/main.go @@ -1,8 +1,10 @@ package main import ( + "dsSupport/CronTask" "dsSupport/Router" "github.com/gin-gonic/gin" + "github.com/robfig/cron/v3" ) func main(){ @@ -14,6 +16,20 @@ func main(){ // http://127.0.0.1:9000/M3u8/B7/B7318F5D-46B8-4AA1-8811-1A9D65528E19/B7318F5D-46B8-4AA1-8811-1A9D65528E19.m3u8 //r.Static("/M3u8", "./Target") + //定时任务 + crontab:=cron.New(cron.WithSeconds()) //精确到秒 + + //定义定时器调用的任务函数 + task := func() { + CronTask.Task() + } + //定时任务 + spec := "0 0 */1 * * ?" //cron表达式,每1小时一次 + // 添加定时任务 + crontab.AddFunc(spec, task) + // 启动定时器 + crontab.Start() + // 指定地址和端口号 r.Run(":9000") }