合并分支 'akun' 到 'master'

Akun



查看合并请求 !367

@@ -585,6 +585,13 @@ class ProjectUpdate extends Command
                                                 $category_id = $category_custom['id'];
                                                 $category_id = $category_custom['id'];
                                             }
                                             }
                                         }
                                         }
+                                        //图片
+                                        if (is_array($item['images'] ?? '')) {
+                                            $image = $item['images'][0] ?? '';
+                                        } else {
+                                            $image = $item['images'] ?? '';
+                                        }
+                                        $new_img = $this->source_download($image, $project_id, $domain_arr['host'], $web_url_domain, $home_url);
                                         //名称去掉特殊符号
                                         //名称去掉特殊符号
                                         $item['title'] = $this->special2str($item['title'] ?? '');
                                         $item['title'] = $this->special2str($item['title'] ?? '');
 
 
@@ -597,6 +604,7 @@ class ProjectUpdate extends Command
                                                     'module_id' => $custom_info['id'],
                                                     'module_id' => $custom_info['id'],
                                                     'category_id' => $category_id,
                                                     'category_id' => $category_id,
                                                     'content' => $item['content'] ?? '',
                                                     'content' => $item['content'] ?? '',
+                                                    'image' => $new_img,
                                                     'created_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'created_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'updated_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'updated_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'is_upgrade' => 1,
                                                     'is_upgrade' => 1,
@@ -612,6 +620,7 @@ class ProjectUpdate extends Command
                                                     'name' => $item['title'],
                                                     'name' => $item['title'],
                                                     'category_id' => $category_id,
                                                     'category_id' => $category_id,
                                                     'content' => $item['content'] ?? '',
                                                     'content' => $item['content'] ?? '',
+                                                    'image' => $new_img
                                                 ], ['id' => $id]);
                                                 ], ['id' => $id]);
                                             }
                                             }
 
 
@@ -649,37 +658,6 @@ class ProjectUpdate extends Command
                                                     }
                                                     }
                                                 }
                                                 }
                                             }
                                             }
-//                                            if ($item['extend'] ?? []) {
-//                                                foreach (array_reverse($item['extend']) as $ke => $ve) {
-//                                                    $extend = $extend_model->read(['title' => $ke]);
-//                                                    if (!$extend) {
-//                                                        $extend_key = $this->get_extend_key($extend_model);
-//                                                        $extend_type = 1;
-//                                                        $extend_model->add([
-//                                                            'project_id' => $project_id,
-//                                                            'title' => $ke,
-//                                                            'type' => $extend_type,
-//                                                            'key' => $extend_key,
-//                                                            'module_id' => $custom_info['id']
-//                                                        ]);
-//                                                    } else {
-//                                                        $extend_key = $extend['key'];
-//                                                        $extend_type = $extend['type'];
-//                                                    }
-//
-//                                                    $extend_info = $extend_info_model->read(['key' => $extend_key, 'content_id' => $id]);
-//                                                    if (!$extend_info) {
-//                                                        $extend_info_model->add([
-//                                                            'key' => $extend_key,
-//                                                            'type' => $extend_type,
-//                                                            'project_id' => $project_id,
-//                                                            'content_id' => $id,
-//                                                            'module_id' => $custom_info['id'],
-//                                                            'values' => $ve,
-//                                                        ]);
-//                                                    }
-//                                                }
-//                                            }
                                         } catch (\Exception $e) {
                                         } catch (\Exception $e) {
                                             echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
                                             echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
                                             continue;
                                             continue;