周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 6161b03238fa240c9d764a4b56b1f09d538ac4dd 1 个父辈 5deb6485

gx

内嵌 并排对比
正在显示 6 个修改的文件 包含 11 行增加 和 8 行删除
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace App\Http\Logic\Bside\Blog; 3 namespace App\Http\Logic\Bside\Blog;
4 4
  5 +use App\Helper\Translate;
5 use App\Http\Logic\Bside\BaseLogic; 6 use App\Http\Logic\Bside\BaseLogic;
6 use App\Models\Blog\Blog as BlogModel; 7 use App\Models\Blog\Blog as BlogModel;
7 use App\Models\Blog\BlogCategory as BlogCategoryModel; 8 use App\Models\Blog\BlogCategory as BlogCategoryModel;
@@ -37,14 +38,17 @@ class BlogCategoryLogic extends BaseLogic @@ -37,14 +38,17 @@ class BlogCategoryLogic extends BaseLogic
37 $this->param['operator_id'] = $this->user['id']; 38 $this->param['operator_id'] = $this->user['id'];
38 $this->edit($this->param,['id'=>$this->param['id']]); 39 $this->edit($this->param,['id'=>$this->param['id']]);
39 }else{ 40 }else{
  41 + //路由拼接
  42 + if(!isset($this->param['alias']) || empty($this->param['alias'])){
  43 + $this->param['alias'] = Translate::tran($this->param['name'], 'en');
  44 + }
40 //拼接参数 45 //拼接参数
41 $this->param = $this->addParamProcessing($this->param); 46 $this->param = $this->addParamProcessing($this->param);
42 $id = $this->model->addReturnId($this->param); 47 $id = $this->model->addReturnId($this->param);
43 //处理子集 48 //处理子集
44 $this->addProcessingSon($id); 49 $this->addProcessingSon($id);
45 } 50 }
46 - $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],  
47 - RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']); 51 + $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
48 $this->edit(['alias'=>$route],['id'=>$id]); 52 $this->edit(['alias'=>$route],['id'=>$id]);
49 DB::commit(); 53 DB::commit();
50 }catch (\Exception $e){ 54 }catch (\Exception $e){
@@ -33,7 +33,6 @@ class BlogLogic extends BaseLogic @@ -33,7 +33,6 @@ class BlogLogic extends BaseLogic
33 DB::beginTransaction(); 33 DB::beginTransaction();
34 try { 34 try {
35 $this->param = $this->paramProcessing($this->param); 35 $this->param = $this->paramProcessing($this->param);
36 - $this->param['url'] = $this->param['url'].'-'.RouteMap::SOURCE_BLOG;  
37 if(isset($this->param['id']) && !empty($this->param['id'])){ 36 if(isset($this->param['id']) && !empty($this->param['id'])){
38 //是否更新路由 37 //是否更新路由
39 $id = $this->editNewsRoute($this->param['id'],$this->param['url']); 38 $id = $this->editNewsRoute($this->param['id'],$this->param['url']);
@@ -50,12 +50,15 @@ class NewsCategoryLogic extends BaseLogic @@ -50,12 +50,15 @@ class NewsCategoryLogic extends BaseLogic
50 $this->editHandleCategory($this->param['id'],$this->param['pid']); 50 $this->editHandleCategory($this->param['id'],$this->param['pid']);
51 $this->edit($this->param,['id'=>$this->param['id']]); 51 $this->edit($this->param,['id'=>$this->param['id']]);
52 }else{ 52 }else{
  53 + if(!isset($this->param['alias']) || empty($this->param['alias'])){
  54 + $this->param['alias'] = Translate::tran($this->param['name'], 'en');
  55 + }
53 $this->param = $this->addParamProcessing($this->param); 56 $this->param = $this->addParamProcessing($this->param);
54 $id = $this->model->addReturnId($this->param); 57 $id = $this->model->addReturnId($this->param);
55 //当父级分类拥有产品时，处理子集 58 //当父级分类拥有产品时，处理子集
56 $this->addProcessingSon($id); 59 $this->addProcessingSon($id);
57 } 60 }
58 - $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']); 61 + $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
59 $this->model->edit(['alias'=>$route],['id'=>$id]); 62 $this->model->edit(['alias'=>$route],['id'=>$id]);
60 DB::commit(); 63 DB::commit();
61 }catch (\Exception $e){ 64 }catch (\Exception $e){
@@ -62,7 +62,6 @@ class NewsLogic extends BaseLogic @@ -62,7 +62,6 @@ class NewsLogic extends BaseLogic
62 DB::beginTransaction(); 62 DB::beginTransaction();
63 try { 63 try {
64 $this->param = $this->paramProcessing($this->param); 64 $this->param = $this->paramProcessing($this->param);
65 - $this->param['url'] = $this->param['url'].'-'.RouteMap::SOURCE_NEWS;  
66 if (isset($this->param['id']) && !empty($this->param['id'])) { 65 if (isset($this->param['id']) && !empty($this->param['id'])) {
67 //是否更新路由 66 //是否更新路由
68 $id = $this->editNewsRoute($this->param['id'], $this->param['url']); 67 $id = $this->editNewsRoute($this->param['id'], $this->param['url']);
@@ -62,7 +62,7 @@ class KeywordLogic extends BaseLogic @@ -62,7 +62,7 @@ class KeywordLogic extends BaseLogic
62 $this->param['updated_at'] = $this->param['created_at']; 62 $this->param['updated_at'] = $this->param['created_at'];
63 $id = $this->model->insertGetId($this->param); 63 $id = $this->model->insertGetId($this->param);
64 //路由映射 64 //路由映射
65 - $route = RouteMap::setRoute($this->param['title'].'-tag', RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']); 65 + $route = RouteMap::setRoute($this->param['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
66 $this->model->edit(['route'=>$route],['id'=>$id]); 66 $this->model->edit(['route'=>$route],['id'=>$id]);
67 } 67 }
68 //清除缓存 68 //清除缓存
@@ -46,8 +46,6 @@ class ProductLogic extends BaseLogic @@ -46,8 +46,6 @@ class ProductLogic extends BaseLogic
46 } 46 }
47 DB::connection('custom_mysql')->beginTransaction(); 47 DB::connection('custom_mysql')->beginTransaction();
48 try { 48 try {
49 - //路由映射  
50 - $this->param['route'] = $this->param['route'].'-'.RouteMap::SOURCE_PRODUCT;  
51 if(isset($this->param['id']) && !empty($this->param['id'])){ 49 if(isset($this->param['id']) && !empty($this->param['id'])){
52 //查看路由是否更新 50 //查看路由是否更新
53 $id = $this->editProductRoute($this->param['id'],$this->param['route']); 51 $id = $this->editProductRoute($this->param['id'],$this->param['route']);