GC0202 / ThinkLibrary

src/service/taobao/bin/top/request/TopSecretRegisterRequest.php

Indentation +29 added lines, -29 removed lines

@@ -7,41 +7,41 @@
  */
 class TopSecretRegisterRequest
 {
-	/** 
-	 * 用户id，保证唯一
-	 **/
-	private $userId;
+    /** 
+     * 用户id，保证唯一
+     **/
+    private $userId;
 	
-	private $apiParas = array();
+    private $apiParas = array();
 	
-	public function setUserId($userId)
-	{
-		$this->userId = $userId;
-		$this->apiParas["user_id"] = $userId;
-	}
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+        $this->apiParas["user_id"] = $userId;
+    }
 
-	public function getUserId()
-	{
-		return $this->userId;
-	}
+    public function getUserId()
+    {
+        return $this->userId;
+    }
 
-	public function getApiMethodName()
-	{
-		return "taobao.top.secret.register";
-	}
+    public function getApiMethodName()
+    {
+        return "taobao.top.secret.register";
+    }
 	
-	public function getApiParas()
-	{
-		return $this->apiParas;
-	}
+    public function getApiParas()
+    {
+        return $this->apiParas;
+    }
 	
-	public function check()
-	{
+    public function check()
+    {
 		
-	}
+    }
 	
-	public function putOtherTextParam($key, $value) {
-		$this->apiParas[$key] = $value;
-		$this->$key = $value;
-	}
+    public function putOtherTextParam($key, $value) {
+        $this->apiParas[$key] = $value;
+        $this->$key = $value;
+    }
 }

src/service/taobao/bin/top/request/TopAuthTokenRefreshRequest.php

Indentation +30 added lines, -30 removed lines

@@ -7,42 +7,42 @@
  */
 class TopAuthTokenRefreshRequest
 {
-	/** 
-	 * grantType==refresh_token 时需要
-	 **/
-	private $refreshToken;
+    /** 
+     * grantType==refresh_token 时需要
+     **/
+    private $refreshToken;
 	
-	private $apiParas = array();
+    private $apiParas = array();
 	
-	public function setRefreshToken($refreshToken)
-	{
-		$this->refreshToken = $refreshToken;
-		$this->apiParas["refresh_token"] = $refreshToken;
-	}
+    public function setRefreshToken($refreshToken)
+    {
+        $this->refreshToken = $refreshToken;
+        $this->apiParas["refresh_token"] = $refreshToken;
+    }
 
-	public function getRefreshToken()
-	{
-		return $this->refreshToken;
-	}
+    public function getRefreshToken()
+    {
+        return $this->refreshToken;
+    }
 
-	public function getApiMethodName()
-	{
-		return "taobao.top.auth.token.refresh";
-	}
+    public function getApiMethodName()
+    {
+        return "taobao.top.auth.token.refresh";
+    }
 	
-	public function getApiParas()
-	{
-		return $this->apiParas;
-	}
+    public function getApiParas()
+    {
+        return $this->apiParas;
+    }
 	
-	public function check()
-	{
+    public function check()
+    {
 		
-		RequestCheckUtil::checkNotNull($this->refreshToken,"refreshToken");
-	}
+        RequestCheckUtil::checkNotNull($this->refreshToken,"refreshToken");
+    }
 	
-	public function putOtherTextParam($key, $value) {
-		$this->apiParas[$key] = $value;
-		$this->$key = $value;
-	}
+    public function putOtherTextParam($key, $value) {
+        $this->apiParas[$key] = $value;
+        $this->$key = $value;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	public function check()
 	{
 		
-		RequestCheckUtil::checkNotNull($this->refreshToken,"refreshToken");
+		RequestCheckUtil::checkNotNull($this->refreshToken, "refreshToken");
 	}
 	
 	public function putOtherTextParam($key, $value) {

src/service/taobao/bin/top/request/OpenuidGetRequest.php

Indentation +16 added lines, -16 removed lines

@@ -8,25 +8,25 @@
 class OpenuidGetRequest
 {
 	
-	private $apiParas = array();
+    private $apiParas = array();
 	
-	public function getApiMethodName()
-	{
-		return "taobao.openuid.get";
-	}
+    public function getApiMethodName()
+    {
+        return "taobao.openuid.get";
+    }
 	
-	public function getApiParas()
-	{
-		return $this->apiParas;
-	}
+    public function getApiParas()
+    {
+        return $this->apiParas;
+    }
 	
-	public function check()
-	{
+    public function check()
+    {
 		
-	}
+    }
 	
-	public function putOtherTextParam($key, $value) {
-		$this->apiParas[$key] = $value;
-		$this->$key = $value;
-	}
+    public function putOtherTextParam($key, $value) {
+        $this->apiParas[$key] = $value;
+        $this->$key = $value;
+    }
 }

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

Indentation +192 added lines, -192 removed lines

@@ -1,199 +1,199 @@
 <?php
 class ClusterTopClient extends TopClient {
 
-	private static $dnsconfig;
-	private static $syncDate = 0;
-	private static $applicationVar ;
-	private static $cfgDuration = 10;
-
-	public function __construct($appkey = "",$secretKey = ""){
-		ClusterTopClient::$applicationVar = new ApplicationVar;
-		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
-		$saveConfig = ClusterTopClient::$applicationVar->getValue();
-
-		if($saveConfig){
-			$tmpConfig = $saveConfig['dnsconfig'];
-			ClusterTopClient::$dnsconfig = $this->object_to_array($tmpConfig);
-			unset($tmpConfig);
-
-			ClusterTopClient::$syncDate = $saveConfig['syncDate'];
-			if(!ClusterTopClient::$syncDate)
-				ClusterTopClient::$syncDate = 0;
-		}
-	}
-
-	public function __destruct(){
-		if(ClusterTopClient::$dnsconfig && ClusterTopClient::$syncDate){
-			ClusterTopClient::$applicationVar->setValue("dnsconfig",ClusterTopClient::$dnsconfig);
-			ClusterTopClient::$applicationVar->setValue("syncDate",ClusterTopClient::$syncDate);
-			ClusterTopClient::$applicationVar->write();
-		}
-	}
-
-	public function execute($request = null, $session = null,$bestUrl = null){
-		$currentDate = date('U');
-		$syncDuration = $this->getDnsConfigSyncDuration();
-		$bestUrl = $this->getBestVipUrl($this->gatewayUrl,$request->getApiMethodName(),$session);
-		if($currentDate - ClusterTopClient::$syncDate > $syncDuration * 60){
-			$httpdns = new HttpdnsGetRequest;
-			ClusterTopClient::$dnsconfig = json_decode(parent::execute($httpdns,null,$bestUrl)->result,true);
-			$syncDate = date('U');
-			ClusterTopClient::$syncDate = $syncDate ;
-		}
-		return parent::execute($request,$session,$bestUrl);
-	}
-
-	private function getDnsConfigSyncDuration(){
-		if(ClusterTopClient::$cfgDuration){
-			return ClusterTopClient::$cfgDuration;
-		}
-		if(!ClusterTopClient::$dnsconfig){
-			return ClusterTopClient::$cfgDuration;
-		}
-		$config = json_encode(ClusterTopClient::$dnsconfig);
-		if(!$config){
-			return ClusterTopClient::$cfgDuration;
-		}
-		$config = ClusterTopClient::$dnsconfig['config'];
-		$duration = $config['interval'];
-		ClusterTopClient::$cfgDuration = $duration;
-
-		return ClusterTopClient::$cfgDuration;
-	}
-
-	private function getBestVipUrl($url,$apiname = null,$session = null){
-		$config = ClusterTopClient::$dnsconfig['config'];
-		$degrade = $config['degrade'];
-		if(strcmp($degrade,'true') == 0){
-			return $url;
-		}		
-		$currentEnv = $this->getEnvByApiName($apiname,$session);
-		$vip = $this->getVipByEnv($url,$currentEnv);
-		if($vip)
-			return $vip;
-		return $url;
-	}
-
-	private function getVipByEnv($comUrl,$currentEnv){
-		$urlSchema = parse_url($comUrl);
-		if(!$urlSchema)
-			return null;
-		if(!ClusterTopClient::$dnsconfig['env'])
-			return null;
+    private static $dnsconfig;
+    private static $syncDate = 0;
+    private static $applicationVar ;
+    private static $cfgDuration = 10;
+
+    public function __construct($appkey = "",$secretKey = ""){
+        ClusterTopClient::$applicationVar = new ApplicationVar;
+        $this->appkey = $appkey;
+        $this->secretKey = $secretKey ;
+        $saveConfig = ClusterTopClient::$applicationVar->getValue();
+
+        if($saveConfig){
+            $tmpConfig = $saveConfig['dnsconfig'];
+            ClusterTopClient::$dnsconfig = $this->object_to_array($tmpConfig);
+            unset($tmpConfig);
+
+            ClusterTopClient::$syncDate = $saveConfig['syncDate'];
+            if(!ClusterTopClient::$syncDate)
+                ClusterTopClient::$syncDate = 0;
+        }
+    }
+
+    public function __destruct(){
+        if(ClusterTopClient::$dnsconfig && ClusterTopClient::$syncDate){
+            ClusterTopClient::$applicationVar->setValue("dnsconfig",ClusterTopClient::$dnsconfig);
+            ClusterTopClient::$applicationVar->setValue("syncDate",ClusterTopClient::$syncDate);
+            ClusterTopClient::$applicationVar->write();
+        }
+    }
+
+    public function execute($request = null, $session = null,$bestUrl = null){
+        $currentDate = date('U');
+        $syncDuration = $this->getDnsConfigSyncDuration();
+        $bestUrl = $this->getBestVipUrl($this->gatewayUrl,$request->getApiMethodName(),$session);
+        if($currentDate - ClusterTopClient::$syncDate > $syncDuration * 60){
+            $httpdns = new HttpdnsGetRequest;
+            ClusterTopClient::$dnsconfig = json_decode(parent::execute($httpdns,null,$bestUrl)->result,true);
+            $syncDate = date('U');
+            ClusterTopClient::$syncDate = $syncDate ;
+        }
+        return parent::execute($request,$session,$bestUrl);
+    }
+
+    private function getDnsConfigSyncDuration(){
+        if(ClusterTopClient::$cfgDuration){
+            return ClusterTopClient::$cfgDuration;
+        }
+        if(!ClusterTopClient::$dnsconfig){
+            return ClusterTopClient::$cfgDuration;
+        }
+        $config = json_encode(ClusterTopClient::$dnsconfig);
+        if(!$config){
+            return ClusterTopClient::$cfgDuration;
+        }
+        $config = ClusterTopClient::$dnsconfig['config'];
+        $duration = $config['interval'];
+        ClusterTopClient::$cfgDuration = $duration;
+
+        return ClusterTopClient::$cfgDuration;
+    }
+
+    private function getBestVipUrl($url,$apiname = null,$session = null){
+        $config = ClusterTopClient::$dnsconfig['config'];
+        $degrade = $config['degrade'];
+        if(strcmp($degrade,'true') == 0){
+            return $url;
+        }		
+        $currentEnv = $this->getEnvByApiName($apiname,$session);
+        $vip = $this->getVipByEnv($url,$currentEnv);
+        if($vip)
+            return $vip;
+        return $url;
+    }
+
+    private function getVipByEnv($comUrl,$currentEnv){
+        $urlSchema = parse_url($comUrl);
+        if(!$urlSchema)
+            return null;
+        if(!ClusterTopClient::$dnsconfig['env'])
+            return null;
 		
-		if(!array_key_exists($currentEnv,ClusterTopClient::$dnsconfig['env']))
-			return null;
-
-		$hostList = ClusterTopClient::$dnsconfig['env'][$currentEnv];
-		if(!$hostList)
-			return null ;
-
-		$vipList = null;
-		foreach ($hostList as $key => $value) {
-			if(strcmp($key,$urlSchema['host']) == 0 && strcmp($value['proto'],$urlSchema['scheme']) == 0){
-				$vipList = $value;
-				break;
-			}
-		}
-		$vip = $this->getRandomWeightElement($vipList['vip']);
+        if(!array_key_exists($currentEnv,ClusterTopClient::$dnsconfig['env']))
+            return null;
+
+        $hostList = ClusterTopClient::$dnsconfig['env'][$currentEnv];
+        if(!$hostList)
+            return null ;
+
+        $vipList = null;
+        foreach ($hostList as $key => $value) {
+            if(strcmp($key,$urlSchema['host']) == 0 && strcmp($value['proto'],$urlSchema['scheme']) == 0){
+                $vipList = $value;
+                break;
+            }
+        }
+        $vip = $this->getRandomWeightElement($vipList['vip']);
 		
-		if($vip){
-			return $urlSchema['scheme']."://".$vip.$urlSchema['path'];
-		}
-		return null;
-	}
-
-	private function getEnvByApiName($apiName,$session=""){
-		$apiCfgArray = ClusterTopClient::$dnsconfig['api'];
-		if($apiCfgArray){	
-			if(array_key_exists($apiName,$apiCfgArray)){
-				$apiCfg = $apiCfgArray[$apiName];
-				if(array_key_exists('user',$apiCfg)){
-					$userFlag = $apiCfg['user'];
-					$flag = $this->getUserFlag($session);
-					if($userFlag && $flag ){
-						return $this->getEnvBySessionFlag($userFlag,$flag);
-					}else{
-						return $this->getRandomWeightElement($apiCfg['rule']);
-					}
-				}
-			}
-		}
-		return $this->getDeafultEnv();
-	}
-
-	private function getUserFlag($session){
-		if($session && strlen($session) > 5){
-			if($session[0] == '6' || $session[0] == '7'){
-				return $session[strlen($session) -1];
-			}else if($session[0] == '5' || $session[0] == '8'){
-				return $session[5];
-			}
-		}
-		return null;
-	}
-
-	private function getEnvBySessionFlag($targetConfig,$flag){
-		if($flag){
-			$userConf = ClusterTopClient::$dnsconfig['user'];
-			$cfgArry = $userConf[$targetConfig];
-			foreach ($cfgArry as $key => $value) {
-				if(in_array($flag,$value))
-					return $key;
-			}
-		}else{
-			return null;
-		}
-	}
-
-	private function getRandomWeightElement($elements){
-		$totalWeight = 0;
-		if($elements){
-			foreach ($elements as $ele) {
-				$weight = $this->getElementWeight($ele);
-				$r = $this->randomFloat() * ($weight + $totalWeight);
-				if($r >= $totalWeight){
-					$selected = $ele;
-				}
-				$totalWeight += $weight;
-			}
-			if($selected){
-				return $this->getElementValue($selected);
-			}
-		}
-		return null;
-
-	}
-
-	private function getElementWeight($ele){
-		$params = explode('|', $ele);
-		return floatval($params[1]);
-	}
-	private function getElementValue($ele){
-		$params = explode('|', $ele);
-		return $params[0];		
-	}
-
-	private function getDeafultEnv(){
-		return ClusterTopClient::$dnsconfig['config']['def_env'];
-	}
-
-	private static function startsWith($haystack, $needle) {
-    	return $needle === "" || strpos($haystack, $needle) === 0;
-	}
-
-	private function object_to_array($obj) 
-	{ 
-    	$_arr= is_object($obj) ? get_object_vars($obj) : $obj; 
-    	foreach($_arr as $key=> $val) 
-    	{ 
-        	$val= (is_array($val) || is_object($val))? $this->object_to_array($val) : $val; 
-        	$arr[$key] = $val; 
-    	} 
-    	return$arr; 
-	}
-
-	private function randomFloat($min = 0, $max = 1) { return $min + mt_rand() / mt_getrandmax() * ($max - $min); }
+        if($vip){
+            return $urlSchema['scheme']."://".$vip.$urlSchema['path'];
+        }
+        return null;
+    }
+
+    private function getEnvByApiName($apiName,$session=""){
+        $apiCfgArray = ClusterTopClient::$dnsconfig['api'];
+        if($apiCfgArray){	
+            if(array_key_exists($apiName,$apiCfgArray)){
+                $apiCfg = $apiCfgArray[$apiName];
+                if(array_key_exists('user',$apiCfg)){
+                    $userFlag = $apiCfg['user'];
+                    $flag = $this->getUserFlag($session);
+                    if($userFlag && $flag ){
+                        return $this->getEnvBySessionFlag($userFlag,$flag);
+                    }else{
+                        return $this->getRandomWeightElement($apiCfg['rule']);
+                    }
+                }
+            }
+        }
+        return $this->getDeafultEnv();
+    }
+
+    private function getUserFlag($session){
+        if($session && strlen($session) > 5){
+            if($session[0] == '6' || $session[0] == '7'){
+                return $session[strlen($session) -1];
+            }else if($session[0] == '5' || $session[0] == '8'){
+                return $session[5];
+            }
+        }
+        return null;
+    }
+
+    private function getEnvBySessionFlag($targetConfig,$flag){
+        if($flag){
+            $userConf = ClusterTopClient::$dnsconfig['user'];
+            $cfgArry = $userConf[$targetConfig];
+            foreach ($cfgArry as $key => $value) {
+                if(in_array($flag,$value))
+                    return $key;
+            }
+        }else{
+            return null;
+        }
+    }
+
+    private function getRandomWeightElement($elements){
+        $totalWeight = 0;
+        if($elements){
+            foreach ($elements as $ele) {
+                $weight = $this->getElementWeight($ele);
+                $r = $this->randomFloat() * ($weight + $totalWeight);
+                if($r >= $totalWeight){
+                    $selected = $ele;
+                }
+                $totalWeight += $weight;
+            }
+            if($selected){
+                return $this->getElementValue($selected);
+            }
+        }
+        return null;
+
+    }
+
+    private function getElementWeight($ele){
+        $params = explode('|', $ele);
+        return floatval($params[1]);
+    }
+    private function getElementValue($ele){
+        $params = explode('|', $ele);
+        return $params[0];		
+    }
+
+    private function getDeafultEnv(){
+        return ClusterTopClient::$dnsconfig['config']['def_env'];
+    }
+
+    private static function startsWith($haystack, $needle) {
+        return $needle === "" || strpos($haystack, $needle) === 0;
+    }
+
+    private function object_to_array($obj) 
+    { 
+        $_arr= is_object($obj) ? get_object_vars($obj) : $obj; 
+        foreach($_arr as $key=> $val) 
+        { 
+            $val= (is_array($val) || is_object($val))? $this->object_to_array($val) : $val; 
+            $arr[$key] = $val; 
+        } 
+        return$arr; 
+    }
+
+    private function randomFloat($min = 0, $max = 1) { return $min + mt_rand() / mt_getrandmax() * ($max - $min); }
 }
 ?>
\ No newline at end of file

Spacing +60 added lines, -60 removed lines

@@ -3,56 +3,56 @@ 
 
 	private static $dnsconfig;
 	private static $syncDate = 0;
-	private static $applicationVar ;
+	private static $applicationVar;
 	private static $cfgDuration = 10;
 
-	public function __construct($appkey = "",$secretKey = ""){
+	public function __construct($appkey = "", $secretKey = "") {
 		ClusterTopClient::$applicationVar = new ApplicationVar;
 		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
+		$this->secretKey = $secretKey;
 		$saveConfig = ClusterTopClient::$applicationVar->getValue();
 
-		if($saveConfig){
+		if ($saveConfig) {
 			$tmpConfig = $saveConfig['dnsconfig'];
 			ClusterTopClient::$dnsconfig = $this->object_to_array($tmpConfig);
 			unset($tmpConfig);
 
 			ClusterTopClient::$syncDate = $saveConfig['syncDate'];
-			if(!ClusterTopClient::$syncDate)
+			if (!ClusterTopClient::$syncDate)
 				ClusterTopClient::$syncDate = 0;
 		}
 	}
 
-	public function __destruct(){
-		if(ClusterTopClient::$dnsconfig && ClusterTopClient::$syncDate){
-			ClusterTopClient::$applicationVar->setValue("dnsconfig",ClusterTopClient::$dnsconfig);
-			ClusterTopClient::$applicationVar->setValue("syncDate",ClusterTopClient::$syncDate);
+	public function __destruct() {
+		if (ClusterTopClient::$dnsconfig && ClusterTopClient::$syncDate) {
+			ClusterTopClient::$applicationVar->setValue("dnsconfig", ClusterTopClient::$dnsconfig);
+			ClusterTopClient::$applicationVar->setValue("syncDate", ClusterTopClient::$syncDate);
 			ClusterTopClient::$applicationVar->write();
 		}
 	}
 
-	public function execute($request = null, $session = null,$bestUrl = null){
+	public function execute($request = null, $session = null, $bestUrl = null) {
 		$currentDate = date('U');
 		$syncDuration = $this->getDnsConfigSyncDuration();
-		$bestUrl = $this->getBestVipUrl($this->gatewayUrl,$request->getApiMethodName(),$session);
-		if($currentDate - ClusterTopClient::$syncDate > $syncDuration * 60){
+		$bestUrl = $this->getBestVipUrl($this->gatewayUrl, $request->getApiMethodName(), $session);
+		if ($currentDate-ClusterTopClient::$syncDate > $syncDuration*60) {
 			$httpdns = new HttpdnsGetRequest;
-			ClusterTopClient::$dnsconfig = json_decode(parent::execute($httpdns,null,$bestUrl)->result,true);
+			ClusterTopClient::$dnsconfig = json_decode(parent::execute($httpdns, null, $bestUrl)->result, true);
 			$syncDate = date('U');
-			ClusterTopClient::$syncDate = $syncDate ;
+			ClusterTopClient::$syncDate = $syncDate;
 		}
-		return parent::execute($request,$session,$bestUrl);
+		return parent::execute($request, $session, $bestUrl);
 	}
 
-	private function getDnsConfigSyncDuration(){
-		if(ClusterTopClient::$cfgDuration){
+	private function getDnsConfigSyncDuration() {
+		if (ClusterTopClient::$cfgDuration) {
 			return ClusterTopClient::$cfgDuration;
 		}
-		if(!ClusterTopClient::$dnsconfig){
+		if (!ClusterTopClient::$dnsconfig) {
 			return ClusterTopClient::$cfgDuration;
 		}
 		$config = json_encode(ClusterTopClient::$dnsconfig);
-		if(!$config){
+		if (!$config) {
 			return ClusterTopClient::$cfgDuration;
 		}
 		$config = ClusterTopClient::$dnsconfig['config'];
@@ -62,59 +62,59 @@ 
 		return ClusterTopClient::$cfgDuration;
 	}
 
-	private function getBestVipUrl($url,$apiname = null,$session = null){
+	private function getBestVipUrl($url, $apiname = null, $session = null) {
 		$config = ClusterTopClient::$dnsconfig['config'];
 		$degrade = $config['degrade'];
-		if(strcmp($degrade,'true') == 0){
+		if (strcmp($degrade, 'true') == 0) {
 			return $url;
 		}		
-		$currentEnv = $this->getEnvByApiName($apiname,$session);
-		$vip = $this->getVipByEnv($url,$currentEnv);
-		if($vip)
+		$currentEnv = $this->getEnvByApiName($apiname, $session);
+		$vip = $this->getVipByEnv($url, $currentEnv);
+		if ($vip)
 			return $vip;
 		return $url;
 	}
 
-	private function getVipByEnv($comUrl,$currentEnv){
+	private function getVipByEnv($comUrl, $currentEnv) {
 		$urlSchema = parse_url($comUrl);
-		if(!$urlSchema)
+		if (!$urlSchema)
 			return null;
-		if(!ClusterTopClient::$dnsconfig['env'])
+		if (!ClusterTopClient::$dnsconfig['env'])
 			return null;
 		
-		if(!array_key_exists($currentEnv,ClusterTopClient::$dnsconfig['env']))
+		if (!array_key_exists($currentEnv, ClusterTopClient::$dnsconfig['env']))
 			return null;
 
 		$hostList = ClusterTopClient::$dnsconfig['env'][$currentEnv];
-		if(!$hostList)
-			return null ;
+		if (!$hostList)
+			return null;
 
 		$vipList = null;
 		foreach ($hostList as $key => $value) {
-			if(strcmp($key,$urlSchema['host']) == 0 && strcmp($value['proto'],$urlSchema['scheme']) == 0){
+			if (strcmp($key, $urlSchema['host']) == 0 && strcmp($value['proto'], $urlSchema['scheme']) == 0) {
 				$vipList = $value;
 				break;
 			}
 		}
 		$vip = $this->getRandomWeightElement($vipList['vip']);
 		
-		if($vip){
+		if ($vip) {
 			return $urlSchema['scheme']."://".$vip.$urlSchema['path'];
 		}
 		return null;
 	}
 
-	private function getEnvByApiName($apiName,$session=""){
+	private function getEnvByApiName($apiName, $session = "") {
 		$apiCfgArray = ClusterTopClient::$dnsconfig['api'];
-		if($apiCfgArray){	
-			if(array_key_exists($apiName,$apiCfgArray)){
+		if ($apiCfgArray) {	
+			if (array_key_exists($apiName, $apiCfgArray)) {
 				$apiCfg = $apiCfgArray[$apiName];
-				if(array_key_exists('user',$apiCfg)){
+				if (array_key_exists('user', $apiCfg)) {
 					$userFlag = $apiCfg['user'];
 					$flag = $this->getUserFlag($session);
-					if($userFlag && $flag ){
-						return $this->getEnvBySessionFlag($userFlag,$flag);
-					}else{
+					if ($userFlag && $flag) {
+						return $this->getEnvBySessionFlag($userFlag, $flag);
+					}else {
 						return $this->getRandomWeightElement($apiCfg['rule']);
 					}
 				}
@@ -123,42 +123,42 @@ 
 		return $this->getDeafultEnv();
 	}
 
-	private function getUserFlag($session){
-		if($session && strlen($session) > 5){
-			if($session[0] == '6' || $session[0] == '7'){
-				return $session[strlen($session) -1];
-			}else if($session[0] == '5' || $session[0] == '8'){
+	private function getUserFlag($session) {
+		if ($session && strlen($session) > 5) {
+			if ($session[0] == '6' || $session[0] == '7') {
+				return $session[strlen($session)-1];
+			}else if ($session[0] == '5' || $session[0] == '8') {
 				return $session[5];
 			}
 		}
 		return null;
 	}
 
-	private function getEnvBySessionFlag($targetConfig,$flag){
-		if($flag){
+	private function getEnvBySessionFlag($targetConfig, $flag) {
+		if ($flag) {
 			$userConf = ClusterTopClient::$dnsconfig['user'];
 			$cfgArry = $userConf[$targetConfig];
 			foreach ($cfgArry as $key => $value) {
-				if(in_array($flag,$value))
+				if (in_array($flag, $value))
 					return $key;
 			}
-		}else{
+		}else {
 			return null;
 		}
 	}
 
-	private function getRandomWeightElement($elements){
+	private function getRandomWeightElement($elements) {
 		$totalWeight = 0;
-		if($elements){
+		if ($elements) {
 			foreach ($elements as $ele) {
 				$weight = $this->getElementWeight($ele);
-				$r = $this->randomFloat() * ($weight + $totalWeight);
-				if($r >= $totalWeight){
+				$r = $this->randomFloat()*($weight+$totalWeight);
+				if ($r >= $totalWeight) {
 					$selected = $ele;
 				}
 				$totalWeight += $weight;
 			}
-			if($selected){
+			if ($selected) {
 				return $this->getElementValue($selected);
 			}
 		}
@@ -166,16 +166,16 @@ 
 
 	}
 
-	private function getElementWeight($ele){
+	private function getElementWeight($ele) {
 		$params = explode('|', $ele);
 		return floatval($params[1]);
 	}
-	private function getElementValue($ele){
+	private function getElementValue($ele) {
 		$params = explode('|', $ele);
 		return $params[0];		
 	}
 
-	private function getDeafultEnv(){
+	private function getDeafultEnv() {
 		return ClusterTopClient::$dnsconfig['config']['def_env'];
 	}
 
@@ -185,15 +185,15 @@ 
 
 	private function object_to_array($obj) 
 	{ 
-    	$_arr= is_object($obj) ? get_object_vars($obj) : $obj; 
-    	foreach($_arr as $key=> $val) 
+    	$_arr = is_object($obj) ? get_object_vars($obj) : $obj; 
+    	foreach ($_arr as $key=> $val) 
     	{ 
-        	$val= (is_array($val) || is_object($val))? $this->object_to_array($val) : $val; 
+        	$val = (is_array($val) || is_object($val)) ? $this->object_to_array($val) : $val; 
         	$arr[$key] = $val; 
     	} 
     	return$arr; 
 	}
 
-	private function randomFloat($min = 0, $max = 1) { return $min + mt_rand() / mt_getrandmax() * ($max - $min); }
+	private function randomFloat($min = 0, $max = 1) { return $min+mt_rand()/mt_getrandmax()*($max-$min); }
 }
 ?>
\ No newline at end of file

Braces +24 added lines, -17 removed lines

@@ -18,8 +18,9 @@ 
 			unset($tmpConfig);
 
 			ClusterTopClient::$syncDate = $saveConfig['syncDate'];
-			if(!ClusterTopClient::$syncDate)
-				ClusterTopClient::$syncDate = 0;
+			if(!ClusterTopClient::$syncDate) {
+							ClusterTopClient::$syncDate = 0;
+			}
 		}
 	}
 
@@ -70,24 +71,29 @@ 
 		}		
 		$currentEnv = $this->getEnvByApiName($apiname,$session);
 		$vip = $this->getVipByEnv($url,$currentEnv);
-		if($vip)
-			return $vip;
+		if($vip) {
+					return $vip;
+		}
 		return $url;
 	}
 
 	private function getVipByEnv($comUrl,$currentEnv){
 		$urlSchema = parse_url($comUrl);
-		if(!$urlSchema)
-			return null;
-		if(!ClusterTopClient::$dnsconfig['env'])
-			return null;
+		if(!$urlSchema) {
+					return null;
+		}
+		if(!ClusterTopClient::$dnsconfig['env']) {
+					return null;
+		}
 		
-		if(!array_key_exists($currentEnv,ClusterTopClient::$dnsconfig['env']))
-			return null;
+		if(!array_key_exists($currentEnv,ClusterTopClient::$dnsconfig['env'])) {
+					return null;
+		}
 
 		$hostList = ClusterTopClient::$dnsconfig['env'][$currentEnv];
-		if(!$hostList)
-			return null ;
+		if(!$hostList) {
+					return null ;
+		}
 
 		$vipList = null;
 		foreach ($hostList as $key => $value) {
@@ -114,7 +120,7 @@ 
 					$flag = $this->getUserFlag($session);
 					if($userFlag && $flag ){
 						return $this->getEnvBySessionFlag($userFlag,$flag);
-					}else{
+					} else{
 						return $this->getRandomWeightElement($apiCfg['rule']);
 					}
 				}
@@ -127,7 +133,7 @@ 
 		if($session && strlen($session) > 5){
 			if($session[0] == '6' || $session[0] == '7'){
 				return $session[strlen($session) -1];
-			}else if($session[0] == '5' || $session[0] == '8'){
+			} else if($session[0] == '5' || $session[0] == '8'){
 				return $session[5];
 			}
 		}
@@ -139,10 +145,11 @@ 
 			$userConf = ClusterTopClient::$dnsconfig['user'];
 			$cfgArry = $userConf[$targetConfig];
 			foreach ($cfgArry as $key => $value) {
-				if(in_array($flag,$value))
-					return $key;
+				if(in_array($flag,$value)) {
+									return $key;
+				}
 			}
-		}else{
+		} else{
 			return null;
 		}
 	}

src/service/taobao/bin/aliyun/AliyunClient.php

Indentation +231 added lines, -231 removed lines

@@ -1,255 +1,255 @@
 <?php
 class AliyunClient
 {
-	public $accessKeyId;
+    public $accessKeyId;
 
-	public $accessKeySecret;
+    public $accessKeySecret;
 
-	public $serverUrl = "http://ecs.aliyuncs.com/";
+    public $serverUrl = "http://ecs.aliyuncs.com/";
 
-	public $format = "json";
+    public $format = "json";
 
-	public $connectTimeout = 3000;//3秒
+    public $connectTimeout = 3000;//3秒
 
-	public $readTimeout = 80000;//80秒
+    public $readTimeout = 80000;//80秒
 
-	/** 是否打开入参check**/
-	public $checkRequest = true;
+    /** 是否打开入参check**/
+    public $checkRequest = true;
 
-	protected $signatureMethod = "HMAC-SHA1";
+    protected $signatureMethod = "HMAC-SHA1";
 
-	protected $signatureVersion = "1.0";
+    protected $signatureVersion = "1.0";
 	
     protected  $dateTimeFormat = 'Y-m-d\TH:i:s\Z'; // ISO8601规范
 	
-	protected $sdkVersion = "1.0";
-
-	public function execute($request)
-	{
-		if($this->checkRequest) {
-			try {
-				$request->check();
-			} catch (Exception $e) {
-				$result->code = $e->getCode();
-				$result->message = $e->getMessage();
-				return $result;
-			}
-		}
-		//获取业务参数
-		$apiParams = $request->getApiParas();
-		//组装系统参数
-		$apiParams["AccessKeyId"] = $this->accessKeyId;
-		$apiParams["Format"] = $this->format;//
-		$apiParams["SignatureMethod"] = $this->signatureMethod;
-		$apiParams["SignatureVersion"] = $this->signatureVersion;
-		$apiParams["SignatureNonce"] = uniqid();
-		date_default_timezone_set("GMT");
-		$apiParams["TimeStamp"] = date($this->dateTimeFormat);
-		$apiParams["partner_id"] = $this->sdkVersion;
+    protected $sdkVersion = "1.0";
+
+    public function execute($request)
+    {
+        if($this->checkRequest) {
+            try {
+                $request->check();
+            } catch (Exception $e) {
+                $result->code = $e->getCode();
+                $result->message = $e->getMessage();
+                return $result;
+            }
+        }
+        //获取业务参数
+        $apiParams = $request->getApiParas();
+        //组装系统参数
+        $apiParams["AccessKeyId"] = $this->accessKeyId;
+        $apiParams["Format"] = $this->format;//
+        $apiParams["SignatureMethod"] = $this->signatureMethod;
+        $apiParams["SignatureVersion"] = $this->signatureVersion;
+        $apiParams["SignatureNonce"] = uniqid();
+        date_default_timezone_set("GMT");
+        $apiParams["TimeStamp"] = date($this->dateTimeFormat);
+        $apiParams["partner_id"] = $this->sdkVersion;
 		
-	    $apiNameArray =	split("\.", $request->getApiMethodName());
-		$apiParams["Action"] = $apiNameArray[3];
-		$apiParams["Version"] = $apiNameArray[4];
-		//签名
-		$apiParams["Signature"] = $this->computeSignature($apiParams, $this->accessKeySecret);
-
-		//系统参数放入GET请求串
-		$requestUrl = rtrim($this->serverUrl,"/") . "/?";
-		foreach ($apiParams as $apiParamKey => $apiParamValue)
-		{
-			$requestUrl .= "$apiParamKey=" . urlencode($apiParamValue) . "&";
-		}
-		$requestUrl = substr($requestUrl, 0, -1);
-		//发起HTTP请求
-		try
-		{
-			$resp = $this->curl($requestUrl, null);
-		}
-		catch (Exception $e)
-		{
-			$this->logCommunicationError($apiParams["Action"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
-			if ("json" == $this->format)
-			{
-				return  json_decode($e->getMessage());
-			}
-			else if("xml" == $this->format)
-			{
-				return  @simplexml_load_string($e->getMessage());
-			}
-	    }
-
-		//解析API返回结果
-		$respWellFormed = false;
-		if ("json" == $this->format)
-		{
-			$respObject = json_decode($resp);
-			if (null !== $respObject)
-			{
-				$respWellFormed = true;
-			}
-		}
-		else if("xml" == $this->format)
-		{
-			$respObject = @simplexml_load_string($resp);
-			if (false !== $respObject)
-			{
-				$respWellFormed = true;
-			}
-		}
-
-		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
-		if (false === $respWellFormed)
-		{
-			$this->logCommunicationError($apiParams["Action"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
-			$result->code = 0;
-			$result->message = "HTTP_RESPONSE_NOT_WELL_FORMED";
-			return $result;
-		}
-
-		//如果TOP返回了错误码，记录到业务错误日志中
-		if (isset($respObject->code))
-		{
-			$logger = new LtLogger;
-			$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
-			));
-		}
-		return $respObject;
-	}
-
-	public function exec($paramsArray)
-	{
-		if (!isset($paramsArray["Action"]))
-		{
-			trigger_error("No api name passed");
-		}
-		$inflector = new LtInflector;
-		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["Action"], 7))) . "Request";
-		if (!class_exists($requestClassName))
-		{
-			trigger_error("No such api: " . $paramsArray["Action"]);
-		}
-
-		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
-		{
-			$inflector->conf["separator"] = "_";
-			$setterMethodName = $inflector->camelize($paraKey);
-			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
-			if (method_exists($req, $setterMethodName))
-			{
-				$req->$setterMethodName($paraValue);
-			}
-		}
-		return $this->execute($req, $session);
-	}
+        $apiNameArray =	split("\.", $request->getApiMethodName());
+        $apiParams["Action"] = $apiNameArray[3];
+        $apiParams["Version"] = $apiNameArray[4];
+        //签名
+        $apiParams["Signature"] = $this->computeSignature($apiParams, $this->accessKeySecret);
+
+        //系统参数放入GET请求串
+        $requestUrl = rtrim($this->serverUrl,"/") . "/?";
+        foreach ($apiParams as $apiParamKey => $apiParamValue)
+        {
+            $requestUrl .= "$apiParamKey=" . urlencode($apiParamValue) . "&";
+        }
+        $requestUrl = substr($requestUrl, 0, -1);
+        //发起HTTP请求
+        try
+        {
+            $resp = $this->curl($requestUrl, null);
+        }
+        catch (Exception $e)
+        {
+            $this->logCommunicationError($apiParams["Action"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+            if ("json" == $this->format)
+            {
+                return  json_decode($e->getMessage());
+            }
+            else if("xml" == $this->format)
+            {
+                return  @simplexml_load_string($e->getMessage());
+            }
+        }
+
+        //解析API返回结果
+        $respWellFormed = false;
+        if ("json" == $this->format)
+        {
+            $respObject = json_decode($resp);
+            if (null !== $respObject)
+            {
+                $respWellFormed = true;
+            }
+        }
+        else if("xml" == $this->format)
+        {
+            $respObject = @simplexml_load_string($resp);
+            if (false !== $respObject)
+            {
+                $respWellFormed = true;
+            }
+        }
+
+        //返回的HTTP文本不是标准JSON或者XML，记下错误日志
+        if (false === $respWellFormed)
+        {
+            $this->logCommunicationError($apiParams["Action"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+            $result->code = 0;
+            $result->message = "HTTP_RESPONSE_NOT_WELL_FORMED";
+            return $result;
+        }
+
+        //如果TOP返回了错误码，记录到业务错误日志中
+        if (isset($respObject->code))
+        {
+            $logger = new LtLogger;
+            $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
+            ));
+        }
+        return $respObject;
+    }
+
+    public function exec($paramsArray)
+    {
+        if (!isset($paramsArray["Action"]))
+        {
+            trigger_error("No api name passed");
+        }
+        $inflector = new LtInflector;
+        $inflector->conf["separator"] = ".";
+        $requestClassName = ucfirst($inflector->camelize(substr($paramsArray["Action"], 7))) . "Request";
+        if (!class_exists($requestClassName))
+        {
+            trigger_error("No such api: " . $paramsArray["Action"]);
+        }
+
+        $req = new $requestClassName;
+        foreach($paramsArray as $paraKey => $paraValue)
+        {
+            $inflector->conf["separator"] = "_";
+            $setterMethodName = $inflector->camelize($paraKey);
+            $inflector->conf["separator"] = ".";
+            $setterMethodName = "set" . $inflector->camelize($setterMethodName);
+            if (method_exists($req, $setterMethodName))
+            {
+                $req->$setterMethodName($paraValue);
+            }
+        }
+        return $this->execute($req, $session);
+    }
 	
-	protected function percentEncode($str)
-	{
-	    // 使用urlencode编码后，将"+","*","%7E"做替换即满足 API规定的编码规范
-	    $res = urlencode($str);
-	    $res = preg_replace('/\+/', '%20', $res);
-	    $res = preg_replace('/\*/', '%2A', $res);
-	    $res = preg_replace('/%7E/', '~', $res);
-	    return $res;
-	}
+    protected function percentEncode($str)
+    {
+        // 使用urlencode编码后，将"+","*","%7E"做替换即满足 API规定的编码规范
+        $res = urlencode($str);
+        $res = preg_replace('/\+/', '%20', $res);
+        $res = preg_replace('/\*/', '%2A', $res);
+        $res = preg_replace('/%7E/', '~', $res);
+        return $res;
+    }
 	
-	protected function computeSignature($parameters, $accessKeySecret)
-	{
-	    // 将参数Key按字典顺序排序
-	    ksort($parameters);
+    protected function computeSignature($parameters, $accessKeySecret)
+    {
+        // 将参数Key按字典顺序排序
+        ksort($parameters);
 	
-	    // 生成规范化请求字符串
-	    $canonicalizedQueryString = '';
-	    foreach($parameters as $key => $value)
-	    {
-		$canonicalizedQueryString .= '&' . $this->percentEncode($key) 
-		    . '=' . $this->percentEncode($value);
-	    }
+        // 生成规范化请求字符串
+        $canonicalizedQueryString = '';
+        foreach($parameters as $key => $value)
+        {
+        $canonicalizedQueryString .= '&' . $this->percentEncode($key) 
+            . '=' . $this->percentEncode($value);
+        }
 	
-	    // 生成用于计算签名的字符串 stringToSign
-	    $stringToSign = 'GET&%2F&' . $this->percentencode(substr($canonicalizedQueryString, 1));
+        // 生成用于计算签名的字符串 stringToSign
+        $stringToSign = 'GET&%2F&' . $this->percentencode(substr($canonicalizedQueryString, 1));
 	
-	    // 计算签名，注意accessKeySecret后面要加上字符'&'
-	    $signature = base64_encode(hash_hmac('sha1', $stringToSign, $accessKeySecret . '&', true));
-	    return $signature;
-	}
+        // 计算签名，注意accessKeySecret后面要加上字符'&'
+        $signature = base64_encode(hash_hmac('sha1', $stringToSign, $accessKeySecret . '&', true));
+        return $signature;
+    }
 	
     public function curl($url, $postFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		//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);
-		}
-
-		if (is_array($postFields) && 0 < count($postFields))
-		{
-			$postBodyString = "";
-			$postMultipart = false;
-			foreach ($postFields as $k => $v)
-			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
-				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
-				}
-				else//文件上传用multipart/form-data，否则用www-form-urlencoded
-				{
-					$postMultipart = true;
-				}
-			}
-			unset($k, $v);
-			curl_setopt($ch, CURLOPT_POST, true);
-			if ($postMultipart)
-			{
-				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-			}
-			else
-			{
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
-			}
-		}
-		$reponse = curl_exec($ch);
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        //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);
+        }
+
+        if (is_array($postFields) && 0 < count($postFields))
+        {
+            $postBodyString = "";
+            $postMultipart = false;
+            foreach ($postFields as $k => $v)
+            {
+                if("@" != substr($v, 0, 1))//判断是不是文件上传
+                {
+                    $postBodyString .= "$k=" . urlencode($v) . "&"; 
+                }
+                else//文件上传用multipart/form-data，否则用www-form-urlencoded
+                {
+                    $postMultipart = true;
+                }
+            }
+            unset($k, $v);
+            curl_setopt($ch, CURLOPT_POST, true);
+            if ($postMultipart)
+            {
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
+            }
+            else
+            {
+                curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+            }
+        }
+        $reponse = curl_exec($ch);
 		
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		curl_close($ch);
-		return $reponse;
-	}
-
-	protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
-	{
-		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
-		$logger = new LtLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->accessKeyId . "_" . date("Y-m-d") . ".log";
-		$logger->conf["separator"] = "^_^";
-		$logData = array(
-		date("Y-m-d H:i:s"),
-		$apiName,
-		$this->accessKeyId,
-		$localIp,
-		PHP_OS,
-		$this->sdkVersion,
-		$requestUrl,
-		$errorCode,
-		str_replace("\n","",$responseTxt)
-		);
-		$logger->log($logData);
-	}
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        curl_close($ch);
+        return $reponse;
+    }
+
+    protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
+    {
+        $localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
+        $logger = new LtLogger;
+        $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->accessKeyId . "_" . date("Y-m-d") . ".log";
+        $logger->conf["separator"] = "^_^";
+        $logData = array(
+        date("Y-m-d H:i:s"),
+        $apiName,
+        $this->accessKeyId,
+        $localIp,
+        PHP_OS,
+        $this->sdkVersion,
+        $requestUrl,
+        $errorCode,
+        str_replace("\n","",$responseTxt)
+        );
+        $logger->log($logData);
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -9,9 +9,9 @@ 
 
 	public $format = "json";
 
-	public $connectTimeout = 3000;//3秒
+	public $connectTimeout = 3000; //3秒
 
-	public $readTimeout = 80000;//80秒
+	public $readTimeout = 80000; //80秒
 
 	/** 是否打开入参check**/
 	public $checkRequest = true;
@@ -26,7 +26,7 @@ 
 
 	public function execute($request)
 	{
-		if($this->checkRequest) {
+		if ($this->checkRequest) {
 			try {
 				$request->check();
 			} catch (Exception $e) {
@@ -39,7 +39,7 @@ 
 		$apiParams = $request->getApiParas();
 		//组装系统参数
 		$apiParams["AccessKeyId"] = $this->accessKeyId;
-		$apiParams["Format"] = $this->format;//
+		$apiParams["Format"] = $this->format; //
 		$apiParams["SignatureMethod"] = $this->signatureMethod;
 		$apiParams["SignatureVersion"] = $this->signatureVersion;
 		$apiParams["SignatureNonce"] = uniqid();
@@ -47,17 +47,17 @@ 
 		$apiParams["TimeStamp"] = date($this->dateTimeFormat);
 		$apiParams["partner_id"] = $this->sdkVersion;
 		
-	    $apiNameArray =	split("\.", $request->getApiMethodName());
+	    $apiNameArray = split("\.", $request->getApiMethodName());
 		$apiParams["Action"] = $apiNameArray[3];
 		$apiParams["Version"] = $apiNameArray[4];
 		//签名
 		$apiParams["Signature"] = $this->computeSignature($apiParams, $this->accessKeySecret);
 
 		//系统参数放入GET请求串
-		$requestUrl = rtrim($this->serverUrl,"/") . "/?";
+		$requestUrl = rtrim($this->serverUrl, "/")."/?";
 		foreach ($apiParams as $apiParamKey => $apiParamValue)
 		{
-			$requestUrl .= "$apiParamKey=" . urlencode($apiParamValue) . "&";
+			$requestUrl .= "$apiParamKey=".urlencode($apiParamValue)."&";
 		}
 		$requestUrl = substr($requestUrl, 0, -1);
 		//发起HTTP请求
@@ -67,12 +67,12 @@ 
 		}
 		catch (Exception $e)
 		{
-			$this->logCommunicationError($apiParams["Action"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+			$this->logCommunicationError($apiParams["Action"], $requestUrl, "HTTP_ERROR_".$e->getCode(), $e->getMessage());
 			if ("json" == $this->format)
 			{
 				return  json_decode($e->getMessage());
 			}
-			else if("xml" == $this->format)
+			else if ("xml" == $this->format)
 			{
 				return  @simplexml_load_string($e->getMessage());
 			}
@@ -88,7 +88,7 @@ 
 				$respWellFormed = true;
 			}
 		}
-		else if("xml" == $this->format)
+		else if ("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)
@@ -100,7 +100,7 @@ 
 		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
 		if (false === $respWellFormed)
 		{
-			$this->logCommunicationError($apiParams["Action"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+			$this->logCommunicationError($apiParams["Action"], $requestUrl, "HTTP_RESPONSE_NOT_WELL_FORMED", $resp);
 			$result->code = 0;
 			$result->message = "HTTP_RESPONSE_NOT_WELL_FORMED";
 			return $result;
@@ -110,7 +110,7 @@ 
 		if (isset($respObject->code))
 		{
 			$logger = new LtLogger;
-			$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
@@ -127,19 +127,19 @@ 
 		}
 		$inflector = new LtInflector;
 		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["Action"], 7))) . "Request";
+		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["Action"], 7)))."Request";
 		if (!class_exists($requestClassName))
 		{
-			trigger_error("No such api: " . $paramsArray["Action"]);
+			trigger_error("No such api: ".$paramsArray["Action"]);
 		}
 
 		$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);
@@ -165,17 +165,17 @@ 
 	
 	    // 生成规范化请求字符串
 	    $canonicalizedQueryString = '';
-	    foreach($parameters as $key => $value)
+	    foreach ($parameters as $key => $value)
 	    {
-		$canonicalizedQueryString .= '&' . $this->percentEncode($key) 
-		    . '=' . $this->percentEncode($value);
+		$canonicalizedQueryString .= '&'.$this->percentEncode($key) 
+		    . '='.$this->percentEncode($value);
 	    }
 	
 	    // 生成用于计算签名的字符串 stringToSign
-	    $stringToSign = 'GET&%2F&' . $this->percentencode(substr($canonicalizedQueryString, 1));
+	    $stringToSign = 'GET&%2F&'.$this->percentencode(substr($canonicalizedQueryString, 1));
 	
 	    // 计算签名，注意accessKeySecret后面要加上字符'&'
-	    $signature = base64_encode(hash_hmac('sha1', $stringToSign, $accessKeySecret . '&', true));
+	    $signature = base64_encode(hash_hmac('sha1', $stringToSign, $accessKeySecret.'&', true));
 	    return $signature;
 	}
 	
@@ -192,7 +192,7 @@ 
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
 		//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);
 		}
@@ -203,9 +203,9 @@ 
 			$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
 				{
@@ -220,14 +220,14 @@ 
 			}
 			else
 			{
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+				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);
 		}
 		curl_close($ch);
 		return $reponse;
@@ -237,7 +237,7 @@ 
 	{
 		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
 		$logger = new LtLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . $this->accessKeyId . "_" . date("Y-m-d") . ".log";
+		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_comm_err_".$this->accessKeyId."_".date("Y-m-d").".log";
 		$logger->conf["separator"] = "^_^";
 		$logData = array(
 		date("Y-m-d H:i:s"),
@@ -248,7 +248,7 @@ 
 		$this->sdkVersion,
 		$requestUrl,
 		$errorCode,
-		str_replace("\n","",$responseTxt)
+		str_replace("\n", "", $responseTxt)
 		);
 		$logger->log($logData);
 	}

Braces +8 added lines, -11 removed lines

@@ -64,15 +64,13 @@ 
 		try
 		{
 			$resp = $this->curl($requestUrl, null);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->logCommunicationError($apiParams["Action"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
 			if ("json" == $this->format)
 			{
 				return  json_decode($e->getMessage());
-			}
-			else if("xml" == $this->format)
+			} else if("xml" == $this->format)
 			{
 				return  @simplexml_load_string($e->getMessage());
 			}
@@ -87,8 +85,7 @@ 
 			{
 				$respWellFormed = true;
 			}
-		}
-		else if("xml" == $this->format)
+		} else if("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)
@@ -203,11 +200,12 @@ 
 			$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
+				} else//文件上传用multipart/form-data，否则用www-form-urlencoded
 				{
 					$postMultipart = true;
 				}
@@ -217,8 +215,7 @@ 
 			if ($postMultipart)
 			{
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-			}
-			else
+			} else
 			{
 				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
 			}

src/service/taobao/bin/Autoloader.php

Indentation +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 class Autoloader{
   
-  /**
+    /**
      * 类库自动加载，写死路径，确保不加载其他文件。
      * @param string $class 对象类名
      * @return void
@@ -10,7 +10,7 @@ 
     public static function autoload($class) {
         $name = $class;
         if(false !== strpos($name,'\\')){
-          $name = strstr($class, '\\', true);
+            $name = strstr($class, '\\', true);
         }
         
         $filename = TOP_AUTOLOADER_PATH."/top/".$name.".php";
@@ -66,7 +66,7 @@ 
             return;
         }         
 		
-		$filename = TOP_AUTOLOADER_PATH."/QimenCloud/".$name.".php";
+        $filename = TOP_AUTOLOADER_PATH."/QimenCloud/".$name.".php";
         if(is_file($filename)) {
             include $filename;
             return;

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Autoloader{
+class Autoloader {
   
   /**
      * 类库自动加载，写死路径，确保不加载其他文件。
@@ -9,65 +9,65 @@ 
      */
     public static function autoload($class) {
         $name = $class;
-        if(false !== strpos($name,'\\')){
+        if (false !== strpos($name, '\\')) {
           $name = strstr($class, '\\', true);
         }
         
         $filename = TOP_AUTOLOADER_PATH."/top/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }
 
         $filename = TOP_AUTOLOADER_PATH."/top/request/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }
 
         $filename = TOP_AUTOLOADER_PATH."/top/domain/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }
 
         $filename = TOP_AUTOLOADER_PATH."/aliyun/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }
 
         $filename = TOP_AUTOLOADER_PATH."/aliyun/request/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }
 
         $filename = TOP_AUTOLOADER_PATH."/aliyun/domain/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }      
 
         $filename = TOP_AUTOLOADER_PATH."/dingtalk/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }
         $filename = TOP_AUTOLOADER_PATH."/dingtalk/request/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }
 
         $filename = TOP_AUTOLOADER_PATH."/dingtalk/domain/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }         
 		
 		$filename = TOP_AUTOLOADER_PATH."/QimenCloud/".$name.".php";
-        if(is_file($filename)) {
+        if (is_file($filename)) {
             include $filename;
             return;
         }

src/service/taobao/TaoBaoService.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace DtApp\ThinkLibrary\service\taobao;
 
-require_once __DIR__ . '/bin/TopSdk.php';
+require_once __DIR__.'/bin/TopSdk.php';
 
 use DtApp\ThinkLibrary\Service;
 use TbkScInvitecodeGetRequest;

src/service/taobao/TbkService.php

Spacing +9 added lines, -9 removed lines

@@ -942,20 +942,20 @@ 
         $sign = $this->createSign();
         //组织参数
         $strParam = $this->createStrParam();
-        $strParam .= 'sign=' . $sign;
+        $strParam .= 'sign='.$sign;
         //访问服务
         if ($this->protocol === 'http') {
             if (empty($this->sandbox)) {
-                $url = 'http://gw.api.taobao.com/router/rest?' . $strParam;
-            } else {
-                $url = 'http://gw.api.tbsandbox.com/router/rest?' . $strParam;
+                $url = 'http://gw.api.taobao.com/router/rest?'.$strParam;
+            }else {
+                $url = 'http://gw.api.tbsandbox.com/router/rest?'.$strParam;
             }
         }
         if ($this->protocol === 'https') {
             if (empty($this->sandbox)) {
-                $url = 'https://eco.taobao.com/router/rest?' . $strParam;
-            } else {
-                $url = 'https://gw.api.tbsandbox.com/router/rest?' . $strParam;
+                $url = 'https://eco.taobao.com/router/rest?'.$strParam;
+            }else {
+                $url = 'https://gw.api.tbsandbox.com/router/rest?'.$strParam;
             }
         }
         $result = file_get_contents($url);
@@ -980,7 +980,7 @@ 
         ksort($this->param);
         foreach ($this->param as $key => $val) {
             if ($key !== '' && $val !== '') {
-                $sign .= $key . $val;
+                $sign .= $key.$val;
             }
         }
         $sign .= $this->app_secret;
@@ -997,7 +997,7 @@ 
         $strParam = '';
         foreach ($this->param as $key => $val) {
             if ($key !== '' && $val !== '') {
-                $strParam .= $key . '=' . urlencode($val) . '&';
+                $strParam .= $key.'='.urlencode($val).'&';
             }
         }
         return $strParam;

src/service/pinduoduo/bin/src/PopHttpResponse.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  * Pop response 类
  */
 
-class PopHttpResponse{
+class PopHttpResponse {
     /**
      * @var int
      */
@@ -79,8 +79,8 @@ 
      */
     public function getContent()
     {
-        if($this->content === null){
-            $this->content = json_decode($this->getBody(),true);
+        if ($this->content === null) {
+            $this->content = json_decode($this->getBody(), true);
         }
         return $this->content;
     }