合并分支 'akun' 到 'master'

Akun



查看合并请求 !810

@@ -397,29 +397,53 @@ class ProjectUpdate extends Command
                                                         $ve = '';
                                                         $ve = '';
                                                     }
                                                     }
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     $extend = $extend_model->read(['title' => $ke]);
-                                                    if (!$extend) {
-                                                        $extend_key = $this->get_extend_key($extend_model);
-                                                        $extend_model->add([
-                                                            'project_id' => $project_id,
-                                                            'title' => $ke,
-                                                            'type' => 1,
-                                                            'key' => $extend_key
-                                                        ]);
+
+                                                    if ($extend) {
+                                                        if ($extend['type'] == 3) {
+                                                            //图片
+                                                            $gallery = [];
+                                                            if (is_array($ve)) {
+                                                                foreach ($ve as $ve_img) {
+                                                                    $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve_img, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)];
+                                                                }
+                                                            } else {
+                                                                $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)];
+                                                            }
+                                                            $value = Arr::a2s($gallery);
+                                                        } elseif ($extend['type'] == 4) {
+                                                            //文件
+                                                            if (is_array($ve)) {
+                                                                if (isset($ve['title']) || isset($ve['url'])) {
+                                                                    $file = [
+                                                                        [
+                                                                            'name' => isset($ve['title']) ? $ve['title'] : '',
+                                                                            'url' => isset($ve['url']) ? $this->source_download($ve['url'], $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1) : ''
+                                                                        ]
+                                                                    ];
                                                                 } else {
                                                                 } else {
-                                                        $extend_key = $extend['key'];
+                                                                    $file = [];
+                                                                }
+                                                                $value = Arr::a2s($file);
+                                                            } else {
+                                                                $value = Arr::a2s([$this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)]);
+                                                            }
+                                                        } else {
+                                                            //文本
+                                                            $value = $ve;
                                                         }
                                                         }
 
 
-                                                    $extend_info = $extend_info_model->read(['key' => $extend_key, 'product_id' => $id]);
+                                                        $extend_info = $extend_info_model->read(['key' => $extend['key'], 'product_id' => $id]);
                                                         if (!$extend_info) {
                                                         if (!$extend_info) {
                                                             $extend_info_model->add([
                                                             $extend_info_model->add([
-                                                            'key' => $extend_key,
+                                                                'key' => $extend['key'],
+                                                                'type' => $extend['type'],
                                                                 'project_id' => $project_id,
                                                                 'project_id' => $project_id,
                                                                 'product_id' => $id,
                                                                 'product_id' => $id,
-                                                            'values' => $ve,
-                                                            'type' => 1
+                                                                'values' => $value,
                                                             ]);
                                                             ]);
                                                         } else {
                                                         } else {
-                                                        $extend_info_model->edit(['values' => $ve], ['key' => $extend_key, 'product_id' => $id]);
+                                                            $extend_info_model->edit(['type' => $extend['type'], 'values' => $value], ['key' => $extend['key'], 'product_id' => $id]);
+                                                        }
                                                     }
                                                     }
                                                 }
                                                 }
                                             }
                                             }
@@ -712,6 +736,9 @@ class ProjectUpdate extends Command
                                             if ($six_read) {
                                             if ($six_read) {
                                                 if ($item['extend'] ?? []) {
                                                 if ($item['extend'] ?? []) {
                                                     foreach ($item['extend'] as $ke => $ve) {
                                                     foreach ($item['extend'] as $ke => $ve) {
+                                                        if ($ve == '--') {
+                                                            $ve = '';
+                                                        }
                                                         $extend = $extend_model->read(['title' => $ke]);
                                                         $extend = $extend_model->read(['title' => $ke]);
                                                         if ($extend) {
                                                         if ($extend) {
                                                             if ($extend['type'] == 3) {
                                                             if ($extend['type'] == 3) {
@@ -1064,8 +1091,8 @@ class ProjectUpdate extends Command
                     ]);
                     ]);
 
 
                     //同步到177
                     //同步到177
-                    $error_file = ErrorFile::where('path',$new_url)->first();
-                    if(!$error_file){
+                    $error_file = ErrorFile::where('path', $new_url)->first();
+                    if (!$error_file) {
                         $error_file = new ErrorFile();
                         $error_file = new ErrorFile();
                         $error_file->path = $new_url;
                         $error_file->path = $new_url;
                         $error_file->status = 0;
                         $error_file->status = 0;