合并分支 'akun' 到 'master'

Akun



查看合并请求 !384

@@ -374,6 +374,8 @@ class ProjectUpdate extends Command
                                                         'values' => $ve,
                                                         'values' => $ve,
                                                         'type' => 1
                                                         'type' => 1
                                                     ]);
                                                     ]);
+                                                } else {
+                                                    $extend_info_model->edit(['values' => $ve], ['key' => $extend_key, 'product_id' => $id]);
                                                 }
                                                 }
                                             }
                                             }
                                         }
                                         }
@@ -464,10 +466,6 @@ class ProjectUpdate extends Command
                                                 'image' => $new_img,
                                                 'image' => $new_img,
                                                 'sort' => $item['sort'] ?? 0,
                                                 'sort' => $item['sort'] ?? 0,
                                             ], ['id' => $id]);
                                             ], ['id' => $id]);
-
-                                            if($project_id == 547){
-                                                CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
-                                            }
                                         }
                                         }
                                     } 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;
@@ -530,10 +528,6 @@ class ProjectUpdate extends Command
                                                 'description' => $item['description'] ?? '',
                                                 'description' => $item['description'] ?? '',
                                                 'html' => $item['content'] ?? '',
                                                 'html' => $item['content'] ?? '',
                                             ], ['id' => $id]);
                                             ], ['id' => $id]);
-
-                                            if($project_id == 547){
-                                                CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
-                                            }
                                         }
                                         }
                                     } 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;
@@ -593,7 +587,7 @@ class ProjectUpdate extends Command
                                                 $category_id = $category_custom['id'];
                                                 $category_id = $category_custom['id'];
                                             }
                                             }
                                         }
                                         }
-                                        if($category_id){
+                                        if ($category_id) {
                                             $category_id = ',' . $category_id . ',';
                                             $category_id = ',' . $category_id . ',';
                                         }
                                         }
                                         //图片
                                         //图片
@@ -633,10 +627,6 @@ class ProjectUpdate extends Command
                                                     'content' => $item['content'] ?? '',
                                                     'content' => $item['content'] ?? '',
                                                     'image' => $new_img
                                                     'image' => $new_img
                                                 ], ['id' => $id]);
                                                 ], ['id' => $id]);
-
-                                                if($project_id == 547){
-                                                    CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_MODULE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
-                                                }
                                             }
                                             }
 
 
                                             //扩展字段
                                             //扩展字段