Merge branch 'raccount' of 39.97.239.116:gyfl/xyzshop into raccount

helper/task/manager.php

@@ -32,12 +32,15 @@ class manager
         $mod_task = Model('task');
         $item = $mod_task->getByHash($task_hash);
         $cut_time = time();
-        if(!empty($item) && $del_timeout != -1) {
+
+        if(!empty($item) && $del_timeout > 0)
+        {
             if($cut_time - $item['add_time'] > $del_timeout) {
-                $mod_task->where(['task_hash' => $task_hash])->delete();
+                $mod_task->where(['task_id' => $item['task_id']])->delete();
                 $item = [];
             }
         }
+
         if(empty($item))
         {
             $item = ['type' => $method, 'title' => $title,