fix: 兼容redis密码验证。

This commit is contained in:
Mr. Lan 2020-09-19 00:58:03 +08:00
parent 0ac9150e59
commit 8608380d55
4 changed files with 8 additions and 11 deletions

View File

@ -221,8 +221,11 @@ func TaskDetails(c *gin.Context) {
) )
fileName = c.DefaultQuery("file_name", "") fileName = c.DefaultQuery("file_name", "")
if fileName == "" { if fileName == "" ||
app.Error(c, -1, errors.New("参数不正确请确认file_name参数是否存在"), "") strings.HasPrefix(fileName, ".") ||
strings.HasPrefix(fileName, "/") ||
strings.HasPrefix(fileName, "\\") {
app.Error(c, -1, errors.New("file_name参数不正确请确认"), "")
return return
} }

View File

@ -53,8 +53,7 @@ settings:
maxsize: 10240 maxsize: 10240
path: ./logs/ferry.log path: ./logs/ferry.log
redis: redis:
host: 127.0.0.1 url: redis://ferry123456@127.0.0.1:6379
port: 6379
ssl: ssl:
key: keystring key: keystring
pem: temp/pem.pem pem: temp/pem.pem

View File

@ -53,8 +53,7 @@ settings:
maxsize: 10240 maxsize: 10240
path: ./logs/ferry.log path: ./logs/ferry.log
redis: redis:
host: 127.0.0.1 url: redis://ferry123456@127.0.0.1:6379
port: 6379
ssl: ssl:
key: keystring key: keystring
pem: temp/pem.pem pem: temp/pem.pem

View File

@ -2,7 +2,6 @@ package worker
import ( import (
"ferry/pkg/logger" "ferry/pkg/logger"
"fmt"
"github.com/spf13/viper" "github.com/spf13/viper"
@ -23,10 +22,7 @@ func StartServer() {
func NewTaskCenter() (*machinery.Server, error) { func NewTaskCenter() (*machinery.Server, error) {
cnf := &taskConfig.Config{ cnf := &taskConfig.Config{
Broker: fmt.Sprintf("redis://%v:%v", Broker: viper.GetString("settings.redis.url"),
viper.GetString("settings.redis.host"),
viper.GetString("settings.redis.port"),
),
DefaultQueue: "ServerTasksQueue", DefaultQueue: "ServerTasksQueue",
ResultBackend: "eager", ResultBackend: "eager",
} }