Merge remote-tracking branch 'origin/develop' into develop

backend/database/redis.go

@@ -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 {

backend/routes/task.go

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