From ac616d0a3fa933cfa7ae95411ee1e5e8d194b2a3 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 22 Aug 2019 13:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/base/Wechat.php     | 13 +++++++++----
 extend/payment/PayEase.php |  6 ++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/extend/base/Wechat.php b/extend/base/Wechat.php
index 378171d7d..42e7f7c15 100755
--- a/extend/base/Wechat.php
+++ b/extend/base/Wechat.php
@@ -61,16 +61,21 @@ class Wechat
         {
             return 'session key不存在';
         }
-        $aes_key = base64_decode($session_data['session_key']);
-        
+
+        // iv长度
         if(strlen($iv) != 24)
         {
             return 'iv长度错误';
         }
-        $aes_iv = base64_decode($iv);
+
+        // 加密函数
+        if(!function_exists('openssl_decrypt'))
+        {
+            return 'openssl不支持';
+        }
 
         $aes_cipher = base64_decode($encrypted_data);
-        $result = openssl_decrypt($aes_cipher, "AES-128-CBC", $aes_key, 1, $aes_iv);
+        $result = openssl_decrypt($aes_cipher, "AES-128-CBC", base64_decode($session_data['session_key']), 1, base64_decode($iv));
         $data = json_decode($result, true);
         if($data == NULL)
         {
diff --git a/extend/payment/PayEase.php b/extend/payment/PayEase.php
index 47d1ad752..5f2626d1a 100644
--- a/extend/payment/PayEase.php
+++ b/extend/payment/PayEase.php
@@ -126,6 +126,12 @@ class PayEase
             return DataReturn('密钥证书未配置', -1);
         }
 
+        // 加密函数
+        if(!function_exists('openssl_decrypt'))
+        {
+            return DataReturn('openssl不支持', -1);
+        }
+
         $data = [
             'merchantId'        => $this->config['merchantId'],
             'orderAmount'       => $params['total_price']*100,