作者 lyh

gx

@@ -60,14 +60,7 @@ class UpdateRoute extends Command @@ -60,14 +60,7 @@ class UpdateRoute extends Command
60 foreach ($list as $v){ 60 foreach ($list as $v){
61 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 61 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
62 ProjectServer::useProject($v['id']); 62 ProjectServer::useProject($v['id']);
63 -// $this->delProductKeyword();  
64 -// $this->checkProduct($data,$v['id']);  
65 -// $this->getProduct();  
66 $this->setProductKeyword(); 63 $this->setProductKeyword();
67 -// $this->getRouteMap();  
68 -// $this->getProductCategory();  
69 -// $this->delRouteMap();  
70 -// $this->setCustomRoute($v['id']);  
71 DB::disconnect('custom_mysql'); 64 DB::disconnect('custom_mysql');
72 } 65 }
73 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 66 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -114,19 +107,19 @@ class UpdateRoute extends Command @@ -114,19 +107,19 @@ class UpdateRoute extends Command
114 if(!empty($lists)){ 107 if(!empty($lists)){
115 foreach ($lists as $v){ 108 foreach ($lists as $v){
116 if(!empty($v['route'])){ 109 if(!empty($v['route'])){
117 -// $tag = "-tag";  
118 -// if ((substr($v['route'], -strlen($tag)) === $tag)) {  
119 -// echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;  
120 -//// $route = Translate::tran($v['route'], 'en').$tag;  
121 -// // 如果不是以 '-tag' 结尾,则拼接上 '-tag'  
122 -// $route = trim($v['route'],'-tag');  
123 -// $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);  
124 -// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
125 -// }else{  
126 -// $route = Translate::tran($v['title'], 'en').$tag;  
127 -// $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);  
128 -// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
129 -// } 110 + $tag = "-tag";
  111 + if ((substr($v['route'], -strlen($tag)) === $tag)) {
  112 + echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
  113 +// $route = Translate::tran($v['route'], 'en').$tag;
  114 + // 如果不是以 '-tag' 结尾,则拼接上 '-tag'
  115 + $route = trim($v['route'],'-tag');
  116 + $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
  117 + $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  118 + }else{
  119 + $route = Translate::tran($v['title'], 'en').$tag;
  120 + $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
  121 + $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  122 + }
130 }else{ 123 }else{
131 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL; 124 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
132 $route = Translate::tran($v['title'], 'en'); 125 $route = Translate::tran($v['title'], 'en');
@@ -46,7 +46,7 @@ class ProductLogic extends BaseLogic @@ -46,7 +46,7 @@ class ProductLogic extends BaseLogic
46 $this->param = $this->handleSaveParam($this->param); 46 $this->param = $this->handleSaveParam($this->param);
47 try { 47 try {
48 if(isset($this->param['id']) && !empty($this->param['id'])){ 48 if(isset($this->param['id']) && !empty($this->param['id'])){
49 - $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']); 49 + $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id'],$this->param['six_read'] ?? 1);
50 $route = $this->param['route']; 50 $route = $this->param['route'];
51 $this->model->edit($this->param,['id'=>$this->param['id']]); 51 $this->model->edit($this->param,['id'=>$this->param['id']]);
52 $id = $this->param['id']; 52 $id = $this->param['id'];
@@ -67,7 +67,7 @@ class Category extends Base @@ -67,7 +67,7 @@ class Category extends Base
67 * @date 2023/4/28 67 * @date 2023/4/28
68 */ 68 */
69 public function getProductNum($cate_id){ 69 public function getProductNum($cate_id){
70 - $str = []; 70 + $str[] = $cate_id;
71 $cate_ids = $this->getAllSub($cate_id,$str); 71 $cate_ids = $this->getAllSub($cate_id,$str);
72 $count = CategoryRelated::whereIn('cate_id',$cate_ids)->count(); 72 $count = CategoryRelated::whereIn('cate_id',$cate_ids)->count();
73 // $str = 0; 73 // $str = 0;
@@ -111,7 +111,10 @@ class RouteMap extends Base @@ -111,7 +111,10 @@ class RouteMap extends Base
111 * @author zbj 111 * @author zbj
112 * @date 2023/4/17 112 * @date 2023/4/17
113 */ 113 */
114 - public static function setRoute($title, $source, $source_id, $project_id = 0){ 114 + public static function setRoute($title, $source, $source_id, $project_id = 0,$six_read = 1){
  115 + if($six_read != 1){//5.0数据编辑路由时,直接返回路由
  116 + return $title;
  117 + }
115 $route = self::generateRoute($title, $source, $source_id, $project_id); 118 $route = self::generateRoute($title, $source, $source_id, $project_id);
116 if(!$route){ 119 if(!$route){
117 throw new \Exception('路由生成失败'); 120 throw new \Exception('路由生成失败');