Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.mycht.cn:developers/information-system

Browse Source
hotfix/远程访问多媒体中心
LiaoYijun 9 years ago
parent cd14991935 a4741afa2e
commit 209580184a
6 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File

17
application/third_party/htmlcompressor/controllers/index.php vendored
Unescape Escape View File

@ -41,7 +41,13 @@ class Index extends CI_Controller {
}
//print_r($link_css_array);
foreach ($link_css_array as $item) {
$css_content.= GET_HTTP($this->format_url($item, $websitehost));
$get_http_temp = GET_HTTP($this->format_url($item, $websitehost));
if ($get_http_temp == false) {
$this->output->set_status_header(404);
echo 'CSS文件下载错误';
return FALSE;
}
$css_content.=$get_http_temp;
}
foreach ($html_object->find('style') as $style_css) {
if ($style_css->type == "text/css") {
@ -75,7 +81,13 @@ class Index extends CI_Controller {
$js_scr_content = '';
foreach ($link_js_array as $item) {
$js_scr_content.= GET_HTTP($this->format_url($item, $websitehost));
$get_http_temp = GET_HTTP($this->format_url($item, $websitehost));
if ($get_http_temp == false) {
$this->output->set_status_header(404);
echo 'JS文件下载错误';
return FALSE;
}
$js_scr_content.=$get_http_temp;
}
//echo $js_content;
//把网页内容和css提交到purifycss处理
@ -83,7 +95,6 @@ class Index extends CI_Controller {
if (empty($optimize_css)) {
$this->output->set_status_header(500);
echo 'css精简错误';
echo '<!-- ' . $css_content . ' -->';
return FALSE;
}

4
application/third_party/pagespeed/controllers/index.php vendored
Unescape Escape View File

@ -97,14 +97,14 @@ class Index extends CI_Controller {
}
$desktop_object = json_decode($desktop_data);
$mobile_object = json_decode($mobile_data);
if (!empty($desktop_object->error) || !empty($mobile_object->error)) {
if (isset($desktop_object->error) || isset($mobile_object->error)) {
$this->PageSpeedData_model->update_error($pagespeed_data->psd_id);
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') {
if ($desktop_object->responseCode !== '200' || $mobile_object->responseCode !== '200') {
$this->PageSpeedData_model->update_error($pagespeed_data->psd_id);
echo json_encode(array('result' => 'error', 'data' => 'API返回错误，网页打不开'));
log_message('error ', 'pagespeed_error:' . json_encode($desktop_object) . ' ' . json_encode($mobile_object));

10
application/third_party/pagespeed/models/PageSpeedData_model.php vendored
Unescape Escape View File

@ -64,6 +64,7 @@ class PageSpeedData_model extends CI_Model {
$this->topnum = $topnum;
$this->where = ' AND psd.psd_SiteCode=' . $this->INFO->escape($psd_SiteCode);
$this->where .= ' AND ISNULL(psd.psd_Datetime,1999) < GETDATE()-1 ';
$this->where .= ' AND psd.psd_ErrorCount<=3 ';
$this->orderby = ' ORDER BY psd_Datetime ASC ';
return $this->get_list();
}
@ -81,9 +82,9 @@ class PageSpeedData_model extends CI_Model {
WHERE psd_id = ?
";
$this->INFO->query($sql, array($psd_id));
//删除错误数大于3的数据，保持没有冗余数据
$sql = " DELETE FROM PageSpeedData WHERE psd_ErrorCount>3 ";
$this->INFO->query($sql);
//删除错误数大于3的数据，保持没有冗余数据 ，不删除，很多页面信息平台发布了，但是网前删除了
//$sql = " DELETE FROM PageSpeedData WHERE psd_ErrorCount>3 ";
// $this->INFO->query($sql);
}
//删除数据
@ -160,7 +161,8 @@ class PageSpeedData_model extends CI_Model {
,COUNT(CASE WHEN psd.psd_MobileScore<60 THEN 1 END) AS [m60_0]
FROM PageSpeedData psd
WHERE 1=1
AND psd.psd_SiteCode=?
AND psd.psd_SiteCode=?
AND psd.psd_ErrorCount<=3
";
$query = $this->INFO->query($sql, array($psd_SiteCode));
if ($query->num_rows() > 0) {

5
application/third_party/pagespeed/views/search.php vendored
Unescape Escape View File

@ -10,7 +10,7 @@ foreach ($score_data_list as $key => $item) {
<thead>
<tr>
<th class="col-sm-1">#</th>
<th class="col-sm-3">页面</th>
<th class="col-sm-5">页面</th>
<th class="col-sm-1">移动端</th>
<th class="col-sm-1">桌面端</th>
<th class="col-sm-2">更新时间</th>
@ -30,7 +30,8 @@ foreach ($score_data_list as $key => $item) {
<td><?php echo $item->psd_DesktopScore; ?></td>
<td><?php echo date('Y-m-d', strtotime($item->psd_Datetime)); ?></td>
<td>
<a href="<?php echo $site_url . $item->psd_URL ?>" target="_blank">查看页面</a> | <a href="https://developers.google.com/speed/pagespeed/insights/?url=<?php echo urlencode($site_url . $item->psd_URL); ?>" target="_blank">Google insights</a>
<a href="<?php echo $site_url . $item->psd_URL ?>" target="_blank">查看页面</a> |
<a href="https://developers.google.com/speed/pagespeed/insights/?url=<?php echo urlencode($site_url . $item->psd_URL); ?>" target="_blank">Google insights</a>
</td>
</tr>
<?php

3
application/views/bootstrap3/information_edit.php
Unescape Escape View File

@ -439,6 +439,9 @@
init_recommend_popover("#meta_recommend_info", ".meta_recommend_info_box");
init_recommend_popover("#meta_related_info", ".meta_related_info_box");
init_recommend_popover("#meta_bread_info", ".meta_bread_info_box");
//自动读取google网页性能评分
setTimeout(function(){mobile_friendly(),1000});
});
var editor;

3
js/information-system3.min.js vendored
Unescape Escape View File

@ -545,7 +545,6 @@ $(document).ready(function() {
showButtonPanel: true
});
setTimeout(function(){mobile_friendly(),1000});
});
Write Preview
Loading…
Cancel
Save