周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 9440ab772402725b05caa1f90f42f34fa480ceef 2 个父辈 dbb66266 c86d4013

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 10 行增加 和 8 行删除
@@ -215,7 +215,7 @@ class HtmlCollect extends Command @@ -215,7 +215,7 @@ class HtmlCollect extends Command
215 } 215 }
216 216
217 #Description 217 #Description
218 - preg_match_all('/<meta name=[\'|\"]description[\'|\"]\s+[^>]*?content=[\'|\"]([\w\W]*?)[\'|\"]/', $html, $matches); 218 + preg_match_all('/<meta\s+[^>]*?name=[\'|\"]description[\'|\"]\s+[^>]*?content=[\'|\"]([\w\W]*?)[\'|\"]/', $html, $matches);
219 if (!empty($matches[1])) { 219 if (!empty($matches[1])) {
220 $meta['description'] = substr($matches[1][0], 0, 255); 220 $meta['description'] = substr($matches[1][0], 0, 255);
221 } 221 }
@@ -55,7 +55,7 @@ class UpdateRoute extends Command @@ -55,7 +55,7 @@ class UpdateRoute extends Command
55 */ 55 */
56 public function handle(){ 56 public function handle(){
57 $projectModel = new Project(); 57 $projectModel = new Project();
58 - $list = $projectModel->list(['id'=>672]); 58 + $list = $projectModel->list(['is_upgrade'=>0,'type'=>['!=',0],'id'=>['<',52]]);
59 foreach ($list as $v){ 59 foreach ($list as $v){
60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
61 ProjectServer::useProject($v['id']); 61 ProjectServer::useProject($v['id']);
@@ -101,15 +101,15 @@ class UpdateRoute extends Command @@ -101,15 +101,15 @@ class UpdateRoute extends Command
101 if(!empty($v['route'])){ 101 if(!empty($v['route'])){
102 $tag = "-tag"; 102 $tag = "-tag";
103 if (!(substr($v['route'], -strlen($tag)) === $tag)) { 103 if (!(substr($v['route'], -strlen($tag)) === $tag)) {
104 - $route = Translate::tran($v['route'], 'en').$tag; 104 +// $route = Translate::tran($v['route'], 'en').$tag;
105 // 如果不是以 '-tag' 结尾，则拼接上 '-tag' 105 // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
106 -// $route = $v['route'].$tag;  
107 - $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);  
108 - $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
109 - }else{  
110 - $route = Translate::tran($v['title'], 'en').$tag; 106 + $route = $v['route'].$tag;
111 $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']); 107 $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
112 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]); 108 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  109 +// }else{
  110 +// $route = Translate::tran($v['title'], 'en').$tag;
  111 +// $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
  112 +// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
113 } 113 }
114 }else{ 114 }else{
115 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL; 115 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
@@ -510,8 +510,10 @@ class BTemplateLogic extends BaseLogic @@ -510,8 +510,10 @@ class BTemplateLogic extends BaseLogic
510 $templateCommonModel->edit($data,['id'=>$commonInfo['id']]); 510 $templateCommonModel->edit($data,['id'=>$commonInfo['id']]);
511 } 511 }
512 //更新所有界面的other 512 //更新所有界面的other
  513 + if($template_id != 0){
513 return $templateCommonModel->edit(['other'=>$handleInfo['other']],['project_id'=>$this->user['project_id'],'template_id'=>$template_id]); 514 return $templateCommonModel->edit(['other'=>$handleInfo['other']],['project_id'=>$this->user['project_id'],'template_id'=>$template_id]);
514 } 515 }
  516 + }
515 517
516 /** 518 /**
517 * @remark :扩展模块定制保存头部处理 519 * @remark :扩展模块定制保存头部处理