周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 e5eda20b2ea3a5d2076aaf2510c6f8ef297f3866 2 个父辈 d275d47a 85d293c5

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 18 行增加 和 16 行删除
@@ -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'=>206]); 58 + $list = $projectModel->list(['is_upgrade'=>0,'delete_status'=>0,'id'=>['<',500]]);
59 $data = []; 59 $data = [];
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;
@@ -107,27 +107,26 @@ class UpdateRoute extends Command @@ -107,27 +107,26 @@ class UpdateRoute extends Command
107 if(!empty($lists)){ 107 if(!empty($lists)){
108 foreach ($lists as $v){ 108 foreach ($lists as $v){
109 if(!empty($v['route'])){ 109 if(!empty($v['route'])){
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 - } 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 +// }
123 }else{ 123 }else{
124 - echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;  
125 $route = Translate::tran($v['title'], 'en'); 124 $route = Translate::tran($v['title'], 'en');
126 echo date('Y-m-d H:i:s') . 'route :'.$route . PHP_EOL; 125 echo date('Y-m-d H:i:s') . 'route :'.$route . PHP_EOL;
127 $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']); 126 $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
128 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]); 127 $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
129 } 128 }
130 - echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL; 129 +// echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
131 } 130 }
132 } 131 }
133 } 132 }
@@ -514,6 +514,7 @@ class ProductController extends BaseController @@ -514,6 +514,7 @@ class ProductController extends BaseController
514 if($info === false){ 514 if($info === false){
515 $info = []; 515 $info = [];
516 } 516 }
  517 + $info['data'] = json_decode($info['data']);
517 $this->response('success',Code::SUCCESS,$info); 518 $this->response('success',Code::SUCCESS,$info);
518 } 519 }
519 } 520 }
@@ -14,6 +14,7 @@ use App\Models\RouteMap\RouteMap; @@ -14,6 +14,7 @@ use App\Models\RouteMap\RouteMap;
14 use App\Models\Template\BTemplate; 14 use App\Models\Template\BTemplate;
15 use App\Services\CosService; 15 use App\Services\CosService;
16 use Illuminate\Support\Facades\DB; 16 use Illuminate\Support\Facades\DB;
  17 +use Illuminate\Support\Facades\Log;
17 18
18 /** 19 /**
19 * Class ProductLogic 20 * Class ProductLogic
@@ -66,6 +67,7 @@ class ProductLogic extends BaseLogic @@ -66,6 +67,7 @@ class ProductLogic extends BaseLogic
66 //保存扩展字段 67 //保存扩展字段
67 $this->saveExtendInfo($id,$extend); 68 $this->saveExtendInfo($id,$extend);
68 }catch (\Exception $e){ 69 }catch (\Exception $e){
  70 + Log::info('错误信息---'.$e->getMessage());
69 $this->fail('系统错误请联系管理员'); 71 $this->fail('系统错误请联系管理员');
70 } 72 }
71 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route); 73 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);