Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator

internal/logic/xjlab/pagelisttasklogic.go

@@ -2,6 +2,7 @@ package xjlab
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
@@ -127,7 +128,12 @@ func (l *PageListTaskLogic) buildBaseQuery(req *types.XJLABTaskReq) *gorm.DB {
 
 	// 任务状态筛选
 	if req.Status != "" {
-		db = db.Where("status = ?", req.Status)
+		split := strings.Split(req.Status, ",")
+		if len(split) > 1 {
+			db = db.Where("status IN ?", split)
+		} else {
+			db = db.Where("status = ?", req.Status)
+		}
 	}
 
 	// 时间范围筛选

internal/participant/client.go

@@ -18,7 +18,7 @@ var (
 	HttpClient       *http.Client
 )
 var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
-var DefaultTimeout = time.Second * 300
+var DefaultTimeout = time.Hour * 1
 
 func InitClient() {
 	NoRedirectClient = resty.New().SetRedirectPolicy(