周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 de2aa4fa8552118c8344486280acf6bb61a8a569 2 个父辈 b35401d4 4df5babd

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 5 个修改的文件 包含 16 行增加 和 8 行删除
@@ -298,7 +298,7 @@ class WebTrafficRussia extends Command @@ -298,7 +298,7 @@ class WebTrafficRussia extends Command
298 $page++; 298 $page++;
299 } 299 }
300 }catch (\Exception $e){ 300 }catch (\Exception $e){
301 - Log::channel('traffic')->error("ru:" . $e->getMessage()); 301 + Log::channel('traffic')->error("ru:line" . $e->getLine() . ',error:' . $e->getMessage());
302 } 302 }
303 } 303 }
304 304
@@ -724,7 +724,8 @@ class ProjectController extends BaseController @@ -724,7 +724,8 @@ class ProjectController extends BaseController
724 "start_date" => $item['deploy_optimize']['start_date'] ?? '', 724 "start_date" => $item['deploy_optimize']['start_date'] ?? '',
725 "domain" => $domain ? 'https://' . $domain : $domain, 725 "domain" => $domain ? 'https://' . $domain : $domain,
726 "test_domain" => $item['deploy_build']['test_domain'] ?? '', 726 "test_domain" => $item['deploy_build']['test_domain'] ?? '',
727 - "online_time" => $item['online_check']['qa_check_time'] ?? '', 727 +// "online_time" => $item['online_check']['qa_check_time'] ?? '',
  728 + "online_time" => $item['uptime'] ?? '',
728 "cooperate_date" => $item['cooperate_date'], 729 "cooperate_date" => $item['cooperate_date'],
729 "project_manager_name" => $manage->getName($item['deploy_build']['manager_mid']), //项目经理 730 "project_manager_name" => $manage->getName($item['deploy_build']['manager_mid']), //项目经理
730 "after_sales_manager_name" => $manage->getName($item['deploy_optimize']['manager_mid']), //售后服务经理 731 "after_sales_manager_name" => $manage->getName($item['deploy_optimize']['manager_mid']), //售后服务经理
@@ -540,7 +540,6 @@ class ProductController extends BaseController @@ -540,7 +540,6 @@ class ProductController extends BaseController
540 'keyword.required' => 'keyword不能为空', 540 'keyword.required' => 'keyword不能为空',
541 ]); 541 ]);
542 $data = curl_c('http://title.globalso.com/ajax_data_for_web.php?keyword='.$this->param['keyword'],false); 542 $data = curl_c('http://title.globalso.com/ajax_data_for_web.php?keyword='.$this->param['keyword'],false);
543 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data, true) . PHP_EOL, FILE_APPEND);  
544 $this->response('success',Code::SUCCESS,$data); 543 $this->response('success',Code::SUCCESS,$data);
545 } 544 }
546 } 545 }
@@ -359,6 +359,9 @@ class ImageController extends Controller @@ -359,6 +359,9 @@ class ImageController extends Controller
359 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){ 359 if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
360 $this->map['project_id'] = $this->cache['project_id']; 360 $this->map['project_id'] = $this->cache['project_id'];
361 } 361 }
  362 + if(isset($this->map['name']) && !empty($this->map['name'])){
  363 + $this->map['name'] = ['like','%'.$this->map['name'].'%'];
  364 + }
362 $imageModel = new ImageModel(); 365 $imageModel = new ImageModel();
363 $lists = $imageModel->lists($this->map,$this->page,$this->row); 366 $lists = $imageModel->lists($this->map,$this->page,$this->row);
364 if(!empty($lists) && !empty($lists['list'])){ 367 if(!empty($lists) && !empty($lists['list'])){
@@ -45,13 +45,18 @@ class ProductLogic extends BaseLogic @@ -45,13 +45,18 @@ class ProductLogic extends BaseLogic
45 $category_ids = $this->handleCategory(); 45 $category_ids = $this->handleCategory();
46 //处理其他字段 46 //处理其他字段
47 $this->param = $this->handleSaveParam($this->param); 47 $this->param = $this->handleSaveParam($this->param);
48 -// try { 48 + try {
49 if(isset($this->param['id']) && !empty($this->param['id'])){ 49 if(isset($this->param['id']) && !empty($this->param['id'])){
  50 + $seo_mate = (array)$this->model->read(['id'=>$this->param['id']],['seo_mate'])['seo_mate'];
50 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0 51 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
51 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示 52 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
52 if($is_upgrade == 0 || $six_read == 1){ 53 if($is_upgrade == 0 || $six_read == 1){
53 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']); 54 $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
54 } 55 }
  56 + if(!empty($seo_mate)){
  57 + $seo_mate['title'] = $this->param['title'] ?? '';
  58 + $this->param['seo_mate'] = json_encode($seo_mate,true);
  59 + }
55 $route = $this->param['route']; 60 $route = $this->param['route'];
56 $this->model->edit($this->param,['id'=>$this->param['id']]); 61 $this->model->edit($this->param,['id'=>$this->param['id']]);
57 $id = $this->param['id']; 62 $id = $this->param['id'];
@@ -66,10 +71,10 @@ class ProductLogic extends BaseLogic @@ -66,10 +71,10 @@ class ProductLogic extends BaseLogic
66 CategoryRelated::saveRelated($id, $category_ids); 71 CategoryRelated::saveRelated($id, $category_ids);
67 //保存扩展字段 72 //保存扩展字段
68 $this->saveExtendInfo($id,$extend); 73 $this->saveExtendInfo($id,$extend);
69 -// }catch (\Exception $e){  
70 -// Log::info('错误信息---'.$e->getMessage());  
71 -// $this->fail('系统错误请联系管理员');  
72 -// } 74 + }catch (\Exception $e){
  75 + Log::info('错误信息---'.$e->getMessage());
  76 + $this->fail('系统错误请联系管理员');
  77 + }
73 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route); 78 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
74 $this->curlDelRoute(['new_route'=>$route]); 79 $this->curlDelRoute(['new_route'=>$route]);
75 return $this->success(); 80 return $this->success();