周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 7c9081f455bc447f1699595962a7a218d0f26ed4 1 个父辈 831677de

update

内嵌 并排对比
正在显示 4 个修改的文件 包含 68 行增加 和 7 行删除
... ... @@ -594,7 +594,7 @@ class ProjectUpdate extends Command
if ($source == RouteMap::SOURCE_NEWS) {
$route_map->path = RouteMap::SOURCE_NEWS;
} elseif ($source == RouteMap::SOURCE_BLOG) {
$route_map->path = RouteMap::SOURCE_BLOG;
$route_map->path = RouteMap::SOURCE_BLOG.'s';
}
$route_map->save();
... ...
... ... @@ -249,7 +249,12 @@ class BlogLogic extends BaseLogic
*/
public function importBlog($project_id, $user_id, $data)
{
$blog = $this->model->read(['name' => $data[0]]);
$route = $data[1]??'';//自定义路由
if($route){
$blog = $this->model->read(['url' => $route]);
}else{
$blog = $this->model->read(['name' => $data[0]]);
}
if (!$blog) {
$category_id = '';
... ... @@ -303,7 +308,22 @@ class BlogLogic extends BaseLogic
]
);
//更新路由
$route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_BLOG, $id, $project_id);
if($route){
$route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_BLOG)->where('source_id', $id)->first();
if (!$route_map) {
$route_map = new RouteMap();
$route_map->project_id = $project_id;
$route_map->path = RouteMap::SOURCE_BLOG.'s';
$route_map->source = RouteMap::SOURCE_BLOG;
$route_map->source_id = $id;
$route_map->route = $route;
$route_map->save();
}
}else{
$route = RouteMap::setRoute($data[0], RouteMap::SOURCE_BLOG, $id, $project_id);
}
$this->edit(['url' => $route], ['id' => $id]);
return true;
... ...
... ... @@ -283,7 +283,12 @@ class NewsLogic extends BaseLogic
*/
public function importNews($project_id, $user_id, $data)
{
$news = $this->model->read(['name' => $data[0]]);
$route = $data[1]??'';//自定义路由
if($route){
$news = $this->model->read(['url' => $route]);
}else{
$news = $this->model->read(['name' => $data[0]]);
}
if (!$news) {
$category_id = '';
... ... @@ -337,7 +342,22 @@ class NewsLogic extends BaseLogic
]
);
//更新路由
$route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
if($route){
$route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_NEWS)->where('source_id', $id)->first();
if (!$route_map) {
$route_map = new RouteMap();
$route_map->project_id = $project_id;
$route_map->path = RouteMap::SOURCE_NEWS;
$route_map->source = RouteMap::SOURCE_NEWS;
$route_map->source_id = $id;
$route_map->route = $route;
$route_map->save();
}
}else{
$route = RouteMap::setRoute($data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
}
$this->edit(['url' => $route], ['id' => $id]);
return true;
... ...
... ... @@ -596,7 +596,13 @@ class ProductLogic extends BaseLogic
*/
public function importProduct($project_id, $user_id, $data)
{
$product = $this->model->read(['title' => $data[0]]);
$route = $data[1]??'';//自定义路由
if($route){
$product = $this->model->read(['route' => $route]);
}else{
$product = $this->model->read(['title' => $data[0]]);
}
if (!$product) {
$category_id = '';
... ... @@ -729,8 +735,23 @@ class ProductLogic extends BaseLogic
'status' => Product::STATUS_ON
]
);
//更新路由
$route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
if($route){
$route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT)->where('source_id', $id)->first();
if (!$route_map) {
$route_map = new RouteMap();
$route_map->project_id = $project_id;
$route_map->source = RouteMap::SOURCE_PRODUCT;
$route_map->source_id = $id;
$route_map->route = $route;
$route_map->save();
}
}else{
$route = RouteMap::setRoute($data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
}
$this->edit(['route' => $route], ['id' => $id]);
return true;
... ...