合并分支 'akun' 到 'master'

Akun



查看合并请求 !708

@@ -707,25 +707,11 @@ class ProjectUpdate extends Command
                                             //扩展字段
                                             if ($six_read) {
                                                 if ($item['extend'] ?? []) {
-                                                    if($project_id == 1646){
-                                                        //特殊项目处理
-                                                        $extend_list = [];
-                                                        foreach ($item['extend'] as $k_e=>$v_e){
-                                                            if(empty($v_e)){
-                                                                continue;
-                                                            }
-
-                                                            foreach ($v_e as $k_e_e => $v_e_e){
-                                                                $extend_list[$k_e.'_'.$k_e_e] = $v_e_e;
-                                                            }
-                                                        }
-                                                    }else{
-                                                        $extend_list = $item['extend'];
-                                                    }
-                                                    foreach ($extend_list as $ke => $ve) {
+                                                    foreach ($item['extend'] as $ke => $ve) {
                                                         $extend = $extend_model->read(['title' => $ke]);
                                                         if ($extend) {
                                                             if ($extend['type'] == 3) {
+                                                                //图片
                                                                 $gallery = [];
                                                                 if (is_array($ve)) {
                                                                     foreach ($ve as $ve_img) {
@@ -736,8 +722,14 @@ class ProjectUpdate extends Command
                                                                 }
                                                                 $value = Arr::a2s($gallery);
                                                             } elseif ($extend['type'] == 4) {
-                                                                $value = Arr::a2s([$this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)]);
+                                                                //文件
+                                                                $file[] = [
+                                                                    'name' => $ve['title'],
+                                                                    'url' => $this->source_download($ve['url'], $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
+                                                                ];
+                                                                $value = Arr::a2s($file);
                                                             } else {
+                                                                //文本
                                                                 $value = $ve;
                                                             }