Merge branch 'master' of git.mycht.cn:developers/information-system

application/config/config.php

@@ -364,7 +364,7 @@ $config['proxy_ips'] = '';
 //各站信息组和人员权限分配
 $config['site'] = array(
     'cht' => array('site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => '//images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin', 'sw', 'zl', 'wbl', 'yqw', 'lf', 'zhm', 'pkl'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,v,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,zl,syt,gavin,zm,htc,yqw,bhn,lmj,wbl,yqw,LYY,zhm,'),
-    'gm' => array('site_code' => 'gm', 'site_id' => 22, 'site_lgc' => '4', 'site_url' => 'http://www.chinarundreisen.com', 'site_image_url' => '//bilder.chinarundreisen.com', 'site_authors' => array('DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'), 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'),
+    'gm' => array('site_code' => 'gm', 'site_id' => 22, 'site_lgc' => '4', 'site_url' => 'https://www.chinarundreisen.com', 'site_image_url' => '//bilder.chinarundreisen.com', 'site_authors' => array('DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'), 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'),
     'vc' => array('site_code' => 'vc', 'site_id' => 30, 'site_lgc' => '5', 'site_url' => 'https://www.voyageschine.com', 'site_image_url' => '//images.voyageschine.com', 'site_authors' => array('JE', 'kq', 'lya', 'lyz', 'zyh'), 'site_user' => ',ycc,lmr, zyh,JE,htc,kq,lya,bhn,Tony,zyh,B,J,lyz,LYY,'),
     'jp' => array('site_code' => 'jp', 'site_id' => 88, 'site_lgc' => '3', 'site_url' => 'https://www.arachina.com', 'site_image_url' => '//images.arachina.com', 'site_authors' => array('hql', 'LLM', 'SHX', 'lmr', 'zyh', 'zb'), 'site_user' => ',ycc,lmr, zyh,hql,LLM,SHX,htc,zpl,Tony,zyh,J,B,zb,LYY,'),
     'vac' => array('site_code' => 'vac', 'site_id' => 95, 'site_lgc' => '6', 'site_url' => 'https://www.viaje-a-china.com', 'site_image_url' => '//imagenes.viaje-a-china.com', 'site_authors' => array('I', 'cyt', 'lmr', 'zyh', 'LLM'), 'site_user' => ',ycc,lmr, zyh,I,cyt,htc,bhn,Tony,zyh,B,J,LLM,LYY,'),
@@ -372,11 +372,11 @@ $config['site'] = array(
     'ru' => array('site_code' => 'ru', 'site_id' => 102, 'site_lgc' => '7', 'site_url' => 'https://www.chinahighlights.ru', 'site_image_url' => '//images.chinahighlights.ru', 'site_authors' => array('xjj', 'zyy'), 'site_user' => ',ycc,lmr, zyh,xjj,htc,DX,zyy,bhn,Tony,zyh,B,J,LYY,'),
     'wt' => array('site_code' => 'wt', 'site_id' => 172, 'site_lgc' => '2', 'site_url' => 'http://www.iiiyooo.com', 'site_image_url' => '', 'site_authors' => array('ylh', 'lfj', 'wx', 'lzh', 'shw', 'lx'), 'site_user' => ',ycc,lmr, zyh,ylh,lfj,wx,lzh,shw,lx,bhn,B,J,'),
     'tbt' => array('site_code' => 'tbt', 'site_id' => 169, 'site_lgc' => '1', 'site_url' => 'http://www.tibettravel.info', 'site_image_url' => '/images', 'site_authors' => array('wj', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,sfx,J,ZP,'),
-    'sht' => array('site_code' => 'sht', 'site_id' => 96, 'site_lgc' => '1', 'site_url' => 'http://www.shanghaihighlights.com', 'site_image_url' => '//images.shanghaihighlights.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,vz,sfx,J,ZP,LYY,'),
+    'sht' => array('site_code' => 'sht', 'site_id' => 96, 'site_lgc' => '1', 'site_url' => 'https://www.shanghaihighlights.com', 'site_image_url' => '//images.shanghaihighlights.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,vz,sfx,J,ZP,LYY,'),
-    'yz' => array('site_code' => 'yz', 'site_id' => 89, 'site_lgc' => '1', 'site_url' => 'http://www.yangtzeriver.org', 'site_image_url' => '//images.yangtzeriver.org', 'site_authors' => array('wj', 'vi', 'sfx'), 'site_user' => ',ycc,wj,bhn,hwt,thf,vi,sfx,J,ZP,lyy,'),
+    'yz' => array('site_code' => 'yz', 'site_id' => 89, 'site_lgc' => '1', 'site_url' => 'https://www.yangtzeriver.org', 'site_image_url' => '//images.yangtzeriver.org', 'site_authors' => array('wj', 'vi', 'sfx'), 'site_user' => ',ycc,wj,bhn,hwt,thf,vi,sfx,J,ZP,lyy,'),
-    'gl' => array('site_code' => 'gl', 'site_id' => 90, 'site_lgc' => '1', 'site_url' => 'http://www.guilinchina.net', 'site_image_url' => '//images.guilinchina.net', 'site_authors' => array('vi', 'sfx'), 'site_user' => ',ycc,vi,bhn,hwt,thf,sfx,J,ZP,lyy,'),
+    'gl' => array('site_code' => 'gl', 'site_id' => 90, 'site_lgc' => '1', 'site_url' => 'https://www.guilinchina.net', 'site_image_url' => '//images.guilinchina.net', 'site_authors' => array('vi', 'sfx'), 'site_user' => ',ycc,vi,bhn,hwt,thf,sfx,J,ZP,lyy,'),
     'mbj' => array('site_code' => 'mbj', 'site_id' => 98, 'site_lgc' => '1', 'site_url' => 'http://www.mybeijingchina.com', 'site_image_url' => '//images.mybeijingchina.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,vz,bhn,hwt,thf,sfx,J,ZP,'),
-    'ct' => array('site_code' => 'ct', 'site_id' => 1000, 'site_lgc' => '104', 'site_url' => 'http://www.chinatravel.com', 'site_image_url' => '//images.chinatravel.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
+    'ct' => array('site_code' => 'ct', 'site_id' => 1000, 'site_lgc' => '104', 'site_url' => 'https://www.chinatravel.com', 'site_image_url' => '//images.chinatravel.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'),
     'dct' => array('site_code' => 'dct', 'site_id' => 99, 'site_lgc' => '1', 'site_url' => 'http://www.diychinatours.com', 'site_image_url' => '//images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,syt,gavin,zm,htc,yqw,zl,sw,J,qqs,MGZ,'),
     'cits' => array('site_code' => 'cits', 'site_id' => 10086, 'site_lgc' => '2', 'site_image_url' => '', 'site_url' => 'www.guilincits.com'),
     'mct' => array('site_code' => 'mct', 'site_id' => 6, 'site_lgc' => '101', 'site_image_url' => '', 'site_url' => 'https://www.mychinatours.com', 'site_authors' => array('cj')),

application/third_party/dingding_auth/controllers/index.php

@@ -0,0 +1,110 @@
+<?php
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+class Index extends CI_Controller {
+
+    public function __construct() {
+        parent::__construct();
+    }
+
+    //获取钉钉用户授权信息
+    public function auth($agentId) {
+        $data = array();
+
+        //$agentId 应用ID，如果没有传进来跳到错误页面
+        if (empty($agentId)) {
+            echo 'agentId不能为空';
+            return false;
+        }
+
+        //生成签名
+        $url = $this->curPageURL();
+        $nonceStr = 'abcdefg&cits@123#';
+        $timeStamp = time();
+        $corpId = 'ding48bce8fd3957c96b';
+        $secret = '4I_TlkOUtWQ60tUYX_447WXM5mNX41q_Q03xtZJgvBOzMPzGbNKZZz_Bsv-0B9I1';
+
+        //缓存accessToken。accessToken有效期为两小时，需要在失效前请求新的accessToken（注意：以下代码没有在失效前刷新缓存的accessToken）。
+        $cookie_accessToken = 'Token_' . $agentId;
+        $accessToken = isset($_COOKIE[$cookie_accessToken]) ? $_COOKIE[$cookie_accessToken] : false;
+        if (empty($accessToken)) {
+            $response = GET_HTTP("https://oapi.dingtalk.com/gettoken?corpid=$corpId&corpsecret=$secret");
+            if (empty($response)) {
+                log_message('error', "accessToken gethttp");
+                return false;
+            }
+            $accessToken = json_decode($response)->access_token;
+            setcookie($cookie_accessToken, $accessToken, time() + 7140, '/');
+        }
+
+        $cookie_jsapi_ticket = 'Ticket_' . $agentId;
+        $jsapi_ticket = isset($_COOKIE[$cookie_jsapi_ticket]) ? $_COOKIE[$cookie_jsapi_ticket] : false;
+        if (empty($jsapi_ticket)) {
+            $response = GET_HTTP("https://oapi.dingtalk.com/get_jsapi_ticket?type=jsapi&access_token=$accessToken");
+            if (empty($response)) {
+                log_message('error', "jsapi_ticket gethttp");
+                return false;
+            }
+            $jsapi_ticket = json_decode($response)->ticket;
+            setcookie($cookie_jsapi_ticket, $jsapi_ticket, time() + 7140, '/');
+        }
+
+        $signature = sha1('jsapi_ticket=' . $jsapi_ticket . '&noncestr=' . $nonceStr . '&timestamp=' . $timeStamp . '&url=' . $url);
+
+        $config = array(
+            'url' => $url,
+            'nonceStr' => $nonceStr,
+            'agentId' => $agentId,
+            'timeStamp' => $timeStamp,
+            'corpId' => $corpId,
+            'signature' => $signature,
+            'accessToken' => $accessToken,
+        );
+
+        $data['auth_config'] = json_encode($config);
+        $this->load->view('welcome', $data);
+		//print_r($data);
+    }
+
+    public function curPageURL() {
+        $pageURL = 'http';
+
+        if (array_key_exists('HTTPS', $_SERVER) && $_SERVER["HTTPS"] == "on") {
+            $pageURL .= "s";
+        }
+        $pageURL .= "://";
+
+        if ($_SERVER["SERVER_PORT"] != "80") {
+            $pageURL .= $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
+        } else {
+            $pageURL .= $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
+        }
+        return $pageURL;
+    }
+
+    //$agentId 应用ID，用来判断应该跳转到哪里去
+    //$user_code 用户code，需要再次请求接口来获取用户详细信息
+    public function authOnSuccess($agentId,$accessToken, $user_code) {
+		$response =GET_HTTP("https://oapi.dingtalk.com/user/getuserinfo?access_token=$accessToken&code=$user_code");
+		  if (empty($response)) {
+                log_message('error', "getuserinfo gethttp");
+                return false;
+           }
+            $userid = json_decode($response)->userid;
+			$response =GET_HTTP("https://oapi.dingtalk.com/user/get?access_token=$accessToken&userid=$userid");	
+		  if (empty($response)) {
+                log_message('error', "user gethttp");
+                return false;
+           }
+		   $response= json_decode($response);
+		   if(!empty($response) && $response->errcode==0){
+			   	$username= $response->name;
+				redirect("http://doc.mycht.cn/index.php?user/loginSubmit&name=$username&password=9Q7gJ3239aK_8LA");
+		   }else{
+				print_r($response);
+		   }
+    }
+
+}

application/third_party/dingding_auth/views/welcome.php

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+        <title>钉钉授权</title>
+
+        <script type="text/javascript" src="https://g.alicdn.com/dingding/open-develop/1.6.9/dingtalk.js"></script>
+        <script type="text/javascript" src="https://g.alicdn.com/dingding/dingtalk-pc-api/2.7.0/index.js"></script>
+        <script src="/js/jquery.min.js"></script>
+        <script type="text/javascript">
+            var _config = <?php echo $auth_config; ?>;
+
+
+            var DingTalk = DingTalk || {};
+            (function (dt) {
+                var self = dt;
+                var ding;
+
+                dt.init = function () {
+                    dt.isMobileClient = self.util.isMobileClient();
+                    ding = self.isMobileClient ? dd : DingTalkPC;
+                };
+
+                dt.auth = function () {
+                    ding.config({
+                        agentId: _config.agentId,
+                        corpId: _config.corpId,
+                        timeStamp: _config.timeStamp,
+                        nonceStr: _config.nonceStr,
+                        signature: _config.signature,
+                        jsApiList: [
+                            'runtime.permission.requestAuthCode',
+                            'device.notification.alert',
+                            'device.notification.confirm',
+                            'biz.contact.choose',
+                            'device.notification.prompt',
+                            'biz.ding.post'
+                        ] // 必填，需要使用的jsapi列表
+                    });
+
+                    ding.userid = 0;
+
+                    ding.ready(function (res) {
+                        ding.runtime.permission.requestAuthCode({
+                            corpId: _config.corpId, //企业ID
+                            onSuccess: function (info) {
+								console.log('auth success ');
+                                window.location.href = "/info.php/apps/dingding_auth/index/authOnSuccess/" +_config.agentId+'/'+_config.accessToken+'/'+ info.code;
+                            },
+                            onFail: function (err) {
+                                console.log(JSON.stringify(err));
+                            }
+
+                        });
+                    });
+
+                    ding.error(function (error) {
+                        console.log('dd error: ' + JSON.stringify(error));
+                    });
+                };
+
+                dt.util = {
+                    isMobileClient: function () {
+                        return /(iPhone|iPod|Android|ios|iOS|iPad|Backerry|WebOS|Symbian|Windows Phone|Phone)/i.test(navigator.userAgent);
+                    }
+                };
+                window.DingTalk = dt;
+            })(DingTalk);
+            DingTalk.init();
+
+            DingTalk.auth();
+
+        </script>
+    </head>
+    <body>
+        <div>
+            <p class="text-center">授权登录中，请稍候...</p>
+        </div>
+    </body>
+</html>

application/third_party/htmlcompressor/controllers/index.php

@@ -20,6 +20,7 @@ class Index extends CI_Controller {
         if (empty($htmlsource) || empty($websitehost)) {
             $this->output->set_status_header(500);
             echo 'error:htmlsource or websitehost is empty!';
+			log_message('error', "htmlsource or websitehost is empty! " . $websitehost);
             return false;
         }
         //域名后面不能有/
@@ -45,6 +46,7 @@ class Index extends CI_Controller {
                 if ($get_http_temp == false) {
                     $this->output->set_status_header(404);
                     echo 'CSS文件下载错误';
+					log_message('error', "optimize CSS文件下载错误! " . $item);
                     return FALSE;
                 }
                 $css_content.=$get_http_temp;
@@ -87,6 +89,7 @@ class Index extends CI_Controller {
                 if ($get_http_temp == false) {
                     $this->output->set_status_header(404);
                     echo 'JS文件下载错误';
+					log_message('error', "optimize js文件下载错误! " . $item);
                     return FALSE;
                 }
                 $js_scr_content.=$get_http_temp;

application/third_party/train/controllers/search.php

@@ -10,7 +10,10 @@ class search extends CI_Controller{
 	}
 	
 	//查询聚合余票接口，对返回的数据进行处理
-	public function index($train_date,$fromStation,$toStation){
+	public function index($train_date=null,$fromStation=null,$toStation=null){
+		if(!$train_date || !$fromStation || !$toStation){
+			exit('传参错误！');
+		}else{
 			$url = 'http://op.juhe.cn/trainTickets/ticketsAvailable?key='.JUHE_TRAIN_API_KEY.'&train_date='.$train_date.'&from_station='.$fromStation.'&to_station='.$toStation;
 		$back_data = $this->get_http($url);
 		//print_r(json_decode($back_data));
@@ -101,6 +104,7 @@ class search extends CI_Controller{
 		$return_data->data->map = (object)$obj;
 		print_r(json_encode($return_data));
 		}
+	}
 	
 	//获取价格
 	/*
@@ -108,7 +112,10 @@ class search extends CI_Controller{
 	toStationCode:终点站三字码
 	trainCode:车次号
 	*/
-	public function get_price($fromStationCode,$toStationCode,$trainCode){
+	public function get_price($fromStationCode=null,$toStationCode=null,$trainCode=null){
+		if(!$fromStationCode || !$toStationCode || !$trainCode){
+			exit('传参错误！');
+		}else{
 			$return_data = $this->BIZ_train_model->get_price($fromStationCode,$toStationCode,$trainCode);
 			if(!empty($return_data)){
 				print_r(json_decode($return_data->TPL_Price));
@@ -116,6 +123,7 @@ class search extends CI_Controller{
 				print_r('没有数据返回');
 			}
 		}
+	}
 	
 	//余票转换
 	function ticket_exchange($num){

application/third_party/tuniu/controllers/tuniu_train.php

@@ -35,7 +35,10 @@ class Tuniu_train extends CI_Controller{
 	}
 	
 	//获取余票
-    public function search($date,$fromStation,$toStation){
+    public function search($date=null,$fromStation=null,$toStation=null){
+		if(!$date || !$fromStation || !$toStation){
+			exit('传参错误！');
+		}else{
 			$sign = $this->create_sign();
 		$url = TUNIU_URL.'/train/search';
 		$time = date('Y-m-d H:i:s',time());
@@ -136,6 +139,7 @@ class Tuniu_train extends CI_Controller{
 		$return_data->data->map = (object)$obj;
 		print_r(json_encode($return_data));
 		}
+    }
 	
 	//获取价格
 	/*
@@ -143,10 +147,14 @@ class Tuniu_train extends CI_Controller{
 	toStationCode:终点站三字码
 	trainCode:车次
 	*/
-	public function get_price($fromStationCode,$toStationCode,$trainCode){
+	public function get_price($fromStationCode=null,$toStationCode=null,$trainCode=null){
+		if(!$fromStationCode || !$toStationCode || !$trainCode){
+			exit('传参错误！');
+		}else{
 			$return_data = $this->tuniuprice_model->get_price($fromStationCode,$toStationCode,$trainCode);
 			print_r(json_decode($return_data->TPL_Price));
 		}
+	}
 	
 	//占座下单
 	public function book_ticket(){
@@ -282,6 +290,21 @@ class Tuniu_train extends CI_Controller{
 		print_r($back_data);		
 	}
 	
+	//车站三字码查询
+	public function telecodeQuery(){
+		$sign = $this->create_sign();
+		$url = TUNIU_URL.'/train/telecodeQuery';
+		$time = date('Y-m-d H:i:s',time());
+		$post_data = '{ 
+				"apiKey": "'.TUNIU_KEY.'", 
+				"sign": "'.$sign.'", 
+				"timestamp": "'.$time.'", 
+				"data": null
+				}';
+		$back_data = post_tuniu($url,$post_data,$method = 'POST');
+		print_r($back_data);		
+	}
+	
 	//身份验证
 	public function validate(){
 		//$name = $this->input->post('name');