合并分支 'akun' 到 'master'

Akun



查看合并请求 !432

@@ -665,23 +665,24 @@ class ProjectUpdate extends Command
                                                 foreach ($item['extend'] as $ke => $ve) {
                                                 foreach ($item['extend'] as $ke => $ve) {
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     if ($extend) {
                                                     if ($extend) {
-                                                        $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
-                                                        if (!$extend_info) {
-                                                            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)];
-                                                                    }
-                                                                } else {
-                                                                    $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
+                                                        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)];
                                                                 }
                                                                 }
-                                                                $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)]);
                                                             } else {
                                                             } else {
-                                                                $value = $ve;
+                                                                $gallery[] = ['title' => '', 'description' => '', 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url)];
                                                             }
                                                             }
+                                                            $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)]);
+                                                        } else {
+                                                            $value = $ve;
+                                                        }
+
+                                                        $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
+                                                        if (!$extend_info) {
                                                             $extend_info_model->add([
                                                             $extend_info_model->add([
                                                                 'key' => $extend['key'],
                                                                 'key' => $extend['key'],
                                                                 'type' => $extend['type'],
                                                                 'type' => $extend['type'],
@@ -690,6 +691,8 @@ class ProjectUpdate extends Command
                                                                 'module_id' => $custom_info['id'],
                                                                 'module_id' => $custom_info['id'],
                                                                 'values' => $value,
                                                                 'values' => $value,
                                                             ]);
                                                             ]);
+                                                        } else {
+                                                            $extend_info_model->edit(['type' => $extend['type'], 'value' => $value], ['key' => $extend['key'], 'content_id' => $id]);
                                                         }
                                                         }
                                                     }
                                                     }
                                                 }
                                                 }