From c67b025da97f69dc35cbc9531ae92212460f503c Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 21 Jan 2021 17:17:42 +0800
Subject: [PATCH] =?UTF-8?q?get=5Ftrain=20=E4=BD=BF=E7=94=A8=E8=81=9A?=
 =?UTF-8?q?=E5=90=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trainsystem/controllers/innerTrainSearch.php         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/third_party/trainsystem/controllers/innerTrainSearch.php b/application/third_party/trainsystem/controllers/innerTrainSearch.php
index 55a1dd8d..41574b7f 100644
--- a/application/third_party/trainsystem/controllers/innerTrainSearch.php
+++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php
@@ -49,7 +49,7 @@ class innerTrainSearch extends CI_Controller{
 	}
 
 	//聚合数据接口
-	public function juheApi($train_date=null,$fromStation=null,$toStation=null){
+	public function juheApi($train_date=null,$fromStation=null,$toStation=null,$return=false){
 		//定义一些变量
 		$flag = true;
 		$juheTrainInfo = '';
@@ -83,7 +83,12 @@ class innerTrainSearch extends CI_Controller{
 			//我们的接口相应时间
 			$responsive_time = $end_time - $this->start_time;
 			log_message('error','TRAINSPEED|请求url:'.$this->url.'|聚合相应时间:'.$api_responsive_time.'s|接口运行时间:'.$responsive_time.'s|+7天:'.$this->seveth);
-			print_r($trainjson);
+
+			if($return){
+				return ($trainjson);
+			}else{
+				echo ($trainjson);
+			}
 
 		}
 	}