周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 57550661fb336ed66e53f8f313caac7aa3cd008a 2 个父辈 add10344 b2fc881b

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6

内嵌 并排对比
正在显示 2 个修改的文件 包含 61 行增加 和 33 行删除
@@ -51,14 +51,14 @@ class UpdateRoute extends Command @@ -51,14 +51,14 @@ class UpdateRoute extends Command
51 */ 51 */
52 public function handle(){ 52 public function handle(){
53 $projectModel = new Project(); 53 $projectModel = new Project();
54 - $list = $projectModel->list(['id'=>475]); 54 + $list = $projectModel->list(['type'=>['!=',0]]);
55 foreach ($list as $v){ 55 foreach ($list as $v){
56 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 56 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
57 ProjectServer::useProject($v['id']); 57 ProjectServer::useProject($v['id']);
58 // $this->getProduct(); 58 // $this->getProduct();
59 -// $this->setProductKeyword(); 59 + $this->setProductKeyword();
60 // $this->getRouteMap(); 60 // $this->getRouteMap();
61 - $this->getProductCategory(); 61 +// $this->getProductCategory();
62 DB::disconnect('custom_mysql'); 62 DB::disconnect('custom_mysql');
63 } 63 }
64 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 64 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -76,15 +76,15 @@ class UpdateRoute extends Command @@ -76,15 +76,15 @@ class UpdateRoute extends Command
76 $lists = $keywordModel->list(); 76 $lists = $keywordModel->list();
77 if(!empty($lists)){ 77 if(!empty($lists)){
78 foreach ($lists as $v){ 78 foreach ($lists as $v){
79 - if(!empty($v['route'])){  
80 - $tag = "-tag";  
81 - if (!(substr($v['route'], -strlen($tag)) === $tag)) {  
82 - $route = $v['route'].$tag;  
83 - // 如果不是以 '-tag' 结尾，则拼接上 '-tag'  
84 - $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);  
85 - $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
86 - }  
87 - }else{ 79 + if(empty($v['route'])){
  80 +// $tag = "-tag";
  81 +// if (!(substr($v['route'], -strlen($tag)) === $tag)) {
  82 +// $route = $v['route'].$tag;
  83 +// // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
  84 +// $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
  85 +// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  86 +// }
  87 +// }else{
88 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL; 88 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
89 $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']); 89 $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
90 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]); 90 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
@@ -101,24 +101,24 @@ class UpdateRoute extends Command @@ -101,24 +101,24 @@ class UpdateRoute extends Command
101 * @method :post 101 * @method :post
102 * @time :2023/12/8 11:13 102 * @time :2023/12/8 11:13
103 */ 103 */
104 -// public function getProductKeyword(){  
105 -// $keywordModel = new Keyword();  
106 -// $lists = $keywordModel->list(['status'=>1,'route'=>'']);  
107 -// if(!empty($lists)){  
108 -// foreach ($lists as $v){  
109 -// $tag = "-tag";  
110 -// if (!(substr($v['route'], -strlen($tag)) === $tag)) {  
111 -// echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;  
112 -// $route = $v['route'].$tag;  
113 -// // 如果不是以 '-tag' 结尾，则拼接上 '-tag'  
114 -// $routeModel = new RouteMap();  
115 -// $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);  
116 -// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
117 -// echo date('Y-m-d H:i:s') . 'end'.$v['id'] . PHP_EOL;  
118 -// }  
119 -// }  
120 -// }  
121 -// } 104 + public function getProductKeyword(){
  105 + $keywordModel = new Keyword();
  106 + $lists = $keywordModel->list(['status'=>1,'route'=>'']);
  107 + if(!empty($lists)){
  108 + foreach ($lists as $v){
  109 + $tag = "-tag";
  110 + if (!(substr($v['route'], -strlen($tag)) === $tag)) {
  111 + echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
  112 + $route = $v['route'].$tag;
  113 + // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
  114 + $routeModel = new RouteMap();
  115 + $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
  116 + $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  117 + echo date('Y-m-d H:i:s') . 'end'.$v['id'] . PHP_EOL;
  118 + }
  119 + }
  120 + }
  121 + }
122 122
123 public function getProduct(){ 123 public function getProduct(){
124 $productModel = new Product(); 124 $productModel = new Product();
@@ -148,14 +148,16 @@ class KeywordLogic extends BaseLogic @@ -148,14 +148,16 @@ class KeywordLogic extends BaseLogic
148 $this->model = new Keyword(); 148 $this->model = new Keyword();
149 $info = $this->model->read(['title'=>$v]); 149 $info = $this->model->read(['title'=>$v]);
150 if($info === false){ 150 if($info === false){
  151 + $route = $this->specialRouteCheck($v);
151 $param['project_id'] = $this->user['project_id']; 152 $param['project_id'] = $this->user['project_id'];
152 $param['created_at'] = date('Y-m-d H:i:s'); 153 $param['created_at'] = date('Y-m-d H:i:s');
153 $param['updated_at'] = $param['created_at']; 154 $param['updated_at'] = $param['created_at'];
154 $param['title'] = $v; 155 $param['title'] = $v;
  156 + $param['route'] = $route;
155 $id = $this->model->insertGetId($param); 157 $id = $this->model->insertGetId($param);
156 - $route = RouteMap::setRoute($route_array[$k], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);  
157 -// $this->curlDelRoute(['new_route'=>$route]);  
158 - $this->model->edit(['route'=>$route],['id'=>$id]); 158 + $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
  159 +//// $this->curlDelRoute(['new_route'=>$route]);
  160 +// $this->model->edit(['route'=>$route],['id'=>$id]);
159 } 161 }
160 } 162 }
161 }catch (\Exception $e){ 163 }catch (\Exception $e){
@@ -165,6 +167,32 @@ class KeywordLogic extends BaseLogic @@ -165,6 +167,32 @@ class KeywordLogic extends BaseLogic
165 } 167 }
166 168
167 /** 169 /**
  170 + * @remark :
  171 + * @name :specialRouteCheck
  172 + * @author :lyh
  173 + * @method :post
  174 + * @time :2024/1/6 14:50
  175 + */
  176 + public function specialRouteCheck($title)
  177 + {
  178 + if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
  179 + $title = Translate::tran($title, 'en');
  180 + }
  181 + $suffix = '-tag';
  182 + $i = 1;
  183 + $sign = generateRoute($title);
  184 + $route = $sign . $suffix;
  185 + resetRoute:
  186 + $log = RouteMap::getRouteInfo($route, $this->user['project_id']);
  187 + if ($log) {
  188 + $route = $sign .'-'.$i.$suffix;
  189 + $i++;
  190 + goto resetRoute;
  191 + }
  192 + return $route;
  193 + }
  194 +
  195 + /**
168 * @remark :删除标签 196 * @remark :删除标签
169 * @name :keywordDelete 197 * @name :keywordDelete
170 * @author :lyh 198 * @author :lyh