合并分支 'akun' 到 'master'

Akun



查看合并请求 !111

@@ -272,7 +272,7 @@ class ProjectUpdate extends Command
                                         }
                                         }
                                         try {
                                         try {
                                             $item['ttile'] = $this->special2str($item['ttile'] ?? '');
                                             $item['ttile'] = $this->special2str($item['ttile'] ?? '');
-                                            $id = $model->addReturnId([
+                                            $id = $model->insertGetId([
                                                 'project_id' => $project_id,
                                                 'project_id' => $project_id,
                                                 'title' => $item['ttile'],
                                                 'title' => $item['ttile'],
                                                 'intro' => $item['description'] ?? '',
                                                 'intro' => $item['description'] ?? '',
@@ -286,6 +286,9 @@ class ProjectUpdate extends Command
                                                     'description' => $item['description'] ?? ''
                                                     'description' => $item['description'] ?? ''
                                                 ]),
                                                 ]),
                                                 'status' => Product::STATUS_ON,
                                                 'status' => Product::STATUS_ON,
+                                                'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
+                                                'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
+                                                'sort' => $item['sort'] ?? 0,
                                                 'is_upgrade' => 1,
                                                 'is_upgrade' => 1,
                                                 'route' => $route
                                                 'route' => $route
                                             ]);
                                             ]);
@@ -338,7 +341,7 @@ class ProjectUpdate extends Command
                                                 $image = $item['images'] ?? '';
                                                 $image = $item['images'] ?? '';
                                             }
                                             }
 
 
-                                            $id = $model->addReturnId([
+                                            $id = $model->insertGetId([
                                                 'project_id' => $project_id,
                                                 'project_id' => $project_id,
                                                 'name' => $item['ttile'],
                                                 'name' => $item['ttile'],
                                                 'seo_title' => $item['ttile'],
                                                 'seo_title' => $item['ttile'],
@@ -347,6 +350,9 @@ class ProjectUpdate extends Command
                                                 'text' => $item['content'] ?? '',
                                                 'text' => $item['content'] ?? '',
                                                 'image' => $this->source_download($image, $project_id, $domain_arr['host'], $web_url_domain, $home_url),
                                                 'image' => $this->source_download($image, $project_id, $domain_arr['host'], $web_url_domain, $home_url),
                                                 'status' => $api_type == 'news' ? News::STATUS_ONE : Blog::STATUS_ONE,
                                                 'status' => $api_type == 'news' ? News::STATUS_ONE : Blog::STATUS_ONE,
+                                                'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
+                                                'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
+                                                'sort' => $item['sort'] ?? 0,
                                                 'is_upgrade' => 1,
                                                 'is_upgrade' => 1,
                                                 'url' => $route
                                                 'url' => $route
                                             ]);
                                             ]);
@@ -388,7 +394,7 @@ class ProjectUpdate extends Command
                                     if (!$custom) {
                                     if (!$custom) {
                                         try {
                                         try {
                                             $item['ttile'] = $this->special2str($item['ttile'] ?? '');
                                             $item['ttile'] = $this->special2str($item['ttile'] ?? '');
-                                            $id = $model->addReturnId([
+                                            $id = $model->insertGetId([
                                                 'project_id' => $project_id,
                                                 'project_id' => $project_id,
                                                 'name' => $item['ttile'],
                                                 'name' => $item['ttile'],
                                                 'title' => $item['ttile'],
                                                 'title' => $item['ttile'],
@@ -396,6 +402,8 @@ class ProjectUpdate extends Command
                                                 'description' => $item['description'] ?? '',
                                                 'description' => $item['description'] ?? '',
                                                 'html' => $item['content'] ?? '',
                                                 'html' => $item['content'] ?? '',
                                                 'status' => 1,
                                                 'status' => 1,
+                                                'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
+                                                'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                 'is_upgrade' => 1,
                                                 'is_upgrade' => 1,
                                                 'url' => $route
                                                 'url' => $route
                                             ]);
                                             ]);