合并分支 'akun' 到 'master'

update



查看合并请求 !73

@@ -140,7 +140,7 @@ class ProjectUpdate extends Command
                                                 'seo_keywords' => $item['seo_keywords'] ?? '',
                                                 'seo_keywords' => $item['seo_keywords'] ?? '',
                                                 'seo_description' => $item['seo_description'] ?? '',
                                                 'seo_description' => $item['seo_description'] ?? '',
                                             ]);
                                             ]);
-                                            $route = RouteMap::setRoute($this->get_url_route($item['url']) ?: $item['name'], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $project_id);
+                                            $route = $this->set_map($this->get_url_route($item['url']), RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $project_id);
                                             $model->edit(['route' => $route], ['id' => $id]);
                                             $model->edit(['route' => $route], ['id' => $id]);
                                         } 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;
@@ -273,7 +273,7 @@ class ProjectUpdate extends Command
                                                 ]),
                                                 ]),
                                                 'status' => Product::STATUS_ON
                                                 'status' => Product::STATUS_ON
                                             ]);
                                             ]);
-                                            $route = RouteMap::setRoute($this->get_url_route($item['url']) ?: $item['ttile'], RouteMap::SOURCE_PRODUCT, $id, $project_id);
+                                            $route = $this->set_map($this->get_url_route($item['url']), RouteMap::SOURCE_PRODUCT, $id, $project_id);
                                             $model->edit(['route' => $route], ['id' => $id]);
                                             $model->edit(['route' => $route], ['id' => $id]);
                                         } 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;
@@ -328,7 +328,7 @@ class ProjectUpdate extends Command
                                                 'image' => $item['images'][0] ?? '',
                                                 'image' => $item['images'][0] ?? '',
                                                 'status' => $api_type == 'news' ? News::STATUS_ONE : Blog::STATUS_ONE
                                                 'status' => $api_type == 'news' ? News::STATUS_ONE : Blog::STATUS_ONE
                                             ]);
                                             ]);
-                                            $route = RouteMap::setRoute($this->get_url_route($item['url']) ?: $item['ttile'], $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $project_id);
+                                            $route = $this->set_map($this->get_url_route($item['url']), $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $project_id);
                                             $model->edit(['url' => $route], ['id' => $id]);
                                             $model->edit(['url' => $route], ['id' => $id]);
                                         } 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;
@@ -377,7 +377,7 @@ class ProjectUpdate extends Command
                                                 'html' => $item['content'] ?? '',
                                                 'html' => $item['content'] ?? '',
                                                 'status' => 1
                                                 'status' => 1
                                             ]);
                                             ]);
-                                            $route = RouteMap::setRoute($this->get_url_route($item['url']) ?: $item['ttile'], RouteMap::SOURCE_PAGE, $id, $project_id);
+                                            $route = $this->set_map($this->get_url_route($item['url']), RouteMap::SOURCE_PAGE, $id, $project_id);
                                             $model->edit(['url' => $route], ['id' => $id]);
                                             $model->edit(['url' => $route], ['id' => $id]);
                                         } 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;
@@ -465,7 +465,7 @@ class ProjectUpdate extends Command
                             'keywords' => $item['keywords'] ?? '',
                             'keywords' => $item['keywords'] ?? '',
                             'describe' => $item['description'] ?? ''
                             'describe' => $item['description'] ?? ''
                         ]);
                         ]);
-                        $route = RouteMap::setRoute($this->get_url_route($item['url']) ?: $item['name'], RouteMap::SOURCE_PRODUCT_CATE, $parent_id, $project_id);
+                        $route = $this->set_map($this->get_url_route($item['url']), RouteMap::SOURCE_PRODUCT_CATE, $parent_id, $project_id);
                         $model->edit(['route' => $route], ['id' => $parent_id]);
                         $model->edit(['route' => $route], ['id' => $parent_id]);
                     } catch (\Exception $e) {
                     } catch (\Exception $e) {
                         echo 'date:' . date('Y-m-d H:i:s') . ', category_insert error: ' . $e->getMessage() . PHP_EOL;
                         echo 'date:' . date('Y-m-d H:i:s') . ', category_insert error: ' . $e->getMessage() . PHP_EOL;
@@ -516,4 +516,28 @@ class ProjectUpdate extends Command
 
 
         return $str;
         return $str;
     }
     }
+
+    //路由入库
+    protected function set_map($route, $source, $source_id, $project_id)
+    {
+        if (empty($route)) {
+            return '';
+        }
+
+        $route_map = new RouteMap();
+        $route_map->project_id = $project_id;
+        $route_map->source = $source;
+        $route_map->source_id = $source_id;
+        $route_map->route = $route;
+
+        if ($source == RouteMap::SOURCE_NEWS) {
+            $route_map->path = RouteMap::SOURCE_NEWS;
+        } elseif ($source == RouteMap::SOURCE_BLOG) {
+            $route_map->path = RouteMap::SOURCE_BLOG;
+        }
+
+        $route_map->save();
+
+        return $route;
+    }
 }
 }