更新防止解析回来的数据带空格导致 json 解析失败。

Author: iMactool

composer.json

@@ -2,14 +2,19 @@
     "name": "imactool\/gjpzyx",
     "description": "管家婆ERP 管家婆章鱼侠API",
     "license": "MIT",
+    "keywords": [
+        "管家婆ERP open api",
+        "管家婆章鱼侠API",
+        "php sdk"
+    ],
     "authors": [
         {
             "name": "iMactool",
             "email": "[email protected]"
         }
     ],
     "require": {
-        "guzzlehttp/guzzle": "^6.5"
+        "guzzlehttp/guzzle": "^6.5|^7.0.1"
     },
     "autoload": {
         "psr-4": {

src/Aes.php

@@ -10,7 +10,7 @@
 
 class Aes
 {
-    protected $iv = '000000000000000000'; //密钥偏移量IV，可自定义
+    protected $iv = '1200kds000001233fd'; //密钥偏移量IV，可自定义
     protected $encryptKey = '7e4e615af165fe63cbf40e52abbc79e8';//AESkey，可自定义
 
     /**
@@ -32,8 +32,8 @@ public function setAesKey($key){
     //加密
     public function encrypt($encryptStr){
         error_reporting(E_ALL & ~E_DEPRECATED); //兼容管家婆使用过时 ASE 加密方式
-        $localIV = $this->iv;
-        $encryptKey = $this->encryptKey;
+        $localIV = trim($this->iv);
+        $encryptKey = trim($this->encryptKey);
         $encryptStr = trim($encryptStr);
         $module = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, $localIV);
         mcrypt_generic_init($module, $encryptKey, $localIV);
@@ -49,11 +49,11 @@ public function encrypt($encryptStr){
     //解密
     public function decrypt($encryptStr) {
         error_reporting(E_ALL & ~E_DEPRECATED); //兼容管家婆使用过时 ASE 加密方式
-        $localIV = $this->iv;
-        $encryptKey = $this->encryptKey;
+        $localIV = trim($this->iv);
+        $encryptKey = trim($this->encryptKey);
         $module = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, $localIV);
         mcrypt_generic_init($module, $encryptKey, $localIV);
-        $encryptedData = base64_decode($encryptStr);
+        $encryptedData = base64_decode(trim($encryptStr));
         $encryptedData = mdecrypt_generic($module, $encryptedData);
         return $encryptedData;
     }

src/Base/Base.php

@@ -82,15 +82,14 @@ public function getTokenInfo(string $auth_code)
 
         try {
             $result = (new Http())->setApiUrl($this->config['apiUrl'])->httpPost($postData,'token');
-
             if ($result['iserror']){
                 return ['code'=>$result['errorcode'],'msg'=>$result['errormessage'].'，requestid : '.$result['requestid']];
             }
-            $response = rtrim($result['response']['response']);
+            $response = trim($result['response']['response']);
             $tokenInfo = $this->aesFace()->decrypt($response);
-            $tokenInfo = rtrim($tokenInfo);
-
-            return  \json_decode($tokenInfo,true);
+            $tokenInfo = trim($tokenInfo);
+            preg_match('/^\{("\w+":"(.*?)",?)+\}/', $tokenInfo,$match);
+            return  \json_decode($match[0],true);
         }catch (\Exception $e){
             throw new HttpException($e->getMessage(),$e->getCode(),$e);
         }
@@ -103,7 +102,7 @@ public function getTokenInfo(string $auth_code)
      * @return array|mixed
      * @throws HttpException
      */
-    public function refreshToken($refresh_token){
+    public function refreshToken(string $refresh_token){
 
         $params = [
             'TimeStamp'=>date('Y-m-d H:i:s'),
@@ -123,9 +122,10 @@ public function refreshToken($refresh_token){
             if ($result['iserror']){
                 return ['code'=>$result['errorcode'],'msg'=>$result['errormessage'].'，requestid : '.$result['requestid']];
             }
-            $response = $result['response']['response'];
+            $response = trim($result['response']['response']);
             $tokenInfo = $this->aesFace()->decrypt($response);
-            return  json_decode($tokenInfo,true);
+            preg_match('/^\{("\w+":"(.*?)",?)+\}/', $tokenInfo,$match);
+            return  \json_decode($match[0],true);
         }catch (\Exception $e){
             throw new HttpException($e->getMessage(),$e->getCode(),$e);
         }

src/Factory.php

@@ -120,18 +120,19 @@ public static function testZyxDefaultConfig(){
             'appKey' 	=> '68943923115886070418838901844741',
             'appSecret' => 'ONxYDyNaCoyTzsp83JoQ3YYuMPHxk3j7',
             'signKey'   => 'lezitiancheng',
-            'token'		=> '0I7dHCByoGxlxAHU8I50MzpPVbN0Nl56goE2YGdP',
+            'token'		=> 'mMwbS4x1jMTyiw4wiuD1mDDm1yuOcATiMyQ9vGp7',
             'shopKey'	=> '2345678sdfg',
             //公司名称
             'CompanyName'=>'TestMall',
             //用户名
             'UserId'	=> 'test',
             //密码
             'Password'	=> 'grasp@101',
-            'refreshToken' => '548BGezYm6wfTCzeazuk0d0UeR39AUMYJAJv3pGH',
+            'refreshToken' => 'RAM5VwheS4RWFkApJzxDtjC4GzPWa7C4FRgNr175',
             //线上登录获取授权认证码的地址
-            'loginUrl'=>'http://ca.mygjp.com:666/account/login?',
-            'apiUrl'=>'http://ca.mygjp.com:8002/api/',
+            'loginUrl'=>'http://d7.mygjp.com.cn:666/account/login?',
+            //线上接口调用的地址
+            'apiUrl'=>'http://d7.mygjp.com.cn:8002/api',
             //线上章鱼侠云erp登录地址
             'onlineLoginUrl'=>'http://login.zhangyuxia.com.cn'
         ];