From 6ce7119c143f7525b66c5331d7260d72d20d1e9a Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 15 Jun 2022 15:18:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=93=E5=AD=98=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1Key=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/http_cache_task_key_model_ext.go | 19 +++++++++++++++++++ .../rpc/services/service_http_cache_task.go | 2 ++ 2 files changed, 21 insertions(+) diff --git a/internal/db/models/http_cache_task_key_model_ext.go b/internal/db/models/http_cache_task_key_model_ext.go index 2640e7f9..0e32bd1d 100644 --- a/internal/db/models/http_cache_task_key_model_ext.go +++ b/internal/db/models/http_cache_task_key_model_ext.go @@ -1 +1,20 @@ package models + +import "encoding/json" + +// DecodeNodes 解析已完成节点信息 +func (this *HTTPCacheTaskKey) DecodeNodes() map[string]bool { + var result = map[string]bool{} + var nodesJSON = this.Nodes + if IsNull(nodesJSON) { + return result + } + + err := json.Unmarshal(nodesJSON, &result) + if err != nil { + // ignore error + return result + } + + return result +} diff --git a/internal/rpc/services/service_http_cache_task.go b/internal/rpc/services/service_http_cache_task.go index bea25fdc..225afdde 100644 --- a/internal/rpc/services/service_http_cache_task.go +++ b/internal/rpc/services/service_http_cache_task.go @@ -306,12 +306,14 @@ func (this *HTTPCacheTaskService) FindEnabledHTTPCacheTask(ctx context.Context, } var pbKeys = []*pb.HTTPCacheTaskKey{} for _, key := range keys { + pbKeys = append(pbKeys, &pb.HTTPCacheTaskKey{ Id: int64(key.Id), TaskId: int64(key.TaskId), Key: key.Key, KeyType: key.KeyType, IsDone: key.IsDone, + IsDoing: !key.IsDone && len(key.DecodeNodes()) > 0, ErrorsJSON: key.Errors, }) }