GC0202 / ThinkLibrary

src/service/taobao/bin/QimenCloud/QimenCloudClient.php

Spacing +54 added lines, -54 removed lines

@@ -29,9 +29,9 @@ 
 		return $this->appkey;
 	}
 
-	public function __construct($appkey = "",$secretKey = ""){
+	public function __construct($appkey = "", $secretKey = "") {
 		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
+		$this->secretKey = $secretKey;
 	}
 
 	protected function generateSign($params)
@@ -41,7 +41,7 @@ 
 		$stringToBeSigned = $this->secretKey;
 		foreach ($params as $k => $v)
 		{
-			if(!is_array($v) && "@" != substr($v, 0, 1))
+			if (!is_array($v) && "@" != substr($v, 0, 1))
 			{
 				$stringToBeSigned .= "$k$v";
 			}
@@ -64,9 +64,9 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-sdk-php");
 		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+		if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https") {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 		}
@@ -77,14 +77,14 @@ 
 			$postMultipart = false;
 			foreach ($postFields as $k => $v)
 			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
+				if ("@" != substr($v, 0, 1))//判断是不是文件上传
 				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
+					$postBodyString .= "$k=".urlencode($v)."&"; 
 				}
 				else//文件上传用multipart/form-data，否则用www-form-urlencoded
 				{
 					$postMultipart = true;
-					if(class_exists('\CURLFile')){
+					if (class_exists('\CURLFile')) {
 						$postFields[$k] = new \CURLFile(substr($v, 1));
 					}
 				}
@@ -95,7 +95,7 @@ 
 			{
 				if (class_exists('\CURLFile')) {
 				    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-				} else {
+				}else {
 				    if (defined('CURLOPT_SAFE_UPLOAD')) {
 				        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
 				    }
@@ -105,22 +105,22 @@ 
 			else
 			{
 				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
-				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+				curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString, 0, -1));
 			}
 		}
 		$reponse = curl_exec($ch);
 		
 		if (curl_errno($ch))
 		{
-			throw new Exception(curl_error($ch),0);
+			throw new Exception(curl_error($ch), 0);
 		}
 		else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
 			{
-				throw new Exception($reponse,$httpStatusCode);
+				throw new Exception($reponse, $httpStatusCode);
 			}
 		}
 		curl_close($ch);
@@ -138,44 +138,44 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-sdk-php");
 		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+		if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https") {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 		}
 		//生成分隔符
-		$delimiter = '-------------' . uniqid();
+		$delimiter = '-------------'.uniqid();
 		//先将post的普通数据生成主体字符串
 		$data = '';
-		if($postFields != null){
+		if ($postFields != null) {
 			foreach ($postFields as $name => $content) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"';
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"';
 			    //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
-			    $data .= "\r\n\r\n" . $content . "\r\n";
+			    $data .= "\r\n\r\n".$content."\r\n";
 			}
-			unset($name,$content);
+			unset($name, $content);
 		}
 
 		//将上传的文件生成主体字符串
-		if($fileFields != null){
+		if ($fileFields != null) {
 			foreach ($fileFields as $name => $file) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['name'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"; filename="'.$file['name']."\" \r\n";
+			    $data .= 'Content-Type: '.$file['type']."\r\n\r\n"; //多了个文档类型
 
-			    $data .= $file['content'] . "\r\n";
+			    $data .= $file['content']."\r\n";
 			}
-			unset($name,$file);
+			unset($name, $file);
 		}
 		//主体结束的分隔符
-		$data .= "--" . $delimiter . "--";
+		$data .= "--".$delimiter."--";
 
 		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-		    'Content-Type: multipart/form-data; boundary=' . $delimiter,
-		    'Content-Length: ' . strlen($data))
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+		    'Content-Type: multipart/form-data; boundary='.$delimiter,
+		    'Content-Length: '.strlen($data))
 		); 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
@@ -185,14 +185,14 @@ 
 
 		if (curl_errno($ch))
 		{
-			throw new Exception(curl_error($ch),0);
+			throw new Exception(curl_error($ch), 0);
 		}
 		else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
 			{
-				throw new Exception($reponse,$httpStatusCode);
+				throw new Exception($reponse, $httpStatusCode);
 			}
 		}
 		curl_close($ch);
@@ -203,7 +203,7 @@ 
 	{
 		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
 		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_comm_err_".$this->appkey."_".date("Y-m-d").".log";
 		$logger->conf["separator"] = "^_^";
 		$logData = array(
 		date("Y-m-d H:i:s"),
@@ -214,19 +214,19 @@ 
 		$this->sdkVersion,
 		$requestUrl,
 		$errorCode,
-		str_replace("\n","",$responseTxt)
+		str_replace("\n", "", $responseTxt)
 		);
 		$logger->log($logData);
 	}
 
-	public function execute($request, $session = null,$bestUrl = null)
+	public function execute($request, $session = null, $bestUrl = null)
 	{
-		if($this->gatewayUrl == null) {
+		if ($this->gatewayUrl == null) {
 			throw new Exception("client-check-error:Need Set gatewayUrl.", 40);
 		}
 
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
+		$result = new ResultSet(); 
+		if ($this->checkRequest) {
 			try {
 				$request->check();
 			} catch (Exception $e) {
@@ -254,10 +254,10 @@ 
 
 
 		//系统参数放入GET请求串
-		if($bestUrl){
+		if ($bestUrl) {
 			$requestUrl = $bestUrl."?";
 			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
+		}else {
 			$requestUrl = $this->gatewayUrl."?";
 			$sysParams["partner_id"] = $this->sdkVersion;
 		}
@@ -267,12 +267,12 @@ 
 		foreach ($sysParams as $sysParamKey => $sysParamValue)
 		{
 			// if(strcmp($sysParamKey,"timestamp") != 0)
-			$requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
+			$requestUrl .= "$sysParamKey=".urlencode($sysParamValue)."&";
 		}
 
 		$fileFields = array();
 		foreach ($apiParams as $key => $value) {
-			if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+			if (is_array($value) && array_key_exists('type', $value) && array_key_exists('content', $value)) {
 				$value['name'] = $key;
 				$fileFields[$key] = $value;
 				unset($apiParams[$key]);
@@ -285,15 +285,15 @@ 
 		//发起HTTP请求
 		try
 		{
-			if(count($fileFields) > 0){
+			if (count($fileFields) > 0) {
 				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
+			}else {
 				$resp = $this->curl($requestUrl, $apiParams);
 			}
 		}
 		catch (Exception $e)
 		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+			$this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_ERROR_".$e->getCode(), $e->getMessage());
 			$result->code = $e->getCode();
 			$result->msg = $e->getMessage();
 			return $result;
@@ -315,7 +315,7 @@ 
 				}
 			}
 		}
-		else if("xml" == $this->format)
+		else if ("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)
@@ -327,7 +327,7 @@ 
 		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
 		if (false === $respWellFormed)
 		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+			$this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_RESPONSE_NOT_WELL_FORMED", $resp);
 			$result->code = 0;
 			$result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
 			return $result;
@@ -337,7 +337,7 @@ 
 		if (isset($respObject->code))
 		{
 			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_biz_err_".$this->appkey."_".date("Y-m-d").".log";
 			$logger->log(array(
 				date("Y-m-d H:i:s"),
 				$resp
@@ -354,21 +354,21 @@ 
 		}
 		$inflector = new LtInflector;
 		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
+		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7)))."Request";
 		if (!class_exists($requestClassName))
 		{
-			trigger_error("No such api: " . $paramsArray["method"]);
+			trigger_error("No such api: ".$paramsArray["method"]);
 		}
 
 		$session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
 
 		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
+		foreach ($paramsArray as $paraKey => $paraValue)
 		{
 			$inflector->conf["separator"] = "_";
 			$setterMethodName = $inflector->camelize($paraKey);
 			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
+			$setterMethodName = "set".$inflector->camelize($setterMethodName);
 			if (method_exists($req, $setterMethodName))
 			{
 				$req->$setterMethodName($paraValue);
@@ -379,6 +379,6 @@ 
 
 	private function getClusterTag()
     {
-	    return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
+	    return substr($this->sdkVersion, 0, 11)."-cluster".substr($this->sdkVersion, 11);
     }
 }

src/service/taobao/bin/top/test.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 
     $req = new HttpdnsGetRequest;
 
-    $req->putOtherTextParam("name","test");
-    $req->putOtherTextParam("value",0);
+    $req->putOtherTextParam("name", "test");
+    $req->putOtherTextParam("value", 0);
 
     var_dump($c->execute($req));
 ?>
\ No newline at end of file

src/service/taobao/bin/top/HttpdnsGetRequest.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		return $this->apiParas;
 	}
 	
-	public function check(){}
+	public function check() {}
 	
 	public function putOtherTextParam($key, $value) {
 		$this->apiParas[$key] = $value;

src/service/taobao/bin/top/SpiUtils.php

Spacing +50 added lines, -50 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-class SpiUtils{
+class SpiUtils {
 	private static $top_sign_list = "HTTP_TOP_SIGN_LIST";
 	private static $timestamp = "timestamp";
 	private static $header_real_ip = array("X_Real_IP", "X_Forwarded_For", "Proxy_Client_IP",
@@ -11,8 +11,8 @@ 
 	 * @param secret app对应的secret
 	 * @return true：校验通过；false：校验不通过
 	 */
-	public static function checkSign4FormRequest($secret){
-		return self::checkSign(null,null,$secret);
+	public static function checkSign4FormRequest($secret) {
+		return self::checkSign(null, null, $secret);
 	}
 
 	/**
@@ -23,8 +23,8 @@ 
 	 * @param secret app对应的secret
 	 * @return true：校验通过；false：校验不通过
 	 */
-	public static function checkSign4TextRequest($body,$secret){
-		return self::checkSign(null,$body,$secret);
+	public static function checkSign4TextRequest($body, $secret) {
+		return self::checkSign(null, $body, $secret);
 	}
 	
 	/**
@@ -35,7 +35,7 @@ 
 	 * @param secret app对应的secret
 	 * @return true：校验通过；false：校验不通过
 	 */
-	public static function checkSign4FileRequest($form, $secret){
+	public static function checkSign4FileRequest($form, $secret) {
 		return self::checkSign($form, null, $secret);
 	}
 
@@ -43,29 +43,29 @@ 
 		$params = array();
 		// 1. 获取header参数
 		$headerMap = self::getHeaderMap();
-		foreach ($headerMap as $k => $v){
-			$params[$k] = $v ;
+		foreach ($headerMap as $k => $v) {
+			$params[$k] = $v;
 		}
 
 		// 2. 获取url参数
 		$queryMap = self::getQueryMap();
-		foreach ($queryMap as $k => $v){
-			$params[$k] = $v ;
+		foreach ($queryMap as $k => $v) {
+			$params[$k] = $v;
 		}
 
 		// 3. 获取form参数
 		if ($form == null && $body == null) {
 			$formMap = self::getFormMap();
-			foreach ($formMap as $k => $v){
-				$params[$k] = $v ;
+			foreach ($formMap as $k => $v) {
+				$params[$k] = $v;
 			}
-		} else if ($form != null) {
-			foreach ($form as $k => $v){
-				$params[$k] = $v ;
+		}else if ($form != null) {
+			foreach ($form as $k => $v) {
+				$params[$k] = $v;
 			}
 		}
 
-		if($body == null){
+		if ($body == null) {
 			$body = file_get_contents('php://input');
 		}
 
@@ -73,9 +73,9 @@ 
 		$localSign = self::sign($params, $body, $secret);
 		if (strcmp($remoteSign, $localSign) == 0) {
 			return true;
-		} else {
+		}else {
 			$paramStr = self::getParamStrFromMap($params);
-			self::logCommunicationError($remoteSign,$localSign,$paramStr,$body);
+			self::logCommunicationError($remoteSign, $localSign, $paramStr, $body);
 			return false;
 		}
 	}
@@ -84,18 +84,18 @@ 
 		$headerMap = array();
 		$signList = $_SERVER['HTTP_TOP_SIGN_LIST']; // 只获取参与签名的头部字段
 
-		if(!$signList) {
+		if (!$signList) {
 			return $headerMap;
 		}
 
 		$signList = trim($signList);
-		if (strlen($signList) > 0){
+		if (strlen($signList) > 0) {
 			$params = split(",", $signList);
-			foreach ($_SERVER as $k => $v){
-				if (substr($k, 0, 5) == 'HTTP_'){
-					foreach($params as $kk){
+			foreach ($_SERVER as $k => $v) {
+				if (substr($k, 0, 5) == 'HTTP_') {
+					foreach ($params as $kk) {
 						$upperkey = strtoupper($kk);
-						if(self::endWith($k,$upperkey)){
+						if (self::endWith($k, $upperkey)) {
 							$headerMap[$kk] = $v;
 						}
 					}
@@ -105,7 +105,7 @@ 
 		return $headerMap;
 	}
 
-	private static function getQueryMap(){
+	private static function getQueryMap() {
 		$queryStr = $_SERVER["QUERY_STRING"];
 		$resultArray = array();
 		foreach (explode('&', $queryStr) as $pair) {
@@ -115,35 +115,35 @@ 
 
 		        if (preg_match('/(?P<name>\w+)\[(?P<index>\w+)\]/', $subKey, $matches)) {
 		            $resultArray[$matches['name']][$matches['index']][$subVal] = $value;
-		        } else {
+		        }else {
 		            $resultArray[$subKey][$subVal] = urldecode($value);
 		        }
-		    } else {
+		    }else {
 		        $resultArray[$key] = urldecode($value);
 		    }
 		}
 		return $resultArray;
 	}
 
-	private static function checkRemoteIp(){
+	private static function checkRemoteIp() {
 		$remoteIp = $_SERVER["REMOTE_ADDR"];
-		foreach ($header_real_ip as $k){
+		foreach ($header_real_ip as $k) {
 			$realIp = $_SERVER[$k];
 			$realIp = trim($realIp);
-			if(strlen($realIp) > 0 && strcasecmp("unknown",$realIp)){
+			if (strlen($realIp) > 0 && strcasecmp("unknown", $realIp)) {
 				$remoteIp = $realIp;
 				break;
 			}
 		}
-		return self::startsWith($remoteIp,"140.205.144.") || self::startsWith($remoteIp,"40.205.145.");
+		return self::startsWith($remoteIp, "140.205.144.") || self::startsWith($remoteIp, "40.205.145.");
 	}
 
-	private static function getFormMap(){
+	private static function getFormMap() {
 		$resultArray = array();
-		foreach($_POST as $key=>$v) { 
-			$resultArray[$key] = $v ;
+		foreach ($_POST as $key=>$v) { 
+			$resultArray[$key] = $v;
 		}
-		return $resultArray ;	
+		return $resultArray;	
 	}
 
 	private static function startsWith($haystack, $needle) {
@@ -152,30 +152,30 @@ 
 
 	private static function endWith($haystack, $needle) {   
 	    $length = strlen($needle);  
-	    if($length == 0)
+	    if ($length == 0)
 	    {    
 	        return true;  
 	    }  
 	    return (substr($haystack, -$length) === $needle);
  	}
 
-	private static function checkTimestamp(){
+	private static function checkTimestamp() {
 		$ts = $_POST['timestamp'];
-		if($ts){
+		if ($ts) {
 			$clientTimestamp = strtotime($ts);
 			$current = $_SERVER['REQUEST_TIME'];
-			return ($current - $clientTimestamp) <= 5*60*1000;
-		}else{
+			return ($current-$clientTimestamp) <= 5*60*1000;
+		}else {
 			return false;
 		}
 	}
 
-	private static function getParamStrFromMap($params){
+	private static function getParamStrFromMap($params) {
 		ksort($params);
 		$stringToBeSigned = "";
 		foreach ($params as $k => $v)
 		{
-			if(strcmp("sign", $k) != 0)
+			if (strcmp("sign", $k) != 0)
 			{
 				$stringToBeSigned .= "$k$v";
 			}
@@ -184,13 +184,13 @@ 
 		return $stringToBeSigned;
 	}
 
-	private static function sign($params,$body,$secret){
+	private static function sign($params, $body, $secret) {
 		ksort($params);
 
 		$stringToBeSigned = $secret;
 		$stringToBeSigned .= self::getParamStrFromMap($params);
 
-		if($body)
+		if ($body)
 			$stringToBeSigned .= $body;
 		$stringToBeSigned .= $secret;
 		return strtoupper(md5($stringToBeSigned));
@@ -200,18 +200,18 @@ 
 	{
 		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
 		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_". date("Y-m-d") . ".log";
+		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_comm_err_".date("Y-m-d").".log";
 		$logger->conf["separator"] = "^_^";
 		$logData = array(
-		"checkTopSign error" ,
-		"remoteSign=".$remoteSign ,
-		"localSign=".$localSign ,
-		"paramStr=".$paramStr ,
+		"checkTopSign error",
+		"remoteSign=".$remoteSign,
+		"localSign=".$localSign,
+		"paramStr=".$paramStr,
 		"body=".$body
 		);
 		$logger->log($logData);
 	}
-	private static function clear_blank($str, $glue='')
+	private static function clear_blank($str, $glue = '')
 	{
 		$replace = array(" ", "\r", "\n", "\t"); return str_replace($replace, $glue, $str);
 	}

src/service/taobao/bin/top/TopClient.php

Spacing +53 added lines, -53 removed lines

@@ -27,9 +27,9 @@ 
 		return $this->appkey;
 	}
 
-	public function __construct($appkey = "",$secretKey = ""){
+	public function __construct($appkey = "", $secretKey = "") {
 		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
+		$this->secretKey = $secretKey;
 	}
 
 	protected function generateSign($params)
@@ -39,7 +39,7 @@ 
 		$stringToBeSigned = $this->secretKey;
 		foreach ($params as $k => $v)
 		{
-			if(!is_array($v) && "@" != substr($v, 0, 1))
+			if (!is_array($v) && "@" != substr($v, 0, 1))
 			{
 				$stringToBeSigned .= "$k$v";
 			}
@@ -62,9 +62,9 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-sdk-php");
 		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+		if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https") {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 		}
@@ -75,14 +75,14 @@ 
 			$postMultipart = false;
 			foreach ($postFields as $k => $v)
 			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
+				if ("@" != substr($v, 0, 1))//判断是不是文件上传
 				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
+					$postBodyString .= "$k=".urlencode($v)."&"; 
 				}
 				else//文件上传用multipart/form-data，否则用www-form-urlencoded
 				{
 					$postMultipart = true;
-					if(class_exists('\CURLFile')){
+					if (class_exists('\CURLFile')) {
 						$postFields[$k] = new \CURLFile(substr($v, 1));
 					}
 				}
@@ -93,7 +93,7 @@ 
 			{
 				if (class_exists('\CURLFile')) {
 				    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-				} else {
+				}else {
 				    if (defined('CURLOPT_SAFE_UPLOAD')) {
 				        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
 				    }
@@ -103,22 +103,22 @@ 
 			else
 			{
 				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
-				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+				curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString, 0, -1));
 			}
 		}
 		$reponse = curl_exec($ch);
 		
 		if (curl_errno($ch))
 		{
-			throw new Exception(curl_error($ch),0);
+			throw new Exception(curl_error($ch), 0);
 		}
 		else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
 			{
-				throw new Exception($reponse,$httpStatusCode);
+				throw new Exception($reponse, $httpStatusCode);
 			}
 		}
 		curl_close($ch);
@@ -136,44 +136,44 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-sdk-php");
 		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+		if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https") {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 		}
 		//生成分隔符
-		$delimiter = '-------------' . uniqid();
+		$delimiter = '-------------'.uniqid();
 		//先将post的普通数据生成主体字符串
 		$data = '';
-		if($postFields != null){
+		if ($postFields != null) {
 			foreach ($postFields as $name => $content) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"';
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"';
 			    //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
-			    $data .= "\r\n\r\n" . $content . "\r\n";
+			    $data .= "\r\n\r\n".$content."\r\n";
 			}
-			unset($name,$content);
+			unset($name, $content);
 		}
 
 		//将上传的文件生成主体字符串
-		if($fileFields != null){
+		if ($fileFields != null) {
 			foreach ($fileFields as $name => $file) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['name'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"; filename="'.$file['name']."\" \r\n";
+			    $data .= 'Content-Type: '.$file['type']."\r\n\r\n"; //多了个文档类型
 
-			    $data .= $file['content'] . "\r\n";
+			    $data .= $file['content']."\r\n";
 			}
-			unset($name,$file);
+			unset($name, $file);
 		}
 		//主体结束的分隔符
-		$data .= "--" . $delimiter . "--";
+		$data .= "--".$delimiter."--";
 
 		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-		    'Content-Type: multipart/form-data; boundary=' . $delimiter,
-		    'Content-Length: ' . strlen($data))
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+		    'Content-Type: multipart/form-data; boundary='.$delimiter,
+		    'Content-Length: '.strlen($data))
 		); 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
@@ -183,14 +183,14 @@ 
 
 		if (curl_errno($ch))
 		{
-			throw new Exception(curl_error($ch),0);
+			throw new Exception(curl_error($ch), 0);
 		}
 		else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
 			{
-				throw new Exception($reponse,$httpStatusCode);
+				throw new Exception($reponse, $httpStatusCode);
 			}
 		}
 		curl_close($ch);
@@ -201,7 +201,7 @@ 
 	{
 		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
 		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_comm_err_".$this->appkey."_".date("Y-m-d").".log";
 		$logger->conf["separator"] = "^_^";
 		$logData = array(
 		date("Y-m-d H:i:s"),
@@ -212,15 +212,15 @@ 
 		$this->sdkVersion,
 		$requestUrl,
 		$errorCode,
-		str_replace("\n","",$responseTxt)
+		str_replace("\n", "", $responseTxt)
 		);
 		$logger->log($logData);
 	}
 
-	public function execute($request, $session = null,$bestUrl = null)
+	public function execute($request, $session = null, $bestUrl = null)
 	{
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
+		$result = new ResultSet(); 
+		if ($this->checkRequest) {
 			try {
 				$request->check();
 			} catch (Exception $e) {
@@ -247,10 +247,10 @@ 
 
 
 		//系统参数放入GET请求串
-		if($bestUrl){
+		if ($bestUrl) {
 			$requestUrl = $bestUrl."?";
 			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
+		}else {
 			$requestUrl = $this->gatewayUrl."?";
 			$sysParams["partner_id"] = $this->sdkVersion;
 		}
@@ -260,12 +260,12 @@ 
 		foreach ($sysParams as $sysParamKey => $sysParamValue)
 		{
 			// if(strcmp($sysParamKey,"timestamp") != 0)
-			$requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
+			$requestUrl .= "$sysParamKey=".urlencode($sysParamValue)."&";
 		}
 
 		$fileFields = array();
 		foreach ($apiParams as $key => $value) {
-			if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+			if (is_array($value) && array_key_exists('type', $value) && array_key_exists('content', $value)) {
 				$value['name'] = $key;
 				$fileFields[$key] = $value;
 				unset($apiParams[$key]);
@@ -278,15 +278,15 @@ 
 		//发起HTTP请求
 		try
 		{
-			if(count($fileFields) > 0){
+			if (count($fileFields) > 0) {
 				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
+			}else {
 				$resp = $this->curl($requestUrl, $apiParams);
 			}
 		}
 		catch (Exception $e)
 		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+			$this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_ERROR_".$e->getCode(), $e->getMessage());
 			$result->code = $e->getCode();
 			$result->msg = $e->getMessage();
 			return $result;
@@ -308,7 +308,7 @@ 
 				}
 			}
 		}
-		else if("xml" == $this->format)
+		else if ("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)
@@ -320,7 +320,7 @@ 
 		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
 		if (false === $respWellFormed)
 		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+			$this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_RESPONSE_NOT_WELL_FORMED", $resp);
 			$result->code = 0;
 			$result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
 			return $result;
@@ -330,7 +330,7 @@ 
 		if (isset($respObject->code))
 		{
 			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_biz_err_".$this->appkey."_".date("Y-m-d").".log";
 			$logger->log(array(
 				date("Y-m-d H:i:s"),
 				$resp
@@ -347,21 +347,21 @@ 
 		}
 		$inflector = new LtInflector;
 		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
+		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7)))."Request";
 		if (!class_exists($requestClassName))
 		{
-			trigger_error("No such api: " . $paramsArray["method"]);
+			trigger_error("No such api: ".$paramsArray["method"]);
 		}
 
 		$session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
 
 		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
+		foreach ($paramsArray as $paraKey => $paraValue)
 		{
 			$inflector->conf["separator"] = "_";
 			$setterMethodName = $inflector->camelize($paraKey);
 			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
+			$setterMethodName = "set".$inflector->camelize($setterMethodName);
 			if (method_exists($req, $setterMethodName))
 			{
 				$req->$setterMethodName($paraValue);
@@ -372,6 +372,6 @@ 
 
 	private function getClusterTag()
     {
-	    return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
+	    return substr($this->sdkVersion, 0, 11)."-cluster".substr($this->sdkVersion, 11);
     }
 }

src/service/taobao/bin/top/security/iCache.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	public function getCache($key);
 
 	//更新缓存
-	public function setCache($key,$var);
+	public function setCache($key, $var);
 
 }
 ?>
\ No newline at end of file

src/service/taobao/bin/top/security/YacCache.php

Spacing +5 added lines, -5 removed lines

@@ -15,21 +15,21 @@
 	public function getCache($key)
 	{
 		$key = md5($key);
-		if($this->isEnable){
+		if ($this->isEnable) {
 			$yac = new Yac();
 			return $yac->get($key);
-		}else{
+		}else {
 			echo "yac is not enable ,skip getCache";
 		}
 	}
 
-	public function setCache($key,$var)
+	public function setCache($key, $var)
 	{
 		$key = md5($key);
-		if($this->isEnable){
+		if ($this->isEnable) {
 			$yac = new Yac();
 			$yac->set($key, $var);
-		}else{
+		}else {
 			echo "yac is not enable ,skip setCache";
 		}
 	}

src/service/taobao/bin/top/security/MagicCrypt.php

Spacing +5 added lines, -5 removed lines

@@ -20,12 +20,12 @@ 
 
         public static function hmac_md5($input, $key) {
             $key = base64_decode($key);
-            return hash_hmac('md5', $input, $key,true);
+            return hash_hmac('md5', $input, $key, true);
         }
      
-        private static function pkcs5_pad ($text, $blocksize) {
-            $pad = $blocksize - (strlen($text) % $blocksize);
-            return $text . str_repeat(chr($pad), $pad);
+        private static function pkcs5_pad($text, $blocksize) {
+            $pad = $blocksize-(strlen($text)%$blocksize);
+            return $text.str_repeat(chr($pad), $pad);
         }
      
         public static function decrypt($sStr, $key) {
@@ -42,7 +42,7 @@ 
 
             mcrypt_generic_deinit($module);
             mcrypt_module_close($module);
-            if(!$decrypted){
+            if (!$decrypted) {
                 throw new Exception("Decrypt Error,Please Check SecretKey");
             }
             return $decrypted;

src/service/taobao/bin/top/security/SecurityUtil.php

Spacing +147 added lines, -147 removed lines

@@ -11,17 +11,17 @@ 
 
 		function __construct()
 		{
-			if(!defined("PHONE_SEPARATOR_CHAR"))
+			if (!defined("PHONE_SEPARATOR_CHAR"))
 			{
-				define('PHONE_SEPARATOR_CHAR','$');
+				define('PHONE_SEPARATOR_CHAR', '$');
 			}
-			if(!defined("NICK_SEPARATOR_CHAR"))
+			if (!defined("NICK_SEPARATOR_CHAR"))
 			{
-				define('NICK_SEPARATOR_CHAR','~');
+				define('NICK_SEPARATOR_CHAR', '~');
 			}
-			if(!defined("NORMAL_SEPARATOR_CHAR"))
+			if (!defined("NORMAL_SEPARATOR_CHAR"))
 			{
-				define('NORMAL_SEPARATOR_CHAR',chr(1));
+				define('NORMAL_SEPARATOR_CHAR', chr(1));
 			}
 
 			$this->SEPARATOR_CHAR_MAP['nick'] = NICK_SEPARATOR_CHAR;
@@ -39,9 +39,9 @@ 
 		function isBase64Str($str)
 		{
 			$strLen = strlen($str);
-			for($i = 0; $i < $strLen ; $i++)
+			for ($i = 0; $i < $strLen; $i++)
 			{
-				if(!$this->isBase64Char($str[$i]))
+				if (!$this->isBase64Char($str[$i]))
 				{
 					return false;
 				}
@@ -54,46 +54,46 @@ 
 		*/
 		function isBase64Char($char)
 		{
-			return strpos($this->BASE64_ARRAY,$char) !== false;
+			return strpos($this->BASE64_ARRAY, $char) !== false;
 		}
 
 		/*
 		* 使用sep字符进行trim
 		*/
-		function trimBySep($str,$sep)
+		function trimBySep($str, $sep)
 		{
 			$start = 0;
 			$end = strlen($str);
-			for($i = 0; $i < $end; $i++)
+			for ($i = 0; $i < $end; $i++)
 			{
-				if($str[$i] == $sep)
+				if ($str[$i] == $sep)
 				{
-					$start = $i + 1;
+					$start = $i+1;
 				}
 				else
 				{
 					break;
 				}
 			}
-			for($i = $end -1 ; $i >= 0; $i--)
+			for ($i = $end-1; $i >= 0; $i--)
 			{
-				if($str[$i] == $sep)
+				if ($str[$i] == $sep)
 				{
-					$end = $i - 1;
+					$end = $i-1;
 				}
 				else
 				{
 					break;
 				}
 			}
-			return substr($str,$start,$end);
+			return substr($str, $start, $end);
 		}
 
 		function checkEncryptData($dataArray)
 		{
-			if(count($dataArray) == 2){
+			if (count($dataArray) == 2) {
 				return  $this->isBase64Str($dataArray[0]);
-			}else{
+			}else {
 				return  $this->isBase64Str($dataArray[0]) && $this->isBase64Str($dataArray[1]);
 			}
 		}
@@ -101,10 +101,10 @@ 
 		/*
 		* 判断是否是加密数据
 		*/
-		function isEncryptDataArray($array,$type)
+		function isEncryptDataArray($array, $type)
 		{
 			foreach ($array as $value) {
-				if(!$this->isEncryptData($value,$type)){
+				if (!$this->isEncryptData($value, $type)) {
 					return false;
 				}
 			}
@@ -114,11 +114,11 @@ 
 		/**
 		* 判断是否是已加密的数据，数据必须是同一个类型
 		*/
-		function isPartEncryptData($array,$type)
+		function isPartEncryptData($array, $type)
 		{
 			$result = false;
 			foreach ($array as $value) {
-				if($this->isEncryptData($value,$type)){
+				if ($this->isEncryptData($value, $type)) {
 					$result = true;
 					break;
 				}
@@ -129,48 +129,48 @@ 
 		/*
 		* 判断是否是加密数据
 		*/
-		function isEncryptData($data,$type)
+		function isEncryptData($data, $type)
 		{
-			if(!is_string($data) || strlen($data) < 4)
+			if (!is_string($data) || strlen($data) < 4)
 			{
 				return false;
 			}
 
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
 			$strlen = strlen($data);
-			if($data[0] != $separator || $data[$strlen -1] != $separator)
+			if ($data[0] != $separator || $data[$strlen-1] != $separator)
 			{
 				return false;
 			}
 
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
+			$dataArray = explode($separator, $this->trimBySep($data, $separator));
 			$arrayLength = count($dataArray);
 
-			if($separator == PHONE_SEPARATOR_CHAR)
+			if ($separator == PHONE_SEPARATOR_CHAR)
 			{
-				if($arrayLength != 3)
+				if ($arrayLength != 3)
 				{
 					return false;
 				}
-				if($data[$strlen - 2] == $separator)
+				if ($data[$strlen-2] == $separator)
 				{
 					return $this->checkEncryptData($dataArray);
 				} 
 				else
 				{
-					$version = $dataArray[$arrayLength -1];
-					if(is_numeric($version))
+					$version = $dataArray[$arrayLength-1];
+					if (is_numeric($version))
 					{
-						$base64Val = $dataArray[$arrayLength -2];
+						$base64Val = $dataArray[$arrayLength-2];
 						return $this->isBase64Str($base64Val);
 					}
 				}
-			}else{
-				if($data[strlen($data) - 2] == $separator && $arrayLength == 3)
+			}else {
+				if ($data[strlen($data)-2] == $separator && $arrayLength == 3)
 				{
 					return $this->checkEncryptData($dataArray);
 				}
-				else if($arrayLength == 2)
+				else if ($arrayLength == 2)
 				{
 					return $this->checkEncryptData($dataArray);
 				}
@@ -181,22 +181,22 @@ 
 			}
 		}
 
-		function search($data, $type,$secretContext)
+		function search($data, $type, $secretContext)
 		{
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			if('phone' == $type) {
-		        if (strlen($data) != 4 ) {
+			if ('phone' == $type) {
+		        if (strlen($data) != 4) {
 		            throw new Exception("phoneNumber error");
 		        }
 		        return $separator.$this->hmacMD5EncryptToBase64($data, $secretContext->secret).$separator;
-			} else {
-				$compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
-				$slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
+			}else {
+				$compressLen = $this->getArrayValue($secretContext->appConfig, 'encrypt_index_compress_len', 3);
+				$slideSize = $this->getArrayValue($secretContext->appConfig, 'encrypt_slide_size', 4);
 
 				$slideList = $this->getSlideWindows($data, $slideSize);
 		        $builder = '';
 		        foreach ($slideList as $slide) {
-					$builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
+					$builder .= $this->hmacMD5EncryptToBase64($slide, $secretContext->secret, $compressLen);
 				}
 		        return $builder;
 			}
@@ -205,28 +205,28 @@ 
 		/*
 		* 加密逻辑
 		*/
-		function encrypt($data,$type,$version,$secretContext)
+		function encrypt($data, $type, $version, $secretContext)
 		{
-			if(!is_string($data))
+			if (!is_string($data))
 			{
 				return false;
 			}
 
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			$isIndexEncrypt = $this->isIndexEncrypt($type,$version,$secretContext);
-			if($isIndexEncrypt || $type == "search"){
-				if('phone' == $type) {
-					return $this->encryptPhoneIndex($data,$separator,$secretContext);
-				} else {
-					$compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
-					$slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
-					return $this->encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext);
+			$isIndexEncrypt = $this->isIndexEncrypt($type, $version, $secretContext);
+			if ($isIndexEncrypt || $type == "search") {
+				if ('phone' == $type) {
+					return $this->encryptPhoneIndex($data, $separator, $secretContext);
+				}else {
+					$compressLen = $this->getArrayValue($secretContext->appConfig, 'encrypt_index_compress_len', 3);
+					$slideSize = $this->getArrayValue($secretContext->appConfig, 'encrypt_slide_size', 4);
+					return $this->encryptNormalIndex($data, $compressLen, $slideSize, $separator, $secretContext);
 				}
-			}else{
-				if('phone' == $type) {
-					return $this->encryptPhone($data,$separator,$secretContext);
-				} else {
-					return $this->encryptNormal($data,$separator,$secretContext);
+			}else {
+				if ('phone' == $type) {
+					return $this->encryptPhone($data, $separator, $secretContext);
+				}else {
+					return $this->encryptNormal($data, $separator, $secretContext);
 				}
 			}
 
@@ -235,35 +235,35 @@ 
 		/*
 		* 加密逻辑,手机号码格式
 		*/
-		function encryptPhone($data,$separator,$secretContext)
+		function encryptPhone($data, $separator, $secretContext)
 		{
 			$len = strlen($data);
-			if($len < 11)
+			if ($len < 11)
 			{
 				return $data;
 			}
-			$prefixNumber = substr($data,0,$len -8);
-			$last8Number =  substr($data,$len -8,$len);
+			$prefixNumber = substr($data, 0, $len-8);
+			$last8Number = substr($data, $len-8, $len);
 
-			return $separator.$prefixNumber.$separator.Security::encrypt($last8Number,$secretContext->secret)
-				  .$separator.$secretContext->secretVersion.$separator ;
+			return $separator.$prefixNumber.$separator.Security::encrypt($last8Number, $secretContext->secret)
+				  .$separator.$secretContext->secretVersion.$separator;
 		}
 
 		/*
 		* 加密逻辑,非手机号码格式
 		*/
-		function encryptNormal($data,$separator,$secretContext)
+		function encryptNormal($data, $separator, $secretContext)
 		{
-			return $separator.Security::encrypt($data,$secretContext->secret)
+			return $separator.Security::encrypt($data, $secretContext->secret)
 							 .$separator.$secretContext->secretVersion.$separator;
 		}
 
 		/*
 		* 解密逻辑
 		*/
-		function decrypt($data,$type,$secretContext)
+		function decrypt($data, $type, $secretContext)
 		{			
-			if(!$this->isEncryptData($data,$type))
+			if (!$this->isEncryptData($data, $type))
 			{
 				throw new Exception("数据[".$data."]不是类型为[".$type."]的加密数据");
 			}
@@ -271,19 +271,19 @@ 
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
 
 			$secretData = null;
-			if($data[$dataLen - 2] == $separator){
-				$secretData = $this->getIndexSecretData($data,$separator);
-			}else{
-				$secretData = $this->getSecretData($data,$separator);
+			if ($data[$dataLen-2] == $separator) {
+				$secretData = $this->getIndexSecretData($data, $separator);
+			}else {
+				$secretData = $this->getSecretData($data, $separator);
 			}
 			
-			if($secretData == null){
+			if ($secretData == null) {
 				return $data;
 			}
 
-			$result = Security::decrypt($secretData->originalBase64Value,$secretContext->secret);
+			$result = Security::decrypt($secretData->originalBase64Value, $secretContext->secret);
 
-			if($separator == PHONE_SEPARATOR_CHAR && !$secretData->search)
+			if ($separator == PHONE_SEPARATOR_CHAR && !$secretData->search)
 			{
 				return $secretData->originalValue.$result;
 			}
@@ -293,46 +293,46 @@ 
 		/*
 		* 判断是否是公钥数据
 		*/
-		function isPublicData($data,$type)
+		function isPublicData($data, $type)
 		{
-			$secretData = $this->getSecretDataByType($data,$type);
-			if(empty($secretData)){
+			$secretData = $this->getSecretDataByType($data, $type);
+			if (empty($secretData)) {
 				return false;
 			}
-			if(intval($secretData->secretVersion) < 0){
+			if (intval($secretData->secretVersion) < 0) {
 				return true;
 			}
 			return false;
 		}
 
-		function getSecretDataByType($data,$type)
+		function getSecretDataByType($data, $type)
 		{
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
 			$dataLen = strlen($data);
 
-			if($data[$dataLen - 2] == $separator){
-				return $secretData = $this->getIndexSecretData($data,$separator);
-			}else{
-				return  $secretData = $this->getSecretData($data,$separator);
+			if ($data[$dataLen-2] == $separator) {
+				return $secretData = $this->getIndexSecretData($data, $separator);
+			}else {
+				return  $secretData = $this->getSecretData($data, $separator);
 			}
 		}
 
 		/*
 		* 分解密文
 		*/
-		function getSecretData($data,$separator)
+		function getSecretData($data, $separator)
 		{
 			$secretData = new SecretData;
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
+			$dataArray = explode($separator, $this->trimBySep($data, $separator));
 			$arrayLength = count($dataArray);
 
-			if($separator == PHONE_SEPARATOR_CHAR)
+			if ($separator == PHONE_SEPARATOR_CHAR)
 			{
-				if($arrayLength != 3){
+				if ($arrayLength != 3) {
 					return null;
-				}else{
+				}else {
 					$version = $dataArray[2];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalValue = $dataArray[0];
 						$secretData->originalBase64Value = $dataArray[1];
@@ -342,11 +342,11 @@ 
 			}
 			else
 			{
-				if($arrayLength != 2){
+				if ($arrayLength != 2) {
 					return null;
-				}else{
+				}else {
 					$version = $dataArray[1];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalBase64Value = $dataArray[0];
 						$secretData->secretVersion = $version;
@@ -356,17 +356,17 @@ 
 			return $secretData;
 		}
 
-		function getIndexSecretData($data,$separator) {
+		function getIndexSecretData($data, $separator) {
 			$secretData = new SecretData;
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
+			$dataArray = explode($separator, $this->trimBySep($data, $separator));
 			$arrayLength = count($dataArray);
 
-	        if($separator == PHONE_SEPARATOR_CHAR) {
+	        if ($separator == PHONE_SEPARATOR_CHAR) {
 	            if ($arrayLength != 3) {
 	                return null;
-	            }else{
+	            }else {
 					$version = $dataArray[2];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalValue = $dataArray[0];
 						$secretData->originalBase64Value = $dataArray[1];
@@ -374,12 +374,12 @@ 
 					}
 	            }
 	            
-	        } else {
-	        	if($arrayLength != 3){
+	        }else {
+	        	if ($arrayLength != 3) {
 					return null;
-				} else {
+				}else {
 					$version = $dataArray[2];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalBase64Value = $dataArray[0];
 						$secretData->originalValue = $dataArray[1];
@@ -399,16 +399,16 @@ 
 	     * @param version
 	     * @return
 	     */
-		function isIndexEncrypt($key,$version,$secretContext)
+		function isIndexEncrypt($key, $version, $secretContext)
 		{
 	        if ($version != null && $version < 0) {
 	            $key = "previous_".$key;
-	        } else {
+	        }else {
 	            $key = "current_".$key;
 	        }
 
 	        return $secretContext->appConfig != null && 
-	               array_key_exists($key,$secretContext->appConfig) && 
+	               array_key_exists($key, $secretContext->appConfig) && 
 	               $secretContext->appConfig[$key] == "2";
 		}
 
@@ -428,36 +428,36 @@ 
 			return count($match[0]);
 		}
 
-		function utf8_substr($string,$start,$end) {
+		function utf8_substr($string, $start, $end) {
 			// 将字符串分解为单元
 			preg_match_all("/./us", $string, $match);
 			// 返回单元个数
 			$result = "";
-			for($i = $start; $i < $end; $i++){
+			for ($i = $start; $i < $end; $i++) {
 				$result .= $match[0][$i];
 			}
 			return $result;
 		}
 
-		function utf8_str_at($string,$index) {
+		function utf8_str_at($string, $index) {
 			// 将字符串分解为单元
 			preg_match_all("/./us", $string, $match);
 			// 返回单元个数
 			return $match[0][$index];
 		}
 
-		function compress($input,$toLength) {
-			if($toLength < 0) {
+		function compress($input, $toLength) {
+			if ($toLength < 0) {
 				return null;
 			}
 			$output = array();
-			for($i = 0; $i < $toLength; $i++) {
+			for ($i = 0; $i < $toLength; $i++) {
 				$output[$i] = chr(0);
 			}
 			$input = $this->getBytes($input);
 			$inputLength = count($input);
 			for ($i = 0; $i < $inputLength; $i++) {
-	            $index_output = $i % $toLength;
+	            $index_output = $i%$toLength;
 	            $output[$index_output] = $output[$index_output] ^ $input[$i];
 	        }
 	        return $output;
@@ -474,10 +474,10 @@ 
 	     * @return
 	     * @throws Exception
 	     */
-		function hmacMD5EncryptToBase64($encryptText,$encryptKey,$compressLen = 0) {
-			$encryptResult = Security::hmac_md5($encryptText,$encryptKey);
-			if($compressLen != 0){
-				$encryptResult = $this->compress($encryptResult,$compressLen);
+		function hmacMD5EncryptToBase64($encryptText, $encryptKey, $compressLen = 0) {
+			$encryptResult = Security::hmac_md5($encryptText, $encryptKey);
+			if ($compressLen != 0) {
+				$encryptResult = $this->compress($encryptResult, $compressLen);
 			}
 			return base64_encode($this->toStr($encryptResult));
 		}
@@ -490,7 +490,7 @@ 
 	     * @param slideSize
 	     * @return
 	     */
-		function getSlideWindows($input,$slideSize = 4)
+		function getSlideWindows($input, $slideSize = 4)
 		{
 			$endIndex = 0;
 			$startIndex = 0;
@@ -498,70 +498,70 @@ 
 			$currentWindow = null;
 			$dataLength = $this->utf8_strlen($input);
 			$windows = array();
-			while($endIndex < $dataLength || $currentWindowSize > $slideSize) 
+			while ($endIndex < $dataLength || $currentWindowSize > $slideSize) 
 			{
 				$startsWithLetterOrDigit = false;
-				if(!empty($currentWindow)){
-					$startsWithLetterOrDigit = $this->isLetterOrDigit($this->utf8_str_at($currentWindow,0));
+				if (!empty($currentWindow)) {
+					$startsWithLetterOrDigit = $this->isLetterOrDigit($this->utf8_str_at($currentWindow, 0));
 				}
-				if($endIndex == $dataLength && $startsWithLetterOrDigit == false){
+				if ($endIndex == $dataLength && $startsWithLetterOrDigit == false) {
 					break;
 				}
-				if($currentWindowSize == $slideSize && 
+				if ($currentWindowSize == $slideSize && 
 				   $startsWithLetterOrDigit == false && 
-				   $this->isLetterOrDigit($this->utf8_str_at($input,$endIndex))) {
-				   $endIndex ++;
-				   $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
+				   $this->isLetterOrDigit($this->utf8_str_at($input, $endIndex))) {
+				   $endIndex++;
+				   $currentWindow = $this->utf8_substr($input, $startIndex, $endIndex);
 				   $currentWindowSize = 5;
-				} else {
-				    if($endIndex != 0){
-				    	if($startsWithLetterOrDigit){
+				}else {
+				    if ($endIndex != 0) {
+				    	if ($startsWithLetterOrDigit) {
 				    		$currentWindowSize -= 1;
-				    	}else{
+				    	}else {
 				    		$currentWindowSize -= 2;
 				    	}
-				    	$startIndex ++;
+				    	$startIndex++;
 				    }
 
 	                while ($currentWindowSize < $slideSize && $endIndex < $dataLength) {
-	                    $currentChar = $this->utf8_str_at($input,$endIndex);
+	                    $currentChar = $this->utf8_str_at($input, $endIndex);
 	                    if ($this->isLetterOrDigit($currentChar)) {
 	                        $currentWindowSize += 1;
-	                    } else {
+	                    }else {
 	                        $currentWindowSize += 2;
 	                    }
 	                    $endIndex++;
 	                }
-	                $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
+	                $currentWindow = $this->utf8_substr($input, $startIndex, $endIndex);
 				}
-				array_push($windows,$currentWindow);
+				array_push($windows, $currentWindow);
 			}
 			return $windows;
 		}
 
-		function encryptPhoneIndex($data,$separator,$secretContext) {
+		function encryptPhoneIndex($data, $separator, $secretContext) {
 			$dataLength = strlen($data);
-			if($dataLength < 11) {
+			if ($dataLength < 11) {
 				return $data;
 			}
-			$last4Number = substr($data,$dataLength -4 ,$dataLength);
-			return $separator.$this->hmacMD5EncryptToBase64($last4Number,$secretContext->secret).$separator
-				   .Security::encrypt($data,$secretContext->secret).$separator.$secretContext->secretVersion
+			$last4Number = substr($data, $dataLength-4, $dataLength);
+			return $separator.$this->hmacMD5EncryptToBase64($last4Number, $secretContext->secret).$separator
+				   .Security::encrypt($data, $secretContext->secret).$separator.$secretContext->secretVersion
 				   .$separator.$separator;
 		}
 
-		function encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext) {
+		function encryptNormalIndex($data, $compressLen, $slideSize, $separator, $secretContext) {
 			$slideList = $this->getSlideWindows($data, $slideSize);
 			$builder = "";
 			foreach ($slideList as $slide) {
-				$builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
+				$builder .= $this->hmacMD5EncryptToBase64($slide, $secretContext->secret, $compressLen);
 			}
-			return $separator.Security::encrypt($data,$secretContext->secret).$separator.$builder.$separator
+			return $separator.Security::encrypt($data, $secretContext->secret).$separator.$builder.$separator
 				   .$secretContext->secretVersion.$separator.$separator;
 		}
 
-		function getArrayValue($array,$key,$default) {
-			if(array_key_exists($key, $array)){
+		function getArrayValue($array, $key, $default) {
+			if (array_key_exists($key, $array)) {
 				return $array[$key];
 			}
 			return $default;
@@ -569,18 +569,18 @@ 
 
 		function getBytes($string) {  
 	        $bytes = array();  
-	        for($i = 0; $i < strlen($string); $i++){  
+	        for ($i = 0; $i < strlen($string); $i++) {  
 	             $bytes[] = ord($string[$i]);  
 	        }  
 	        return $bytes;  
 	    }  
 
 		function toStr($bytes) {
-			if(!is_array($bytes)){
+			if (!is_array($bytes)) {
 				return $bytes;
 			}
 	        $str = '';	        
-	        foreach($bytes as $ch) {
+	        foreach ($bytes as $ch) {
 	            $str .= chr($ch);
 	        }
 	        return $str;