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

@@ -70,8 +70,7 @@ class AyrReleaseLogic extends BaseLogic
                 $arr[] = $v;
                 $arr[] = $v;
             }
             }
         }
         }
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($arr, true) . PHP_EOL, FILE_APPEND);
-        return $this->success($arr);
+         return $this->success($arr);
     }
     }
 
 
 }
 }

@@ -173,8 +173,8 @@ 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;
-//        exec($url);
-        curlGet($url);
+        $rs = shell_exec('curl -k '.$url);
+//        curlGet($url);
         return $this->success();
         return $this->success();
     }
     }
 }
 }

@@ -67,7 +67,6 @@ class AmazonS3Service
     public function syncImageFiles($files)
     public function syncImageFiles($files)
     {
     {
         $file_content = curl_c($files,false);
         $file_content = curl_c($files,false);
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($file_content, true) . PHP_EOL, FILE_APPEND);
         $key = str_replace_url($files);
         $key = str_replace_url($files);
         try {
         try {
             $result = $this->s3->putObject([
             $result = $this->s3->putObject([