From 8608380d55cf641715ff149f4b93045bd3fe97b2 Mon Sep 17 00:00:00 2001 From: "Mr. Lan" Date: Sat, 19 Sep 2020 00:58:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9redis=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E9=AA=8C=E8=AF=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/process/task.go | 7 +++++-- config/settings.dev.yml | 3 +-- config/settings.yml | 3 +-- pkg/task/worker/worker.go | 6 +----- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/apis/process/task.go b/apis/process/task.go index f753db7..07ab537 100644 --- a/apis/process/task.go +++ b/apis/process/task.go @@ -221,8 +221,11 @@ func TaskDetails(c *gin.Context) { ) fileName = c.DefaultQuery("file_name", "") - if fileName == "" { - app.Error(c, -1, errors.New("参数不正确，请确认file_name参数是否存在"), "") + if fileName == "" || + strings.HasPrefix(fileName, ".") || + strings.HasPrefix(fileName, "/") || + strings.HasPrefix(fileName, "\\") { + app.Error(c, -1, errors.New("file_name参数不正确，请确认"), "") return } diff --git a/config/settings.dev.yml b/config/settings.dev.yml index dbeeaf3..b85da5a 100644 --- a/config/settings.dev.yml +++ b/config/settings.dev.yml @@ -53,8 +53,7 @@ settings: maxsize: 10240 path: ./logs/ferry.log redis: - host: 127.0.0.1 - port: 6379 + url: redis://ferry123456@127.0.0.1:6379 ssl: key: keystring pem: temp/pem.pem diff --git a/config/settings.yml b/config/settings.yml index fc78ab8..97df582 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -53,8 +53,7 @@ settings: maxsize: 10240 path: ./logs/ferry.log redis: - host: 127.0.0.1 - port: 6379 + url: redis://ferry123456@127.0.0.1:6379 ssl: key: keystring pem: temp/pem.pem diff --git a/pkg/task/worker/worker.go b/pkg/task/worker/worker.go index 636b7e3..5ab7e8b 100644 --- a/pkg/task/worker/worker.go +++ b/pkg/task/worker/worker.go @@ -2,7 +2,6 @@ package worker import ( "ferry/pkg/logger" - "fmt" "github.com/spf13/viper" @@ -23,10 +22,7 @@ func StartServer() { func NewTaskCenter() (*machinery.Server, error) { cnf := &taskConfig.Config{ - Broker: fmt.Sprintf("redis://%v:%v", - viper.GetString("settings.redis.host"), - viper.GetString("settings.redis.port"), - ), + Broker: viper.GetString("settings.redis.url"), DefaultQueue: "ServerTasksQueue", ResultBackend: "eager", }