From 6eb7550495100f6a3ab7f84059e7181d18227ee9 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Thu, 15 Mar 2018 11:08:19 +0800 Subject: [PATCH 1/4] fix amp photo --- application/views/bootstrap3/information_edit.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 24a211ad..fd63fd0d 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -542,8 +542,14 @@
- session->userdata('session_admin'); ?> - | + session->userdata('session_admin'); + $amp_photo = ''; + if ($information->ic_photo) { + $amp_photo = $this->config->item('site_image_url').$information->ic_photo; + } + ?> + | ic_id, 'AMP_STATUS') === '1') {?> From 5957fdf6014e3cbeaeec9a86bf523db6fb8cb549 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Thu, 15 Mar 2018 15:50:44 +0800 Subject: [PATCH 2/4] fit amp url --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index fd63fd0d..fff3667e 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -549,7 +549,7 @@ $amp_photo = $this->config->item('site_image_url').$information->ic_photo; } ?> - | + | ic_id, 'AMP_STATUS') === '1') {?> From 7dfb637184ea29103a97220775f315028a842093 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 16 Mar 2018 11:41:13 +0800 Subject: [PATCH 3/4] train spread webcode --- application/config/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/config.php b/application/config/config.php index cc8bdb66..18b3e635 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -383,7 +383,7 @@ $config['site'] = array( 'diy' => array('site_code' => 'diy', 'site_id' => 99, 'site_lgc' => '1', 'sitemap_name' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_image_url' => '//images.diychinatours.com', 'site_url' => 'http://www.diychinatours.com', 'site_sitemap' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_authors' => array('ycc,lyy')), 'ah' => array('site_code' => 'ah', 'site_id' => 141, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '//images.asiahighlights.com', 'site_url' => 'https://www.asiahighlights.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), 'pgr' => array('site_code' => 'pgr', 'site_id' => 148, 'site_lgc' => '2', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.peregrine.cn', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), - 'ts' => array('site_code' => 'ts', 'site_id' => 0, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), + 'ts' => array('site_code' => 'ts', 'site_id' => 149, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), 'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'http://www.beijinghighlights.com', 'site_authors' => array('cj')) ); From 1109107edc589950a4e7646bd0d204db427a59a4 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 16 Mar 2018 12:07:06 +0800 Subject: [PATCH 4/4] keywords catch -2days --- application/controllers/keyworlds.php | 2 +- application/models/infokeywords_model.php | 7 ++++--- application/views/keyworlds/index.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index 2867c7ba..178de3d6 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -382,7 +382,7 @@ class Keyworlds extends CI_Controller { $source_flag = 'source_m'; } - $today_0 = strtotime(date('Ymd000000')); + $today_0 = mktime(0,0,0,date("m"),(date("d")-$this->Keywords_model->catch_day), date("Y")); $today_24 = strtotime(date('Ymd235959')); $last_rank_today = $this->Keywordsrank_model->get_rank_list($worldsList[0]->kw_id,1,$today_0,$today_24); // $last_rank_today = $last_rank_pc; diff --git a/application/models/infokeywords_model.php b/application/models/infokeywords_model.php index c1bed61d..b6b822ac 100644 --- a/application/models/infokeywords_model.php +++ b/application/models/infokeywords_model.php @@ -2,6 +2,7 @@ class infoKeywords_model extends CI_Model { + public $catch_day = 2; function __construct() { parent::__construct(); @@ -66,7 +67,7 @@ class infoKeywords_model extends CI_Model //获取关键词列表用于抓取排名 public function get_keyworld_list_old($top = 1, $engines='',$site_code=false) { - $today = strtotime(date('Y-m-d')); + $today = mktime(0,0,0,date("m"),(date("d")-$this->catch_day), date("Y")); //只查某个站点，原因是个事业部服务器分开，只需要查询本事业部站点即可 $map = " "; if(!empty($site_code)){ @@ -80,7 +81,7 @@ class infoKeywords_model extends CI_Model }elseif ($engines=='eu') { $map.=" AND kw_sitecode in ('gm','vc','vac','ru','it','jp') "; } - $today0 = strtotime(date('Ymd000000')); + $today0 = mktime(0,0,0,date("m"),(date("d")-2), date("Y")); $sql = "SELECT TOP 1 kw_id, kw_keyworlds, kw_is_id, @@ -97,7 +98,7 @@ class infoKeywords_model extends CI_Model } public function get_keyworld_list($top=1,$engines='',$site_code=false) { - $today0 = strtotime(date('Ymd000000')); + $today0 = mktime(0,0,0,date("m"),(date("d")-$this->catch_day), date("Y")); $map = " "; //只查某个站点，原因是个事业部服务器分开，只需要查询本事业部站点即可 if(!empty($site_code)){ diff --git a/application/views/keyworlds/index.php b/application/views/keyworlds/index.php index af1f114c..392f8cfd 100644 --- a/application/views/keyworlds/index.php +++ b/application/views/keyworlds/index.php @@ -43,7 +43,7 @@
排名情况 - +