From 944eed3168062421d8b567e32ad473de57b6c4e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 16 Apr 2020 15:02:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CT=E7=AB=99=E5=8A=A0=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php           | 4 ++++
 application/views/bootstrap3/information_edit.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index db243338..89ee7944 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -451,6 +451,8 @@ class Information extends CI_Controller
                 $update_info_log = $this->update_cache($ic_url);
             } else if (strcasecmp($site_code, "cht") != 0 && strcasecmp($site_code, "gm") != 0 && strcasecmp($site_code, "ah") != 0) { //非cht站点并且非GM并且非AH
                 $update_info_log = $this->update_cache($ic_url);
+            }else if (strcasecmp($site_code, "ct") == 0 && !empty($auto_update_cache)) {
+                $update_info_log = $this->update_cache($ic_url);
             }
 
             if (empty($update_info_log) || count($update_info_log) == 0 || !isset($update_info_log[0]['url'])) {
@@ -612,6 +614,8 @@ class Information extends CI_Controller
                 break;
 
             case 'ct': //子站点使用
+                $url =  'http://50.97.246.187:22223' . $url;
+                break;
             case 'sht':
             case 'gl':
             case 'mbj':
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 86b498af..21dd522d 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -1472,7 +1472,7 @@ foreach ($author_list as $author_item) {
             <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
           </label>
           <div class="clearfix"></div>
-          <?php if (in_array($this->config->item('site_code'), array('cht', 'gm','ah'))) {?>
+          <?php if (in_array($this->config->item('site_code'), array('cht', 'gm','ah','ct'))) {?>
             <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
               <input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox" onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新
             </label>

From f791f4a8a7e4808f126e22559a601d80c34ed669 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Tue, 21 Apr 2020 14:03:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/trainsystem/controllers/api.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php
index 94765fb8..fc1c9598 100644
--- a/application/third_party/trainsystem/controllers/api.php
+++ b/application/third_party/trainsystem/controllers/api.php
@@ -193,11 +193,10 @@ class api extends CI_Controller{
 				if(!empty($obj)){
 					$coli_id = $obj[0]->COLI_ID;
 					$coli_sn = $obj[0]->COLI_SN;
+					$this->BIZ_train_model->linkTrackingCode($coli_sn,$trackcode);
 				}else{
 					echo $juhe_order;	
 				}
-                
-				$this->BIZ_train_model->linkTrackingCode($coli_sn,$trackcode);
 				
 				/*if(empty($coli_sn) || empty($coli_sn)){
 					print_r($juhe_order);