From 825de1250c1b06e4a90e98066a69d3a2693235db Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 21 Jun 2019 14:01:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?TA=E6=8A=93=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=81=AB=E8=BD=A6=E6=8A=93=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/tripadvisor_spider/config/config.php | 3 ++- .../third_party/tripadvisor_spider/views/third_party_input.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/application/third_party/tripadvisor_spider/config/config.php b/application/third_party/tripadvisor_spider/config/config.php index 3b452f64..f0ebde2c 100644 --- a/application/third_party/tripadvisor_spider/config/config.php +++ b/application/third_party/tripadvisor_spider/config/config.php @@ -21,7 +21,8 @@ $config['tripadvisor_website'] = array( 'tp_Beijing' => 'https://www.tripadvisor.com/Attraction_Review-g294212-d4006739-Reviews{PAGENUM}-The_Trippest_Mini_Group_Tours-Beijing.html', 'tp_Xian' => 'https://www.tripadvisor.com/Attraction_Review-g298557-d10999897-Reviews{PAGENUM}-Xi_an_Trippest_Mini_Group_Tours-Xi_an_Shaanxi.html', 'tp_Shanghai' => 'https://www.tripadvisor.com/Attraction_Review-g308272-d6222868-Reviews{PAGENUM}-Shanghai_Trippest_Mini_Group_Tours-Shanghai.html', - 'tp_Guilin' => 'https://www.tripadvisor.com/Attraction_Review-g298556-d14121459-Reviews{PAGENUM}-Trippest_Mini_Group_Tours-Guilin_Guangxi.html' + 'tp_Guilin' => 'https://www.tripadvisor.com/Attraction_Review-g298556-d14121459-Reviews{PAGENUM}-Trippest_Mini_Group_Tours-Guilin_Guangxi.html', + 'train' => 'https://www.tripadvisor.com/Attraction_Review-g298556-d16700226-Reviews-Train_Spread-Guilin_Guangxi.html' ); diff --git a/application/third_party/tripadvisor_spider/views/third_party_input.php b/application/third_party/tripadvisor_spider/views/third_party_input.php index eb84da06..dbf0ce3b 100644 --- a/application/third_party/tripadvisor_spider/views/third_party_input.php +++ b/application/third_party/tripadvisor_spider/views/third_party_input.php @@ -76,6 +76,7 @@ +
From 99996c1a7f02c0c47e29741415a83b17d29c792d Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 21 Jun 2019 14:08:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/tripadvisor_spider/views/third_party_input.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/third_party/tripadvisor_spider/views/third_party_input.php b/application/third_party/tripadvisor_spider/views/third_party_input.php index dbf0ce3b..aa4caea8 100644 --- a/application/third_party/tripadvisor_spider/views/third_party_input.php +++ b/application/third_party/tripadvisor_spider/views/third_party_input.php @@ -101,6 +101,7 @@ +
From 223636b7418b6c312f69d39527327826f03c29d6 Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 21 Jun 2019 14:52:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=BA=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/controllers/addorders.php | 8 ++++++-- application/third_party/trainsystem/controllers/pages.php | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index e4316a86..69a4ebcd 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -544,14 +544,15 @@ class addorders extends CI_Controller{ $OrderNumber = ORDERUSER.time(); //拼接发送的报文 $PostData = array(); - $TimeStamp = time(); - $time = date('Y-m-d H:i:s',$TimeStamp); + $time = date('Y-m-d H:i:s',time()); + $PostData['Authentication'] = new stdClass(); $PostData['Authentication']->TimeStamp = $time; $PostData['Authentication']->ServiceName = 'order.PartnerAddOrder'; $PostData['Authentication']->PartnerName = ORDERUSER; $MessageIdentity = md5($time.'order.PartnerAddOrder'.ORDERKEY); $PostData['Authentication']->MessageIdentity = $MessageIdentity; + $PostData['TrainOrderService'] = new stdClass(); $PostData['TrainOrderService']->PartnerName = ORDERUSER; $PostData['TrainOrderService']->Operation = ''; $PostData['TrainOrderService']->OrderType = '电子'; @@ -559,12 +560,14 @@ class addorders extends CI_Controller{ $PostData['TrainOrderService']->OrderNumber = $OrderNumber; $PostData['TrainOrderService']->ChannelName = ORDERUSER; + $PostData['TrainOrderService']->Order = new stdClass(); $PostData['TrainOrderService']->Order->OrderTime = $time; $PostData['TrainOrderService']->Order->OrderMedia = 'pc'; $PostData['TrainOrderService']->Order->Insurance = 'N'; $PostData['TrainOrderService']->Order->Invoice = 'N'; $PostData['TrainOrderService']->Order->PrivateCustomization = '0'; + $PostData['TrainOrderService']->Order->TicketItem = new stdClass(); $PostData['TrainOrderService']->Order->TicketItem->FromStationName = $data['train']->DepartAirport_cn; $PostData['TrainOrderService']->Order->TicketItem->ToStationName = $data['train']->ArrivalAirport_cn; $PostData['TrainOrderService']->Order->TicketItem->TicketTime = date('Y-m-d H:i:s',strtotime($data['train']->DepartureTime)); @@ -640,6 +643,7 @@ class addorders extends CI_Controller{ $PostData['TrainOrderService']->Order->FrontSeatFlag = '0'; + $PostData['TrainOrderService']->Order->User = new stdClass(); $PostData['TrainOrderService']->Order->User->UserID = ''; $PostData['TrainOrderService']->Order->User->UserName = 'guilintravel'; $PostData['TrainOrderService']->Order->User->userLoginName = 'guilintravel'; diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php index cb1715b6..7873735c 100644 --- a/application/third_party/trainsystem/controllers/pages.php +++ b/application/third_party/trainsystem/controllers/pages.php @@ -14,9 +14,9 @@ class pages extends CI_Controller{ } public function index($coli_id = null){ - if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ + /*if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); - } + }*/ if($coli_id == null){ $cols_id = $this->input->post("ht_order"); From 809bf011edb2f940c8c81e35c04c6d2d2dd48b90 Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 21 Jun 2019 14:54:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=93=E5=BC=80=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/controllers/pages.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php index 7873735c..cb1715b6 100644 --- a/application/third_party/trainsystem/controllers/pages.php +++ b/application/third_party/trainsystem/controllers/pages.php @@ -14,9 +14,9 @@ class pages extends CI_Controller{ } public function index($coli_id = null){ - /*if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ + if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); - }*/ + } if($coli_id == null){ $cols_id = $this->input->post("ht_order");