Merge pull request #313 from hantmac/develop

bug fix
This commit is contained in:
Marvin Zhang
2019-11-24 11:34:50 +08:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -102,7 +102,7 @@ func NewRedisPool() *redis.Pool {
return redis.DialURL(url,
redis.DialConnectTimeout(time.Second*10),
redis.DialReadTimeout(time.Second*10),
redis.DialWriteTimeout(time.Second*10),
redis.DialWriteTimeout(time.Second*15),
)
},
TestOnBorrow: func(c redis.Conn, t time.Time) error {

View File

@@ -36,7 +36,7 @@ func GetTaskList(c *gin.Context) {
data.PageNum = 1
}
if data.PageSize == 0 {
data.PageNum = 10
data.PageSize = 10
}
// 过滤条件