diff --git a/application/third_party/pagespeed/controllers/index.php b/application/third_party/pagespeed/controllers/index.php index 9b13cab9..438679c2 100644 --- a/application/third_party/pagespeed/controllers/index.php +++ b/application/third_party/pagespeed/controllers/index.php @@ -33,11 +33,13 @@ class Index extends CI_Controller { $psd_URL = $this->input->get_post('psd_URL'); $psd_SiteCode = $this->input->get_post('psd_SiteCode'); if (empty($psd_URL) || empty($psd_SiteCode)) { + echo json_encode(array('result' => 'error', 'data' => 'url或站点为空')); return false; } } $sites = $this->config->item('site'); if (empty($sites[$psd_SiteCode])) { + echo json_encode(array('result' => 'error', 'data' => '找不到站点')); return false; } $site_url = rtrim($sites[$psd_SiteCode]['site_url'], '/'); //删除/,因为URL已经含有了 @@ -46,27 +48,28 @@ class Index extends CI_Controller { $PageSpeedData = new StdClass; $desktop_url = "https://www.googleapis.com/pagespeedonline/v2/runPagespeed?strategy=desktop&locale=zh_CN&url=$run_URL"; - // $desktop_url = "http://pagespeed.mycht.cn/pagespeedonline/v2/runPagespeed?strategy=desktop&locale=zh_CN&url=$run_URL"; + $desktop_url = "http://pagespeed.mycht.cn/pagespeedonline/v2/runPagespeed?strategy=desktop&locale=zh_CN&url=$run_URL"; $mobile_url = "https://www.googleapis.com/pagespeedonline/v2/runPagespeed?strategy=mobile&locale=zh_CN&url=$run_URL"; - //$mobile_url = "http://pagespeed.mycht.cn/pagespeedonline/v2/runPagespeed?strategy=mobile&locale=zh_CN&url=$run_URL"; + $mobile_url = "http://pagespeed.mycht.cn/pagespeedonline/v2/runPagespeed?strategy=mobile&locale=zh_CN&url=$run_URL"; //echo $desktop_url;die(); $desktop_data = GET_HTTP($desktop_url); $mobile_data = GET_HTTP($mobile_url); if (empty($desktop_data) || empty($mobile_data)) { + echo json_encode(array('result' => 'error', 'data' => 'API不返回数据')); return false; } $desktop_object = json_decode($desktop_data); $mobile_object = json_decode($mobile_data); if (!empty($desktop_object->error) || !empty($mobile_object->error)) { $this->PageSpeedData_model->update_error($pagespeed_data->psd_id); - echo 'pagespeed_error:' . json_encode($desktop_object) . ' ' . json_encode($mobile_object); + echo json_encode(array('result' => 'error', 'data' => 'API返回错误')); log_message('error ', 'pagespeed_error:' . json_encode($desktop_object) . ' ' . json_encode($mobile_object)); return false; } if (!$desktop_object->responseCode == '200' || !$mobile_object->responseCode == '200') { $this->PageSpeedData_model->update_error($pagespeed_data->psd_id); - echo 'pagespeed_error:' . json_encode($desktop_object) . ' ' . json_encode($mobile_object); + echo json_encode(array('result' => 'error', 'data' => 'API返回错误,网页打不开')); log_message('error ', 'pagespeed_error:' . json_encode($desktop_object) . ' ' . json_encode($mobile_object)); return FALSE; } @@ -86,7 +89,7 @@ class Index extends CI_Controller { $where = array('psd_id' => $pagespeed_data->psd_id); $this->PageSpeedData_model->update('PageSpeedData', $PageSpeedData, $where); } - echo json_encode($pagespeed_data); + echo json_encode(array('result' => 'ok', 'data' => 'M:'.$PageSpeedData->psd_MobileScore.',D:'.$PageSpeedData->psd_DesktopScore)); } } diff --git a/application/third_party/pagespeed/models/PageSpeedData_model.php b/application/third_party/pagespeed/models/PageSpeedData_model.php index a2086ce1..5ba8e070 100644 --- a/application/third_party/pagespeed/models/PageSpeedData_model.php +++ b/application/third_party/pagespeed/models/PageSpeedData_model.php @@ -41,7 +41,7 @@ class PageSpeedData_model extends CI_Model { psd_URL ,psd_SiteCode ) - SELECT TOP 10 ic.ic_url + SELECT TOP 200 ic.ic_url ,ic.ic_sitecode FROM Tourmanager.dbo.infoContents ic WHERE ic.ic_status = 1 @@ -54,7 +54,7 @@ class PageSpeedData_model extends CI_Model { AND psd.psd_SiteCode = ic.ic_sitecode ) ORDER BY - ic.ic_datetime DESC + ic.ic_datetime ASC "; $this->INFO->query($sql,array($psd_SiteCode)); }