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

@@ -227,6 +227,12 @@ class UpdateSeoTdk extends Command
                                 if($field == 'seo_description' || $field == 'description' || $field == 'seo_des'){
                                 if($field == 'seo_description' || $field == 'description' || $field == 'seo_des'){
                                     $update[$table]['des']++;
                                     $update[$table]['des']++;
                                 }
                                 }
+                                if($field == 'keyword_title'){
+                                    $update[$table]['keyword_title']++;
+                                }
+                                if($field == 'keyword_content'){
+                                    $update[$table]['keyword_content']++;
+                                }
                                 $data[$field] = $this->ai_send($prompt);
                                 $data[$field] = $this->ai_send($prompt);
                             }
                             }
                         } else {
                         } else {
@@ -261,6 +267,12 @@ class UpdateSeoTdk extends Command
                                         if($field == 'seo_description' || $field == 'description' || $field == 'seo_des'){
                                         if($field == 'seo_description' || $field == 'description' || $field == 'seo_des'){
                                             $update[$table]['des']++;
                                             $update[$table]['des']++;
                                         }
                                         }
+                                        if($field == 'keyword_title'){
+                                            $update[$table]['keyword_title']++;
+                                        }
+                                        if($field == 'keyword_content'){
+                                            $update[$table]['keyword_content']++;
+                                        }
                                     }
                                     }
                                 }
                                 }
                             }
                             }

@@ -264,6 +264,9 @@ class ProjectController extends BaseController
         if(isset($this->map['tech_mid'])){
         if(isset($this->map['tech_mid'])){
             $query = $query->where('gl_project_deploy_optimize.tech_mid',$this->map['tech_mid']);
             $query = $query->where('gl_project_deploy_optimize.tech_mid',$this->map['tech_mid']);
         }
         }
+        if(isset($this->map['optimist_mid'])){
+            $query = $query->where('gl_project_deploy_optimize.optimist_mid',$this->map['optimist_mid']);
+        }
         return $query;
         return $query;
     }
     }
 
 
@@ -804,6 +807,10 @@ class ProjectController extends BaseController
                     ', title更新数：'.$item[$k]['title'].
                     ', title更新数：'.$item[$k]['title'].
                     ',keyword更新数据：'.$item[$k]['keyword'].
                     ',keyword更新数据：'.$item[$k]['keyword'].
                     ',des更新数据：'.$item[$k]['des'];
                     ',des更新数据：'.$item[$k]['des'];
+                if($k == 'gl_product_keyword'){
+                    $item[$k] .= ',keyword_title更新数据：'.$item[$k]['keyword_title'];
+                    $item[$k] .= ',keyword_content更新数据：'.$item[$k]['keyword_content'];
+                }
             }
             }
 
 
         }
         }

@@ -173,12 +173,11 @@ class BaseLogic extends Logic
         $data['project_id'] = $this->user['project_id'];
         $data['project_id'] = $this->user['project_id'];
         $str = http_build_query($data);
         $str = http_build_query($data);
         $url = $this->user['domain'].'api/delHtml/?'.$str;
         $url = $this->user['domain'].'api/delHtml/?'.$str;
-        $rs = shell_exec('curl -k "'.$url.'"');
-//        if($this->user['project_id'] == 177){
-//            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($url, true) . PHP_EOL, FILE_APPEND);
-//            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($rs, true) . PHP_EOL, FILE_APPEND);
-//        }
-//        curlGet($url);
+        if($this->user['project_id'] == 672){//TODO::当前项目通知不过 ，跳过自动更新
+            exec('curl -k "'.$url.'" > /dev/null 2>&1 &');
+        }else{
+            shell_exec('curl -k "'.$url.'"');
+        }
         return $this->success();
         return $this->success();
     }
     }
 }
 }