gx

@@ -10,6 +10,7 @@ use App\Http\Logic\Aside\Task\TaskLogic;
 use App\Http\Logic\Aside\Task\TaskOwnerLogic;
 use App\Http\Requests\Aside\Task\TaskFollowRequest;
 use App\Http\Requests\Aside\Task\TaskRequest;
+use App\Models\File\File;
 use App\Models\Manage\Manage;
 use App\Models\Project\Project;
 use App\Models\Task\Task;
@@ -63,12 +64,35 @@ class TaskController extends BaseController
     public function getTaskList(&$task,$ids){
         $lists = $task->list(['id'=>['in',$ids]]);
         foreach ($lists as $k => $v){
-            $v['attachment'] = url('a/download_files?hash='.$v['attachment']);
+            $v = $this->getFileUrl($v);
             $lists[$k] = $v;
         }
         return $lists;
     }
 
+    /**
+     * @remark :处理文件
+     * @name   :getFileUrl
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/23 16:15
+     */
+    public function getFileUrl(&$v){
+        $fileModel = new File();
+        $file_info = $fileModel->read(['hash'=>$v['attachment']]);
+        if($file_info !== false){
+            $v['attachment_name'] = basename($file_info['path']);
+            if($file_info['is_cos'] == 1){
+                $cos = config('filesystems.disks.cos');
+                $cosCdn = $cos['cdn'];
+                $v['attachment'] = $cosCdn.$file_info['path'];
+            }else{
+                $v['attachment'] = url('a/download_files?hash='.$v['attachment']);
+            }
+        }
+        return $v;
+    }
+
     public function items(Request $request, TaskLogic $logic)
     {
         $request->validate([

@@ -281,11 +281,9 @@ class FileController
      * @time   :2023/7/20 16:46
      */
     public function getFileUrl(&$fileModel,$hash){
-
         $info = $fileModel->read(['hash'=>$hash]);
         if($info['is_cos'] == 1){
-            $cos = new CosService();
-            $url = $cos->getImageUrl($info['path']);
+            $url = getFileUrl($info['hash']);
         }else{
             $url = url('a/file/'.$info['hash']);
         }