Merge branch 'master' of gitee.com:hainatravel/information-system

mm
hotfix/远程访问多媒体中心
lmrwork 7 years ago
commit 6920b2dc3e

@ -563,42 +563,6 @@ $config['InfoType_citizen'] = array(
'产品' => 'product'
);
//可选模板
$config['templates'] = array(
'通用内容模板' => 'guide_info_detail',
'城市-列表模板' => 'city_info_list',
'城市-首页模板' => 'city_info_index',
'城市-首页模板[简]' => 'city_info_s_index',
'城市-景点列表模板' => 'city_info_attractions_list',
'城市-景点列表模板[简]' => 'city_info_s_attractions_list',
'城市-景点详细模板' => 'city_attractions',
'城市-特色产品模板' => 'city_info_diytour',
'城市-一线城市首页' => 'city_info_index_one',
'省份-首页' => "area_info_index",
'省份-列表模板' => 'area_info_list',
'省份-通用内容模板' => 'area_info_detail',
'文化模板 [列表式]' => "culture_info_detail_just_list",
'文化模板 [单页式]' => 'culture_info_detail_one_page',
'文化模板 [导航式]' => 'culture_info_detail_with_category',
'信息专题模板' => 'guide_top_series',
'火车专题模板' => 'train_top_series',
'旅游攻略' => 'travel_story',
'节庆-详细模板' => 'festival_detail',
'节庆-列表模板' => 'festival_list',
'大使馆-详细页' => 'embassy_info_detail',
'城市-线路详细' => 'city_circuit',
'专题模板(大)' => 'guide_big_series',
'[国际站]响应式-空白模板' => 'r_tpl_empty',
'[国际站]响应式-专题首页' => 'r_tpl_empty_navi0',
'[国际站]响应式-专题列表页' => 'r_tpl_empty_navi1',
'[国际站]响应式-专题列表页+' => 'r_tpl_empty_navi1p',
'[国际站]响应式-专题详细页' => 'r_tpl_empty_navi2',
'[-------已废弃-------]空白模板' => 'tpl_empty',
'[-------已废弃-------]专题-温暖' => 'warm',
'[-------已废弃-------]专题-庄重' => 'solemn',
'[-------已废弃-------]专题-节庆' => 'festival',
'[-------已废弃-------]专题-线路促销' => 'promotion_tour'
);
//可选模板
$config['templates_i'] = array(
@ -905,6 +869,7 @@ $config['templates'] = array(
'通用内容模板' => 'guide_info_detail',
'城市-列表模板' => 'city_info_list',
'城市-首页模板' => 'city_info_index',
'城市-首页模板(GM)' => 'city_info_index_new',
'城市-首页模板[简]' => 'city_info_s_index',
'城市-景点列表模板' => 'city_info_attractions_list',
'城市-景点列表模板[简]' => 'city_info_s_attractions_list',

@ -510,9 +510,9 @@ class Information extends CI_Controller {
}
}
if ($amp_request) {
$url = 'http://184.172.113.219:22224/amp' . $url;
$url = 'http://192.155.250.124:22224/amp' . $url;
} else {
$url = 'http://184.172.113.219:22224' . $url;
$url = 'http://192.155.250.124:22224' . $url;
}
break;
case 'ah':

@ -146,38 +146,108 @@ class Welcome extends CI_Controller {
$img->setAttribute('src', $img_src);
}
$information->ic_content = $htm_doc->saveHTML();
$this->InfoContents_model->Update(
$information->ic_id,
$information->ic_url,
$information->ic_url_title,
$information->ic_type,
$information->ic_title,
$information->ic_content,
$information->ic_summary,
$information->ic_seo_title,
$information->ic_seo_description,
$information->ic_seo_keywords,
$information->ic_show_bread_crumbs,
$information->ic_status,
$information->ic_template,
$information->ic_photo,
$information->ic_photo_width,
$information->ic_photo_height,
$information->ic_recommend_tours,
$information->ic_recommend_packages,
$information->ic_ht_area_id,
$information->ic_ht_area_type,
$information->ic_ht_product_id,
$information->ic_ht_product_type,
$information->ic_author);
$this->echo_json(array(
'status' => 'ok',
'infoId' => $info_id,
'message' => 'success',
'date' => date('Y-m-d h:i:s')
));
$anchor_list = $htm_doc->getElementsByTagName('a');
foreach ($anchor_list as $anchor) {
$a_href = $anchor->getAttribute('href');
echo 'a.href: '.$a_href.'<br>';
$match_result = array();
preg_match('/^http:\/\/www.chinahighlights.com(.*)/', $a_href, $match_result);
$result_count = count($match_result);
if ($result_count == 2) {
$result = '//www.chinahighlights.com'.$match_result[1];
$anchor->setAttribute('href', $result);
echo $result.'<br>';
}
}
// $information->ic_content = $htm_doc->saveHTML();
// $this->InfoContents_model->Update(
// $information->ic_id,
// $information->ic_url,
// $information->ic_url_title,
// $information->ic_type,
// $information->ic_title,
// $information->ic_content,
// $information->ic_summary,
// $information->ic_seo_title,
// $information->ic_seo_description,
// $information->ic_seo_keywords,
// $information->ic_show_bread_crumbs,
// $information->ic_status,
// $information->ic_template,
// $information->ic_photo,
// $information->ic_photo_width,
// $information->ic_photo_height,
// $information->ic_recommend_tours,
// $information->ic_recommend_packages,
// $information->ic_ht_area_id,
// $information->ic_ht_area_type,
// $information->ic_ht_product_id,
// $information->ic_ht_product_type,
// $information->ic_author);
// $this->echo_json(array(
// 'status' => 'ok',
// 'infoId' => $info_id,
// 'message' => 'success',
// 'date' => date('Y-m-d h:i:s')
// ));
}
public function count_http_of_href() {
$data['all_information'] =
$this->Information_model->search_all_text('http://www.chinahighlights.com/', 2000);
echo 'count: '.count($data['all_information']).'<br/>';
}
public function transform_href_to_https() {
$http_host = 'http://www.chinahighlights.com/';
$https_host = 'https://www.chinahighlights.com/';
$data['all_information'] =
$this->Information_model->search_all_text($http_host, 200);
echo 'count: '.count($data['all_information']).'<br/>';
if (empty($data['all_information'])) {
echo 'nothing transform to https';
} else {
foreach ($data['all_information'] as $item) {
if (empty($item->ic_url)) {
echo '<span style="color: red;">['.$item->ic_title .'] ['.$item->ic_url.']</span> <br/>';
continue;
} else {
echo $item->ic_url.' | '.$item->ic_title.'<br/>';
}
$this->Logs_model->backup($item->is_id, $item->ic_content);
$item->ic_content=str_replace($http_host, $https_host, $item->ic_content);
$this->InfoContents_model->Update(
$item->ic_id,
$item->ic_url,
$item->ic_url_title,
$item->ic_type,
$item->ic_title,
$item->ic_content,
$item->ic_summary,
$item->ic_seo_title,
$item->ic_seo_description,
$item->ic_seo_keywords,
$item->ic_show_bread_crumbs,
$item->ic_status,
$item->ic_template,
$item->ic_photo,
$item->ic_photo_width,
$item->ic_photo_height,
$item->ic_recommend_tours,
$item->ic_recommend_packages,
$item->ic_ht_area_id,
$item->ic_ht_area_type,
$item->ic_ht_product_id,
$item->ic_ht_product_type,
$item->ic_author
);
}
}
}
private function echo_json($obj) {

@ -96,7 +96,7 @@ class Index extends CI_Controller {
}
//echo $js_content;
//把网页内容和css提交到purifycss处理
$purifycss_server='http://184.172.113.219:33033/';
$purifycss_server='http://184.172.113.216:33033/';
if(strpos($websitehost, 'chinarundreisen.com') !== false){//德语站点使用自己的css处理服务器
$purifycss_server='http://158.177.67.52:33033/';
}

@ -7,16 +7,16 @@
<meta name="robots" content="noindex,nofollow" />
<title>www.chinatravel.com</title>
<link href="/css/order/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="/css/order/order.css?v=201506052" rel="stylesheet" type="text/css"/>
<link href="/css/order/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css"/>
<link href="//data.chinatravel.com/css/info/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="//data.chinatravel.com/css/info/order.css?v=201506052" rel="stylesheet" type="text/css"/>
<link href="//data.chinatravel.com/css/info/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css"/>
<!--[if lt IE 9]>
<script src="/js/respond.min.js" type="text/javascript"></script>
<![endif]-->
<script src="/js/jquery.min.js" type="text/javascript"></script>
<script src="/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/js/jquery-ui.min.js" type="text/javascript"></script>
<script src="/js/jquery-ui-timepicker-addon.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/jquery.min.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/bootstrap.min.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/jquery-ui.min.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/jquery-ui-timepicker-addon.js" type="text/javascript"></script>
<style type="text/css">
#header {background: #DF6536 !important;}
.text-red{color: #DF6536 !important;}
@ -33,7 +33,7 @@
<div class="row">
<div class="col-lg-3 col-sm-4 logobox hidden-xs" style="top:8px;">
<a href="javascript:void(0);">
<img src="http://www.chinatravel.com/images/chinatravel-logo.png" alt="logo">
<img src="//www.chinatravel.com/images/chinatravel-logo.png" alt="logo">
</a>
</div>
<div class="col-lg-15 col-sm-13 col-lg-offset-3 col-sm-offset-4">
@ -68,7 +68,7 @@
<h4 class="text-center text-red">Thanks for booking with China Travel! </h4>
<h4 class="text-center text-red">Please complete and submit the information below.</h4>
</div>
<form id="form-confirm-info" method="post" action="<?php echo site_url('apps/order/confirm/save_confirm_info'); ?>">
<form id="form-confirm-info" method="post" action="<?php echo '/info.php/apps/order/confirm/save_confirm_info'; ?>">
<div class="col-xs-24 personinfo-box">
<div class="panel panel-default">
<div class="panel-body">
@ -643,7 +643,7 @@ $(document).ready(function(){
data: data,
success: function(json_data) {
if (json_data.status == 'ok') {
location.href='<?php echo site_url('apps/order/confirm/index/0/0/0/ct'); ?>';
location.href='<?php echo '/info.php/apps/order/confirm/index/0/0/0/ct'; ?>';
} else {
$btn.button('reset');
$('#myModal').modal('show');

@ -7,16 +7,16 @@
<meta name="robots" content="noindex,nofollow" />
<title>www.chinatravel.com</title>
<link href="/css/order/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="/css/order/order.css?v=201506052" rel="stylesheet" type="text/css"/>
<link href="/css/order/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css"/>
<link href="//data.chinatravel.com/css/info/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="//data.chinatravel.com/css/info/order.css?v=201506052" rel="stylesheet" type="text/css"/>
<link href="//data.chinatravel.com/css/info/bootstrap-datetimepicker.min.css" rel="stylesheet" type="text/css"/>
<!--[if lt IE 9]>
<script src="/js/respond.min.js" type="text/javascript"></script>
<![endif]-->
<script src="/js/jquery.min.js" type="text/javascript"></script>
<script src="/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/js/jquery-ui.min.js" type="text/javascript"></script>
<script src="/js/jquery-ui-timepicker-addon.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/jquery.min.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/bootstrap.min.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/jquery-ui.min.js" type="text/javascript"></script>
<script src="//data.chinatravel.com/js/info/jquery-ui-timepicker-addon.js" type="text/javascript"></script>
<style type="text/css">
#header {background: #DF6536 !important;}
.text-red{color: #DF6536 !important;}

@ -21,7 +21,7 @@ class PageSpeedData_model extends CI_Model {
public function detail($psd_URL, $psd_SiteCode) {
$this->init();
$this->topnum = 1;
$this->where = ' AND psd.psd_URL=' . $this->INFO->escape($psd_URL);
$this->where = ' AND psd.psd_URL=N' . $this->INFO->escape($psd_URL);
$this->where .= ' AND psd.psd_SiteCode=' . $this->INFO->escape($psd_SiteCode);
return $this->get_list();
}

@ -54,6 +54,7 @@ class search extends CI_Controller{
$this->seveth = 'yes';
}
$url = 'http://139.129.246.118:12309/trainTickets/ticketsAvailable?key='.JUHE_TRAIN_API_KEY.'&train_date='.$train_date.'&from_station='.$fromStation.'&to_station='.$toStation;
$url = JUHE_TRAIN_CX_API.'?key='.JUHE_TRAIN_API_KEY.'&train_date='.$train_date.'&from_station='.$fromStation.'&to_station='.$toStation;
$this->url = $url;
$train_info = $this->get_http($url);
//如果为网络错误就再执行一次

@ -40,6 +40,7 @@
</div>
<div class="col-sm-4">
<button type="button" class="btn btn-primary" onclick="submit_amp_editor();">保存</button>
<a href="http://192.155.224.195:8080/guide-use.php/amp_loader/load/?info_url=<?php echo $information->ic_url ?>" target="_blank">看看</a>
</div>
<div class="col-sm-4"> <button type="button" class="btn btn-default" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'AMP', ''); meta('delete', '<?php echo $information->ic_id; ?>', 'AMP_STATUS', '');">删除</button> </div>
</div>

Loading…
Cancel
Save