避免全局函数encrypt和laravel框架重名

hfpf · May 30, 2019 · 4b22907 · 4b22907
1 parent 489a952
commit 4b22907
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/AopClient.php b/src/AopClient.php
@@ -401,7 +401,7 @@ public function getParams($request)
             }
 
             // 执行加密
-            $enCryptContent = encrypt($apiParams['biz_content'], $this->encryptKey);
+            $enCryptContent = alipay_encrypt($apiParams['biz_content'], $this->encryptKey);
             $apiParams['biz_content'] = $enCryptContent;
 
         }
@@ -504,7 +504,7 @@ public function execute($request, $authToken = null, $appInfoAuthtoken = null) {
 			}
 
 			// 执行加密
-			$enCryptContent = encrypt($apiParams['biz_content'], $this->encryptKey);
+			$enCryptContent = alipay_encrypt($apiParams['biz_content'], $this->encryptKey);
 			$apiParams['biz_content'] = $enCryptContent;
 
 		}
@@ -1091,7 +1091,7 @@ private function encryptJSONSignSource($request, $responseContent) {
 		$bodyIndexContent = substr($responseContent, 0, $parsetItem->startIndex);
 		$bodyEndContent = substr($responseContent, $parsetItem->endIndex, strlen($responseContent) + 1 - $parsetItem->endIndex);
 
-		$bizContent = decrypt($parsetItem->encryptContent, $this->encryptKey);
+		$bizContent = alipay_decrypt($parsetItem->encryptContent, $this->encryptKey);
 		return $bodyIndexContent . $bizContent . $bodyEndContent;
 
 	}
@@ -1155,7 +1155,7 @@ private function encryptXMLSignSource($request, $responseContent) {
 
 		$bodyIndexContent = substr($responseContent, 0, $parsetItem->startIndex);
 		$bodyEndContent = substr($responseContent, $parsetItem->endIndex, strlen($responseContent) + 1 - $parsetItem->endIndex);
-		$bizContent = decrypt($parsetItem->encryptContent, $this->encryptKey);
+		$bizContent = alipay_decrypt($parsetItem->encryptContent, $this->encryptKey);
 
 		return $bodyIndexContent . $bizContent . $bodyEndContent;
 

diff --git a/src/AopEncrypt.php b/src/AopEncrypt.php
@@ -12,7 +12,7 @@
  * @param string $str
  * @return string
  */
- function encrypt($str,$screct_key){
+ function alipay_encrypt($str,$screct_key){
 	//AES, 128 模式加密数据 CBC
 	$screct_key = base64_decode($screct_key);
 	$str = trim($str);
@@ -27,7 +27,7 @@ function encrypt($str,$screct_key){
  * @param string $str
  * @return string
  */
- function decrypt($str,$screct_key){
+ function alipay_decrypt($str,$screct_key){
 	//AES, 128 模式加密数据 CBC
 	$str = base64_decode($str);
 	$screct_key = base64_decode($screct_key);