周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 f5d6990d08179dd077b90365f28b62088cf8b9f3 2 个父辈 ba903a33 f578cd4c

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !203
内嵌 并排对比
正在显示 4 个修改的文件 包含 68 行增加 和 7 行删除
@@ -594,7 +594,7 @@ class ProjectUpdate extends Command @@ -594,7 +594,7 @@ class ProjectUpdate extends Command
594 if ($source == RouteMap::SOURCE_NEWS) { 594 if ($source == RouteMap::SOURCE_NEWS) {
595 $route_map->path = RouteMap::SOURCE_NEWS; 595 $route_map->path = RouteMap::SOURCE_NEWS;
596 } elseif ($source == RouteMap::SOURCE_BLOG) { 596 } elseif ($source == RouteMap::SOURCE_BLOG) {
597 - $route_map->path = RouteMap::SOURCE_BLOG; 597 + $route_map->path = RouteMap::SOURCE_BLOG.'s';
598 } 598 }
599 599
600 $route_map->save(); 600 $route_map->save();
@@ -249,7 +249,12 @@ class BlogLogic extends BaseLogic @@ -249,7 +249,12 @@ class BlogLogic extends BaseLogic
249 */ 249 */
250 public function importBlog($project_id, $user_id, $data) 250 public function importBlog($project_id, $user_id, $data)
251 { 251 {
252 - $blog = $this->model->read(['name' => $data[0]]); 252 + $route = $data[1]??'';//自定义路由
  253 + if($route){
  254 + $blog = $this->model->read(['url' => $route]);
  255 + }else{
  256 + $blog = $this->model->read(['name' => $data[0]]);
  257 + }
253 if (!$blog) { 258 if (!$blog) {
254 259
255 $category_id = ''; 260 $category_id = '';
@@ -303,7 +308,22 @@ class BlogLogic extends BaseLogic @@ -303,7 +308,22 @@ class BlogLogic extends BaseLogic
303 ] 308 ]
304 ); 309 );
305 //更新路由 310 //更新路由
306 - $route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_BLOG, $id, $project_id); 311 + if($route){
  312 + $route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_BLOG)->where('source_id', $id)->first();
  313 + if (!$route_map) {
  314 + $route_map = new RouteMap();
  315 + $route_map->project_id = $project_id;
  316 + $route_map->path = RouteMap::SOURCE_BLOG.'s';
  317 + $route_map->source = RouteMap::SOURCE_BLOG;
  318 + $route_map->source_id = $id;
  319 + $route_map->route = $route;
  320 +
  321 + $route_map->save();
  322 + }
  323 + }else{
  324 + $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_BLOG, $id, $project_id);
  325 + }
  326 +
307 $this->edit(['url' => $route], ['id' => $id]); 327 $this->edit(['url' => $route], ['id' => $id]);
308 328
309 return true; 329 return true;
@@ -283,7 +283,12 @@ class NewsLogic extends BaseLogic @@ -283,7 +283,12 @@ class NewsLogic extends BaseLogic
283 */ 283 */
284 public function importNews($project_id, $user_id, $data) 284 public function importNews($project_id, $user_id, $data)
285 { 285 {
286 - $news = $this->model->read(['name' => $data[0]]); 286 + $route = $data[1]??'';//自定义路由
  287 + if($route){
  288 + $news = $this->model->read(['url' => $route]);
  289 + }else{
  290 + $news = $this->model->read(['name' => $data[0]]);
  291 + }
287 if (!$news) { 292 if (!$news) {
288 293
289 $category_id = ''; 294 $category_id = '';
@@ -337,7 +342,22 @@ class NewsLogic extends BaseLogic @@ -337,7 +342,22 @@ class NewsLogic extends BaseLogic
337 ] 342 ]
338 ); 343 );
339 //更新路由 344 //更新路由
340 - $route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_NEWS, $id, $project_id); 345 + if($route){
  346 + $route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_NEWS)->where('source_id', $id)->first();
  347 + if (!$route_map) {
  348 + $route_map = new RouteMap();
  349 + $route_map->project_id = $project_id;
  350 + $route_map->path = RouteMap::SOURCE_NEWS;
  351 + $route_map->source = RouteMap::SOURCE_NEWS;
  352 + $route_map->source_id = $id;
  353 + $route_map->route = $route;
  354 +
  355 + $route_map->save();
  356 + }
  357 + }else{
  358 + $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
  359 + }
  360 +
341 $this->edit(['url' => $route], ['id' => $id]); 361 $this->edit(['url' => $route], ['id' => $id]);
342 362
343 return true; 363 return true;
@@ -596,7 +596,13 @@ class ProductLogic extends BaseLogic @@ -596,7 +596,13 @@ class ProductLogic extends BaseLogic
596 */ 596 */
597 public function importProduct($project_id, $user_id, $data) 597 public function importProduct($project_id, $user_id, $data)
598 { 598 {
599 - $product = $this->model->read(['title' => $data[0]]); 599 + $route = $data[1]??'';//自定义路由
  600 + if($route){
  601 + $product = $this->model->read(['route' => $route]);
  602 + }else{
  603 + $product = $this->model->read(['title' => $data[0]]);
  604 + }
  605 +
600 if (!$product) { 606 if (!$product) {
601 607
602 $category_id = ''; 608 $category_id = '';
@@ -729,8 +735,23 @@ class ProductLogic extends BaseLogic @@ -729,8 +735,23 @@ class ProductLogic extends BaseLogic
729 'status' => Product::STATUS_ON 735 'status' => Product::STATUS_ON
730 ] 736 ]
731 ); 737 );
  738 +
732 //更新路由 739 //更新路由
733 - $route = RouteMap::setRoute((isset($data[1]) && $data[1]) ? $data[1] : $data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id); 740 + if($route){
  741 + $route_map = RouteMap::where('project_id', $project_id)->where('source', RouteMap::SOURCE_PRODUCT)->where('source_id', $id)->first();
  742 + if (!$route_map) {
  743 + $route_map = new RouteMap();
  744 + $route_map->project_id = $project_id;
  745 + $route_map->source = RouteMap::SOURCE_PRODUCT;
  746 + $route_map->source_id = $id;
  747 + $route_map->route = $route;
  748 +
  749 + $route_map->save();
  750 + }
  751 + }else{
  752 + $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_PRODUCT, $id, $project_id);
  753 + }
  754 +
734 $this->edit(['route' => $route], ['id' => $id]); 755 $this->edit(['route' => $route], ['id' => $id]);
735 756
736 return true; 757 return true;