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

@@ -298,7 +298,7 @@ class WebTrafficRussia extends Command
                 $page++;
             }
         }catch (\Exception $e){
-            Log::channel('traffic')->error("ru:" . $e->getMessage());
+            Log::channel('traffic')->error("ru:line" . $e->getLine() . ',error:' . $e->getMessage());
         }
     }
 

@@ -724,7 +724,8 @@ class ProjectController extends BaseController
                   "start_date" => $item['deploy_optimize']['start_date'] ?? '',
                   "domain" => $domain ? 'https://' . $domain : $domain,
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
-                  "online_time" => $item['online_check']['qa_check_time'] ?? '',
+//                  "online_time" => $item['online_check']['qa_check_time'] ?? '',
+                  "online_time" => $item['uptime'] ?? '',
                   "cooperate_date" => $item['cooperate_date'],
                   "project_manager_name" => $manage->getName($item['deploy_build']['manager_mid']), //项目经理
                   "after_sales_manager_name" => $manage->getName($item['deploy_optimize']['manager_mid']), //售后服务经理

@@ -540,7 +540,6 @@ class ProductController extends BaseController
             'keyword.required' => 'keyword不能为空',
         ]);
         $data = curl_c('http://title.globalso.com/ajax_data_for_web.php?keyword='.$this->param['keyword'],false);
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data, true) . PHP_EOL, FILE_APPEND);
         $this->response('success',Code::SUCCESS,$data);
     }
 }

@@ -359,6 +359,9 @@ class ImageController extends Controller
         if(isset($this->cache['project_id']) && !empty($this->cache['project_id'])){
             $this->map['project_id'] = $this->cache['project_id'];
         }
+        if(isset($this->map['name']) && !empty($this->map['name'])){
+            $this->map['name'] = ['like','%'.$this->map['name'].'%'];
+        }
         $imageModel = new ImageModel();
         $lists = $imageModel->lists($this->map,$this->page,$this->row);
         if(!empty($lists) && !empty($lists['list'])){

@@ -45,13 +45,18 @@ class ProductLogic extends  BaseLogic
         $category_ids = $this->handleCategory();
         //处理其他字段
         $this->param = $this->handleSaveParam($this->param);
-//        try {
+        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
+                $seo_mate = (array)$this->model->read(['id'=>$this->param['id']],['seo_mate'])['seo_mate'];
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 if($is_upgrade == 0 || $six_read == 1){
                     $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
                 }
+                if(!empty($seo_mate)){
+                    $seo_mate['title'] = $this->param['title'] ?? '';
+                    $this->param['seo_mate'] = json_encode($seo_mate,true);
+                }
                 $route = $this->param['route'];
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $id = $this->param['id'];
@@ -66,10 +71,10 @@ class ProductLogic extends  BaseLogic
             CategoryRelated::saveRelated($id, $category_ids);
             //保存扩展字段
             $this->saveExtendInfo($id,$extend);
-//        }catch (\Exception $e){
-//            Log::info('错误信息---'.$e->getMessage());
-//            $this->fail('系统错误请联系管理员');
-//        }
+        }catch (\Exception $e){
+            Log::info('错误信息---'.$e->getMessage());
+            $this->fail('系统错误请联系管理员');
+        }
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         return $this->success();