merge heihedata branch r5110 - r5206 into trunk

application/module/Open/Client.php

@@ -138,9 +138,11 @@ class Client extends \Zend_Controller_Plugin_Abstract
 
 		$cache_data = json_decode($data['response'],true);
 
-		if(!isset($cache_data['expires_in']))
+		$userinfo = json_decode($cache_data['userInfo'],true);
+
+		if(!is_array($cache_data) || !isset($cache_data['expires_in']) || !isset($userinfo['cstnetId']))
 		{
-			return "未获得授权信息，请重试链接";
+			return "未获得授权信息，请重试链接，如果还无法登录请使用网站账号密码登录";
 		}
 		
 		return $cache_data;

application/module/Open/Handler/ClientTokenHandler/Escience.php

@@ -67,6 +67,9 @@ class Escience
 			return "参数错误";
 		}
 
+		if(is_array($tokenData['userInfo']))
+			$this->userInfo = $tokenData['userInfo'];
+		else
 			$this->userInfo = json_decode($tokenData['userInfo'],true);
 		
 		unset($tokenData['userInfo']);