|
@@ -10,6 +10,7 @@ use App\Http\Logic\Aside\Task\TaskLogic; |
|
@@ -10,6 +10,7 @@ use App\Http\Logic\Aside\Task\TaskLogic; |
|
10
|
use App\Http\Logic\Aside\Task\TaskOwnerLogic;
|
10
|
use App\Http\Logic\Aside\Task\TaskOwnerLogic;
|
|
11
|
use App\Http\Requests\Aside\Task\TaskFollowRequest;
|
11
|
use App\Http\Requests\Aside\Task\TaskFollowRequest;
|
|
12
|
use App\Http\Requests\Aside\Task\TaskRequest;
|
12
|
use App\Http\Requests\Aside\Task\TaskRequest;
|
|
|
|
13
|
+use App\Models\File\File;
|
|
13
|
use App\Models\Manage\Manage;
|
14
|
use App\Models\Manage\Manage;
|
|
14
|
use App\Models\Project\Project;
|
15
|
use App\Models\Project\Project;
|
|
15
|
use App\Models\Task\Task;
|
16
|
use App\Models\Task\Task;
|
|
@@ -63,12 +64,35 @@ class TaskController extends BaseController |
|
@@ -63,12 +64,35 @@ class TaskController extends BaseController |
|
63
|
public function getTaskList(&$task,$ids){
|
64
|
public function getTaskList(&$task,$ids){
|
|
64
|
$lists = $task->list(['id'=>['in',$ids]]);
|
65
|
$lists = $task->list(['id'=>['in',$ids]]);
|
|
65
|
foreach ($lists as $k => $v){
|
66
|
foreach ($lists as $k => $v){
|
|
66
|
- $v['attachment'] = url('a/download_files?hash='.$v['attachment']);
|
67
|
+ $v = $this->getFileUrl($v);
|
|
67
|
$lists[$k] = $v;
|
68
|
$lists[$k] = $v;
|
|
68
|
}
|
69
|
}
|
|
69
|
return $lists;
|
70
|
return $lists;
|
|
70
|
}
|
71
|
}
|
|
71
|
|
72
|
|
|
|
|
73
|
+ /**
|
|
|
|
74
|
+ * @remark :处理文件
|
|
|
|
75
|
+ * @name :getFileUrl
|
|
|
|
76
|
+ * @author :lyh
|
|
|
|
77
|
+ * @method :post
|
|
|
|
78
|
+ * @time :2023/8/23 16:15
|
|
|
|
79
|
+ */
|
|
|
|
80
|
+ public function getFileUrl(&$v){
|
|
|
|
81
|
+ $fileModel = new File();
|
|
|
|
82
|
+ $file_info = $fileModel->read(['hash'=>$v['attachment']]);
|
|
|
|
83
|
+ if($file_info !== false){
|
|
|
|
84
|
+ $v['attachment_name'] = basename($file_info['path']);
|
|
|
|
85
|
+ if($file_info['is_cos'] == 1){
|
|
|
|
86
|
+ $cos = config('filesystems.disks.cos');
|
|
|
|
87
|
+ $cosCdn = $cos['cdn'];
|
|
|
|
88
|
+ $v['attachment'] = $cosCdn.$file_info['path'];
|
|
|
|
89
|
+ }else{
|
|
|
|
90
|
+ $v['attachment'] = url('a/download_files?hash='.$v['attachment']);
|
|
|
|
91
|
+ }
|
|
|
|
92
|
+ }
|
|
|
|
93
|
+ return $v;
|
|
|
|
94
|
+ }
|
|
|
|
95
|
+
|
|
72
|
public function items(Request $request, TaskLogic $logic)
|
96
|
public function items(Request $request, TaskLogic $logic)
|
|
73
|
{
|
97
|
{
|
|
74
|
$request->validate([
|
98
|
$request->validate([
|
