From 6f4738cf63112bfb3300728fed2e618a9f576df3 Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 7 Dec 2018 10:18:38 +0800 Subject: [PATCH 01/91] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=A7=E4=BD=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctrip/controllers/ctrip_train.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index 05983890..a8ac8e30 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -125,7 +125,7 @@ class ctrip_train extends CI_Controller{ if($Seats->SeatName == '软座'){ $rzPrice = $Seats->Price * 10; - $SeaType .= '"4":"'.$rzPrice.'","A4":"¥'.$Seats->Price.'",'; + $SeaType .= '"2":"'.$rzPrice.'","A2":"¥'.$Seats->Price.'",'; $rzNum = $Seats->TicketLeft; } From 2db85207858d73588cfd93e813c79596f2d996da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 12 Dec 2018 16:07:22 +0800 Subject: [PATCH 02/91] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E5=86=99=E5=85=A5session=E5=AF=BC=E8=87=B4CDN?= =?UTF-8?q?=E5=88=86=E5=8F=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 9 +-------- application/views/information_edit.php | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index cfead29f..56c36a15 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -20,8 +20,6 @@ class Information extends CI_Controller { $this->load->model('Infoauthors_model'); $this->load->model('InfoSMS_model'); $this->load->library('Amplib'); //加载AMP处理类 - $this->load->library('Accesscheck'); - $this->accesscheck->check_access(); } public function index() { @@ -144,12 +142,7 @@ class Information extends CI_Controller { } //查询结构列表信息 - //$data['informationList'] = $this->Information_model->StructureList($rootStructure_ID); - $data['informationList'] = $this->accesscheck->get_info_structure($rootStructure_ID); - if (!$data['informationList']) { - redirect(site_url('Login/refuse')); - } - $data['is_writeable'] = $this->accesscheck->get_edit_type($Structure->is_path); + $data['informationList'] = $this->Information_model->StructureList($rootStructure_ID); //增加一项，属于这个区域，但是结构数据层次不准确的也要列出来 //todo: diff --git a/application/views/information_edit.php b/application/views/information_edit.php index ceca7eb7..2017ff17 100644 --- a/application/views/information_edit.php +++ b/application/views/information_edit.php @@ -1043,7 +1043,7 @@

-
+
保存修改 +

静态化更新

+
+
+ +

静态页面更新完成，请打开页面检查。

+ +
+
+ + 更新 +
+
+ + + diff --git a/js/information-system.min.js b/js/information-system.min.js index ad46f5ce..a54ed951 100644 --- a/js/information-system.min.js +++ b/js/information-system.min.js @@ -295,7 +295,17 @@ function successfun(responseText, statusText, xhr, form) { $.modaldialog.success(responseText[key].value + "n" + "\u9759\u6001\u9875\u9762\u66f4\u65b0\u4e2d..."); updateCache($("#auto_update_cache_checkbox").val(), "") } else { - $.modaldialog.success(responseText[key].value) + var update_info_log = responseText[key].update_info_log; + if (update_info_log && update_info_log.async_update) { + //国际站使用异步更新缓存 + $('#icht_async_modal').modal('show'); + $.get(update_info_log.async_update, function() { + $('#icht_async_msg_waiting').slideDown(400); + $('#icht_async_msg_success').slideUp(400); + }); + } else { + $.modaldialog.success(responseText[key].value) + } } } else { if (responseText[key].name == "ok_go") { From 9ba62dcb634a4a96ecfd330586462df8cdbddec1 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 19:16:44 +0800 Subject: [PATCH 61/91] icht async --- application/controllers/information.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 768b0fa6..a296bafa 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -534,6 +534,7 @@ class Information extends CI_Controller { case 'it': case 'ru': case 'jp': + $data['async_update'] = $url; if ($delete_only) { //只删除操作，在url修改和不发布信息的时候使用 $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; @@ -554,9 +555,9 @@ class Information extends CI_Controller { $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/?static_html_url=' . $tmp; } //int return direct - /* $cache_url = $this->input->post('cache_url'); if ($url && !$cache_url) { + /* ignore_user_abort(true); $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); @@ -569,7 +570,8 @@ class Information extends CI_Controller { curl_setopt($ch, CURLOPT_NOBODY, 1); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); curl_exec($ch); - curl_close($ch); + curl_close($ch); + */ $data[] = array('name' => 'ok', 'value' => '信息保存成功，请在8秒后检查更新页面。', 'url' => $url); //如果是外部调用就返回结果，内部就不返回了 if ($cache_url) { @@ -577,9 +579,7 @@ class Information extends CI_Controller { } return $data; } - */ } - $data['async_update'] = $url; break; case 'ct'://子站点使用 From cc27a31f972442e1792f19f8fbb8a11032966b7c Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 19:18:10 +0800 Subject: [PATCH 62/91] icht async 2 --- application/views/bootstrap3/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index c5a0b78a..694ee0ac 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -5,7 +5,7 @@ 信息平台 - + From 7779ff318167931c60fb744c256eee10072ac530 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 19:25:29 +0800 Subject: [PATCH 63/91] icht async 3 --- application/views/bootstrap3/footer.php | 4 ++-- application/views/bootstrap3/header.php | 2 +- js/information-system3.min.js | 12 +++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/application/views/bootstrap3/footer.php b/application/views/bootstrap3/footer.php index 880f2219..7eea2b49 100644 --- a/application/views/bootstrap3/footer.php +++ b/application/views/bootstrap3/footer.php @@ -44,8 +44,8 @@
-

静态页面更新完成，请打开页面检查。

- + +

静态页面更新完成，请打开页面检查。

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 694ee0ac..bfe324c4 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -5,7 +5,7 @@ 信息平台 - + diff --git a/js/information-system3.min.js b/js/information-system3.min.js index ebfa2f5d..d5ee3b50 100644 --- a/js/information-system3.min.js +++ b/js/information-system3.min.js @@ -307,7 +307,17 @@ function errorfun(responseText, statusText, xhr, form) { function successfun(responseText, statusText, xhr, form) { for (var key in responseText) { if (responseText[key].name == "ok") { - $.modaldialog.success(responseText[key].value) + var update_info_log = responseText[key].update_info_log; + if (update_info_log && update_info_log.async_update) { + //国际站使用异步更新缓存 + $('#icht_async_modal').modal('show'); + $.get(update_info_log.async_update, function() { + $('#icht_async_msg_waiting').slideUp(400); + $('#icht_async_msg_success').slideDown(400); + }); + } else { + $.modaldialog.success(responseText[key].value); + } } else { if (responseText[key].name == "ok_go") { $.modaldialog.success('提交成功，正在跳转到下个页面...'); From 9f475026fe757dd1c75b8f38b1065048bdef71e1 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 19:29:58 +0800 Subject: [PATCH 64/91] icht async 4 --- application/controllers/information.php | 2 +- application/views/bootstrap3/footer.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index a296bafa..352fe242 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -534,7 +534,6 @@ class Information extends CI_Controller { case 'it': case 'ru': case 'jp': - $data['async_update'] = $url; if ($delete_only) { //只删除操作，在url修改和不发布信息的时候使用 $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; @@ -572,6 +571,7 @@ class Information extends CI_Controller { curl_exec($ch); curl_close($ch); */ + $data['async_update'] = $url; $data[] = array('name' => 'ok', 'value' => '信息保存成功，请在8秒后检查更新页面。', 'url' => $url); //如果是外部调用就返回结果，内部就不返回了 if ($cache_url) { diff --git a/application/views/bootstrap3/footer.php b/application/views/bootstrap3/footer.php index 7eea2b49..96734551 100644 --- a/application/views/bootstrap3/footer.php +++ b/application/views/bootstrap3/footer.php @@ -49,8 +49,6 @@
- 更新
From 6d48edc95815e822655ca9d1695a5ff45df9bd09 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 19:32:19 +0800 Subject: [PATCH 65/91] icht async 5 --- application/views/bootstrap3/footer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/bootstrap3/footer.php b/application/views/bootstrap3/footer.php index 96734551..630abc86 100644 --- a/application/views/bootstrap3/footer.php +++ b/application/views/bootstrap3/footer.php @@ -43,9 +43,9 @@

静态化更新

- - -

静态页面更新完成，请打开页面检查。

+ +

正在更新静态页面，请稍等8~10秒。

+
From cc0cf301012cde3dd591123654cc75f898e7d3a8 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 19:37:59 +0800 Subject: [PATCH 66/91] icht async 6 --- application/views/bootstrap3/header.php | 2 +- js/information-system3.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index bfe324c4..dff4dc1f 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -5,7 +5,7 @@ 信息平台 - + diff --git a/js/information-system3.min.js b/js/information-system3.min.js index d5ee3b50..dd148325 100644 --- a/js/information-system3.min.js +++ b/js/information-system3.min.js @@ -311,7 +311,7 @@ function successfun(responseText, statusText, xhr, form) { if (update_info_log && update_info_log.async_update) { //国际站使用异步更新缓存 $('#icht_async_modal').modal('show'); - $.get(update_info_log.async_update, function() { + $.get(update_info_log.async_update,{"r": new Date().getTime()}, function() { $('#icht_async_msg_waiting').slideUp(400); $('#icht_async_msg_success').slideDown(400); }); From 0b0e056bc75da569170442629046371bd1b3c595 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 20:28:26 +0800 Subject: [PATCH 67/91] icht async 7 --- application/views/bootstrap3/footer.php | 12 +++++++++--- application/views/bootstrap3/header.php | 2 +- js/information-system3.min.js | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/application/views/bootstrap3/footer.php b/application/views/bootstrap3/footer.php index 630abc86..ea4ddaf9 100644 --- a/application/views/bootstrap3/footer.php +++ b/application/views/bootstrap3/footer.php @@ -43,9 +43,15 @@

静态化更新

- -

正在更新静态页面，请稍等8~10秒。

- + +
+

正在更新静态页面，请稍等8~10秒。

+ +
+
+

静态页面更新成功，请打开页面检查。

+ +
diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index dff4dc1f..210ad913 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -5,7 +5,7 @@ 信息平台 - + diff --git a/js/information-system3.min.js b/js/information-system3.min.js index dd148325..a24fa13d 100644 --- a/js/information-system3.min.js +++ b/js/information-system3.min.js @@ -293,6 +293,9 @@ function information_check() { return true } function submitForm(form) { + //国际站使用异步更新缓存 + $('#icht_async_msg_waiting').show(); + $('#icht_async_msg_success').hide(); $("#" + form).ajaxSubmit({ success: successfun, error: errorfun, From 3c2f7395e4dfe7db172f7b27efd2298045f65045 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Sun, 20 Jan 2019 20:38:05 +0800 Subject: [PATCH 68/91] icht async 100% --- application/views/bootstrap3/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/footer.php b/application/views/bootstrap3/footer.php index ea4ddaf9..603a9dc4 100644 --- a/application/views/bootstrap3/footer.php +++ b/application/views/bootstrap3/footer.php @@ -45,7 +45,7 @@
-

正在更新静态页面，请稍等8~10秒。

+

正在更新静态页面，请稍等8~12秒。

From 0286c1a54b1bcf46b5a5e5d25ea47aa23d09dc18 Mon Sep 17 00:00:00 2001 From: Leiyuanting Date: Mon, 21 Jan 2019 10:02:17 +0800 Subject: [PATCH 69/91] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ctrip=5Fhelper.php:?= =?UTF-8?q?=20LYT:=20=E4=BF=AE=E6=94=B9useragent=E7=9A=84=E5=AE=B9?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctrip/helpers/ctrip_helper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/third_party/ctrip/helpers/ctrip_helper.php b/application/third_party/ctrip/helpers/ctrip_helper.php index fe9c072d..b84711e4 100644 --- a/application/third_party/ctrip/helpers/ctrip_helper.php +++ b/application/third_party/ctrip/helpers/ctrip_helper.php @@ -49,11 +49,15 @@ //发送请求函数 function post_ctrip($url, $data = '', $method = 'GET') { + $user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"; + if(isset($_SERVER['HTTP_USER_AGENT'])) { + $user_agent = $_SERVER['HTTP_USER_AGENT']; + } $curl = curl_init(); // 启动一个CURL会话 curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址 curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 - curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器 + curl_setopt($curl, CURLOPT_USERAGENT, $user_agent); // 模拟用户使用的浏览器 curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转 curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer if ($method == 'POST' && !empty($data)) { From cdf235d04f488753adb490c255580a3bcc089669 Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 22 Jan 2019 14:29:02 +0800 Subject: [PATCH 70/91] =?UTF-8?q?=E7=81=AB=E8=BD=A6=E4=B8=AD=E8=BD=AC?= =?UTF-8?q?=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctrip/controllers/ctrip_train.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index 0697dca2..7f818f37 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -294,8 +294,8 @@ class ctrip_train extends CI_Controller{ $ResponseJson = post_ctrip($url,'','GET'); - $ResponseData = json_decode($ResponseJson); - print_r($ResponseData); + //$ResponseData = json_decode($ResponseJson); + print_r($ResponseJson); } } } \ No newline at end of file From f132ea17e3fe3c38898ea071a299979691fca96d Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 24 Jan 2019 17:04:09 +0800 Subject: [PATCH 71/91] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=9A=84og:title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/bootstrap3/information_edit.php | 23 ++++++++++++++----- js/information-system3.min.js | 20 ++++++++++++++++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 511c8a47..d9c2b9f2 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -435,6 +435,7 @@ change_seo_count('ic_seo_title'); change_seo_count('ic_seo_description'); change_seo_count('meta_note'); + change_seo_count('meta_note_ogtitle'); init_recommend_popover("#meta_recommend_info", ".meta_recommend_info_box"); init_recommend_popover("#meta_related_info", ".meta_related_info_box"); @@ -548,9 +549,9 @@ ?> | + | | @@ -872,13 +873,23 @@
- + + + @@ -1271,7 +1282,7 @@ 静态更新 - + config->item('site_code'),array('cht','ah','gm'))) { ?>