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, }) }