Merge branch 'test' into 'master'

Test

See merge request !40

app/Helpers/functions.php

@@ -45,8 +45,6 @@ function handler_drive($callback)
 function http_request_code($url, $isHearder = null, $post = 'GET', $data = null, $timeout = 1)
 {
 
-
-
   //  初始化curl
     $ch = curl_init();
     //设置URL地址
@@ -58,27 +56,26 @@ function http_request_code($url, $isHearder = null, $post = 'GET', $data = null,
         curl_setopt($ch, CURLOPT_HTTPHEADER,$isHearder);
     }
     //如果是post，则把data的数据传递过去
-
     if (($post == 'POST') ) {
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);//要求结果为字符串且输出到屏幕上
         curl_setopt($ch, CURLOPT_POST, 1);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
     }
-
     //如果是删除方法，则是以delete请求或者Post请求
     if ($post == 'DELETE' || $post == 'POST') {
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $post);
     }
-    curl_setopt($ch, CURLOPT_TIMEOUT, 0);
+    //curl_setopt($ch, CURLOPT_TIMEOUT, 0);
 
     //设置超时时间，毫秒
-//    curl_setopt($ch, CURLOPT_TIMEOUT_MS, $timeout * 100);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    if ($timeout){
+       curl_setopt($ch, CURLOPT_TIMEOUT_MS, $timeout * 1000);
+    }
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
     //执行CURL时间
     $result = curl_exec($ch);
 
-
     //如果有异常，记录到日志当中
     $curl_errno = curl_errno($ch);
     if ($curl_errno > 0) {

routes/api.php

@@ -53,5 +53,8 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user','middleware' => ['api']],
     Route::post("getMediaListByMediaIds","MediaController@getMediaListByMediaIds");
 
     //Route::get("media_url_change","MediaController@handleMediaUrl");
-
+    #处理媒资封面图片以及分辨率
+    Route::post("screenShotCallback","MediaController@screenShotCallback");
+    #处理之前没有分辨率的旧数据
+    Route::post("runScreenShot","MediaController@runScreenShot");
 });
\ No newline at end of file