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

hotfix/远程访问多媒体中心
cyc 7 years ago
commit 20d4bdd5b2

@ -108,8 +108,7 @@ class Amp extends CI_Controller
$this->InfoMetas_model->update($ic_id, 'AMP_STATUS', $amp_status);
}
$data[] = array('name' => 'ok', 'value' => $this->lang->line('form_info_success'));
echo json_encode($data);
echo json_encode(array('name' => 'ok', 'value' => $this->lang->line('form_info_success')));
}
}

@ -66,17 +66,23 @@ class Welcome extends CI_Controller {
}
//获取所有信息URL,用来批量静态化更新
public function create_all_urls() {
public function create_all_urls($view=false) {
set_time_limit(0);
$this->output->enable_profiler(false);
$data['all_information'] = $this->Information_model->GetList('ic_status,ic_url,ic_sitecode');
$data['all_information'] = $this->Information_model->GetList('ic_status,ic_id,ic_url,ic_sitecode');
if ($view == 'amp') {
$this->load->view('bootstrap3/header', $data);
$this->load->view('bootstrap3/refresh_amp_urls');
$this->load->view('bootstrap3/footer');
} else {
$this->load->view('bootstrap/header', $data);
$this->load->view('bootstrap/cache_url', $data);
$this->load->view('bootstrap/footer');
}
}
//获取某个信息节点和子节点url
public function create_infomation_urls($is_parent_id) {
public function create_infomation_urls($is_parent_id, $view = false) {
$this->output->enable_profiler(FALSE);
$structure = $this->InfoStructures_model->Detail($is_parent_id);
if (empty($structure)) {
@ -84,10 +90,16 @@ class Welcome extends CI_Controller {
return false;
}
$data['all_information'] = $this->Information_model->get_list_by_path($structure->is_path);
if ($view == 'amp') {
$this->load->view('bootstrap3/header', $data);
$this->load->view('bootstrap3/refresh_amp_urls');
$this->load->view('bootstrap3/footer');
} else {
$this->load->view('bootstrap/header', $data);
$this->load->view('bootstrap/cache_url', $data);
$this->load->view('bootstrap/footer');
}
}
public function get_infomation_urls($is_parent_id) {
$this->output->enable_profiler(FALSE);
@ -186,7 +198,6 @@ class Welcome extends CI_Controller {
// $information->ic_ht_product_id,
// $information->ic_ht_product_type,
// $information->ic_author);
// $this->echo_json(array(
// 'status' => 'ok',
// 'infoId' => $info_id,
@ -196,8 +207,7 @@ class Welcome extends CI_Controller {
}
public function count_redirect_nofollow() {
$include_redirece_info =
$this->Information_model->search_all_text('&t=78002', 2000);
$include_redirece_info = $this->Information_model->search_all_text('&t=78002', 2000);
echo 'redirect count: ' . count($include_redirece_info) . '<br/>';
$redirect_nofollow_list = array();
$htm_doc = new DOMDocument();
@ -245,29 +255,7 @@ class Welcome extends CI_Controller {
$this->Logs_model->backup($info->is_id, $info->ic_content);
$info->ic_content = $htm_doc->saveHTML();
$this->InfoContents_model->Update(
$info->ic_id,
$info->ic_url,
$info->ic_url_title,
$info->ic_type,
$info->ic_title,
$info->ic_content,
$info->ic_summary,
$info->ic_seo_title,
$info->ic_seo_description,
$info->ic_seo_keywords,
$info->ic_show_bread_crumbs,
$info->ic_status,
$info->ic_template,
$info->ic_photo,
$info->ic_photo_width,
$info->ic_photo_height,
$info->ic_recommend_tours,
$info->ic_recommend_packages,
$info->ic_ht_area_id,
$info->ic_ht_area_type,
$info->ic_ht_product_id,
$info->ic_ht_product_type,
$info->ic_author);
$info->ic_id, $info->ic_url, $info->ic_url_title, $info->ic_type, $info->ic_title, $info->ic_content, $info->ic_summary, $info->ic_seo_title, $info->ic_seo_description, $info->ic_seo_keywords, $info->ic_show_bread_crumbs, $info->ic_status, $info->ic_template, $info->ic_photo, $info->ic_photo_width, $info->ic_photo_height, $info->ic_recommend_tours, $info->ic_recommend_packages, $info->ic_ht_area_id, $info->ic_ht_area_type, $info->ic_ht_product_id, $info->ic_ht_product_type, $info->ic_author);
}
}
@ -275,8 +263,7 @@ class Welcome extends CI_Controller {
}
public function count_http_of_href() {
$data['all_information'] =
$this->Information_model->search_all_text('http://www.chinahighlights.com/', 2000);
$data['all_information'] = $this->Information_model->search_all_text('http://www.chinahighlights.com/', 2000);
echo 'count: ' . count($data['all_information']) . '<br/>';
var_dump($data['all_information']);
}
@ -284,8 +271,7 @@ class Welcome extends CI_Controller {
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);
$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';
@ -302,29 +288,7 @@ class Welcome extends CI_Controller {
$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
$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
);
}
}
@ -336,7 +300,6 @@ class Welcome extends CI_Controller {
->set_output(json_encode($obj));
}
//批量替换二级域名如图片或者data域名
function replace_hostname($topnum) {
$data = array();
@ -348,29 +311,7 @@ class Welcome extends CI_Controller {
echo $item->ic_url . '<br/>';
$item->ic_content = str_replace($find_host, $new_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
$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
);
}
} else {

@ -34,6 +34,21 @@ class InfoMetas_model extends CI_Model {
return $query->result();
}
function get_list_by_key($im_key) {
$sql = "
SELECT im.im_id
,im.im_ic_id
,im.im_key
,im.im_value
FROM infoMetas im
WHERE im.im_ic_id = ?
AND im.im_key = ?
ORDER BY im.im_id ASC
";
$query = $this->HT->query($sql, array($im_ic_id, $im_key));
return $query->result();
}
//列表所有含AMPmeta的信息。
public function list_amp($site_code) {
$sql = "

@ -42,6 +42,7 @@
<li><a href="<?php echo site_url('sendmail') ?>" >订单邮件管理</a> </li>
<li><a href="http://share.chtcdn.com/info.php/infoshare/" target="_blank" >信息分享平台</a> </li>
<li><a href="<?php echo site_url('welcome/create_all_urls') ?>" target="_blank" >全站静态化更新</a> </li>
<li><a href="<?php echo site_url('welcome/create_all_urls/amp') ?>" target="_blank" >全站AMP更新</a> </li>
<li class="divider"></li>

@ -525,7 +525,10 @@
<ul id="treeDemo" name="treeDemo" class="ztree" style="height:1035px;overflow-x:auto;"></ul>
<ul class="nav nav-list">
<li class="nav-header"><a href="<?php echo site_url('welcome/create_infomation_urls/' . $information->is_id); ?>" target="_blank"><i class="text-muted glyphicon glyphicon-retweet"></i></a></li>
<li class="nav-header">
<a href="<?php echo site_url('welcome/create_infomation_urls/' . $information->is_id); ?>" target="_blank" class="col-sm-5" title="批量更新静态化页面"><i class="text-muted glyphicon glyphicon-retweet"></i></a>
<a href="<?php echo site_url('welcome/create_infomation_urls/' . $information->is_id . '/amp'); ?>" target="_blank" class="col-sm-5" title="批量更新AMP页面"><i class="glyphicon glyphicon-flash"></i></a>
</li>
</ul>
</div>
@ -567,7 +570,8 @@
<?php } ?>
</div>
<div class="col-xs-24">
<input class="form-control" type="text" id="ic_title" style="<?php if ($embody == 1) {
<input class="form-control" type="text" id="ic_title" style="<?php
if ($embody == 1) {
echo 'border-color:green;';
}
?>" name="ic_title" value="<?php echo $information->ic_title; ?>" >
@ -762,7 +766,8 @@ if (!empty($setting_website_nav)) {
</select>
</div>
<div class="col-sm-5 <?php if ($information->ic_ht_area_type != 'c') {
<div class="col-sm-5 <?php
if ($information->ic_ht_area_type != 'c') {
echo 'hidden';
}
?>">
@ -818,11 +823,11 @@ if ($information->ic_ht_area_type == 'c') {
</div>
<?php // 有子节点时
<?php
// 有子节点时
$children_cnt = 0;
foreach ($informationList as $kin => $vin) {
if (in_array($information->is_id, explode(",", $vin->is_path))
&& $vin->status==1 && $vin->id != $information->is_id
if (in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id
) {
$children_cnt ++;
}
@ -1271,7 +1276,8 @@ foreach ($author_list as $author_item) {
<!-- <a href="javascript:void();" class="btn btn-sm" id="goto_validator_button" target="_blank" onclick="goto_validator();" >HTML规范验证</a> -->
</p>
<div class="btn-group col-xs-24 nopadding pull-right <?php if ($is_writeable == 0) {
<div class="btn-group col-xs-24 nopadding pull-right <?php
if ($is_writeable == 0) {
echo 'hide';
}
?>">
@ -1280,7 +1286,8 @@ foreach ($author_list as $author_item) {
if (editor.html() != '' && editor.text() == '') {
alert('当前信息内容只包含空白标签请在编辑器HTML界面把空白代码标签去掉再保存');
return false;
};
}
;
//保存增加AMP判断 - lmr
<?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS')) { ?>
var amp_confirm = window.confirm('\n检测到页面存在AMP版本是否需要打开AMP编辑界面\n\r注意如果修改了PC端版本那么同时也需要修改AMP版本。\n');

@ -0,0 +1,104 @@
<script language="javascript">
function batch_update_amp(index) {
var ic_id = $('#cache_ic_id_' + index).val();
var msg_obj = "#cache" + index;
var amp_code = '';
$(msg_obj).html("\u7a0d\u7b49...");
$.ajax({
type: "get",
dataType: "json",
url: "<?php echo site_url('amp/auto_create/') ?>/" + ic_id,
success: function (result, textStatus) {
$.each(result, function (i, field) {
if (i === 'data') {
amp_code = field.amp;
}
});
$(msg_obj).html("\u0041\u004d\u0050\u8f6c\u6362\u6210\u529f\u0021\u6b63\u5728\u4fdd\u5b58\u2026\u2026");
//保存转换的AMP代码 begin
$.ajax({
type: "post",
dataType: "json",
url: "<?php echo site_url('amp/edit_save/') ?>",
data: {
"ic_id": ic_id,
"textarea_htmlcode": amp_code,
"amp_status": 1
},
success: function (result, textStatus) {
$(msg_obj).html("\u0041\u004d\u0050\u66f4\u65b0\u6210\u529f\u0021");
create_amp_data(++index);
},
error: function () {
$(msg_obj).html("<a href='javascript:void(0);' onclick='create_amp_data(" + index + ");' >发生错误,请重试</a>");
create_amp_data(++index);
}
});
//保存转换的AMP代码 end
},
error: function () {
$(msg_obj).html("<a href='javascript:void(0);' onclick='create_amp_data(" + index + ");' >发生错误,请重试</a>");
create_amp_data(++index);
}
});
}
function create_amp_data(index) {
if ($('#cache_url' + index).length > 0) {
if ($('#cache' + index).html() !== '\u0041\u004d\u0050\u66f4\u65b0\u6210\u529f\u0021') {
batch_update_amp(index);
}
}
}
</script>
<div class="container-fluid">
<div class="row">
<div class="col-sm-4">
</div>
<div class="col-sm-16">
<table class="table table-striped">
<thead>
<tr>
<th class="col-sm-2">#</th>
<th class="col-sm-18">URL</th>
<th class="col-sm-4">更新进度</th>
</tr>
</thead>
<tbody>
<?php
$i = 0;
foreach ($all_information as $key => $info) {
if ($info->ic_status == 1 && !empty($info->ic_url)) {
$i++;
?>
<tr>
<td><?php echo $i; ?></td>
<td id="cache_url<?php echo $i; ?>" name="cache_url<?php echo $i; ?>" class="cache_url"><?php echo $info->ic_url; ?></a></td>
<td id="cache<?php echo $i; ?>" name="cache<?php echo $i; ?>"><i class="icon-refresh"></i></td>
<input type="hidden" id="cache_ic_id_<?php echo $i; ?>" value="<?php echo $info->ic_id; ?>" />
</tr>
<?php
}
}
?>
</tbody>
</table>
</div>
<div class="col-sm-4">
<a href="javascript:void(0);" class="btn btn-danger" onclick="batch_update_amp(1);">开始更新</a>
</div>
</div>
</div>
Loading…
Cancel
Save