[更新]ComposerUpdate

vendor/composer/autoload_classmap.php

@@ -184,7 +184,7 @@ return array(
     'app\\admin\\controller\\Node' => $baseDir . '/application/admin/controller/Node.php',
     'app\\admin\\controller\\Plugs' => $baseDir . '/application/admin/controller/Plugs.php',
     'app\\admin\\controller\\User' => $baseDir . '/application/admin/controller/User.php',
-    'app\\admin\\middleware\\Auth' => $baseDir . '/application/admin/middleware/Auth.php',
+    'app\\admin\\logic\\Auth' => $baseDir . '/application/admin/logic/Auth.php',
     'app\\index\\controller\\Index' => $baseDir . '/application/index/controller/Index.php',
     'app\\store\\controller\\Express' => $baseDir . '/application/store/controller/Express.php',
     'app\\store\\controller\\Goods' => $baseDir . '/application/store/controller/Goods.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitbe36bc09417ef093d568a98d90fda606
+class ComposerAutoloaderInitef946a60869007e79afc4c4e78c26e16
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInitbe36bc09417ef093d568a98d90fda606
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitbe36bc09417ef093d568a98d90fda606', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitef946a60869007e79afc4c4e78c26e16', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitbe36bc09417ef093d568a98d90fda606', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitef946a60869007e79afc4c4e78c26e16', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitbe36bc09417ef093d568a98d90fda606::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitef946a60869007e79afc4c4e78c26e16::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInitbe36bc09417ef093d568a98d90fda606
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitbe36bc09417ef093d568a98d90fda606::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitef946a60869007e79afc4c4e78c26e16::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirebe36bc09417ef093d568a98d90fda606($fileIdentifier, $file);
+            composerRequireef946a60869007e79afc4c4e78c26e16($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirebe36bc09417ef093d568a98d90fda606($fileIdentifier, $file)
+function composerRequireef946a60869007e79afc4c4e78c26e16($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitbe36bc09417ef093d568a98d90fda606
+class ComposerStaticInitef946a60869007e79afc4c4e78c26e16
 {
     public static $files = array (
         '1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php',
@@ -282,7 +282,7 @@ class ComposerStaticInitbe36bc09417ef093d568a98d90fda606
         'app\\admin\\controller\\Node' => __DIR__ . '/../..' . '/application/admin/controller/Node.php',
         'app\\admin\\controller\\Plugs' => __DIR__ . '/../..' . '/application/admin/controller/Plugs.php',
         'app\\admin\\controller\\User' => __DIR__ . '/../..' . '/application/admin/controller/User.php',
-        'app\\admin\\middleware\\Auth' => __DIR__ . '/../..' . '/application/admin/middleware/Auth.php',
+        'app\\admin\\logic\\Auth' => __DIR__ . '/../..' . '/application/admin/logic/Auth.php',
         'app\\index\\controller\\Index' => __DIR__ . '/../..' . '/application/index/controller/Index.php',
         'app\\store\\controller\\Express' => __DIR__ . '/../..' . '/application/store/controller/Express.php',
         'app\\store\\controller\\Goods' => __DIR__ . '/../..' . '/application/store/controller/Goods.php',
@@ -320,9 +320,9 @@ class ComposerStaticInitbe36bc09417ef093d568a98d90fda606
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitbe36bc09417ef093d568a98d90fda606::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitef946a60869007e79afc4c4e78c26e16::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitbe36bc09417ef093d568a98d90fda606::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitef946a60869007e79afc4c4e78c26e16::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitbe36bc09417ef093d568a98d90fda606::$classMap;
+            $loader->classMap = ComposerStaticInitef946a60869007e79afc4c4e78c26e16::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -443,17 +443,17 @@
     },
     {
         "name": "zoujingli/wechat-developer",
-        "version": "v1.2.2",
+        "version": "v1.2.4",
-        "version_normalized": "1.2.2.0",
+        "version_normalized": "1.2.4.0",
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/WeChatDeveloper.git",
-            "reference": "7e89f110da89e44e32b1abf5a15b2d107e3b30d5"
+            "reference": "ace4ce3949821588c34641fbadda4461725b5fbe"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/7e89f110da89e44e32b1abf5a15b2d107e3b30d5",
+            "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/ace4ce3949821588c34641fbadda4461725b5fbe",
-            "reference": "7e89f110da89e44e32b1abf5a15b2d107e3b30d5",
+            "reference": "ace4ce3949821588c34641fbadda4461725b5fbe",
             "shasum": "",
             "mirrors": [
                 {
@@ -468,7 +468,7 @@
             "ext-openssl": "*",
             "php": ">=5.4"
         },
-        "time": "2018-11-03T01:01:29+00:00",
+        "time": "2018-11-13T09:05:11+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

vendor/zoujingli/wechat-developer/.gitignore

@@ -4,4 +4,5 @@
 /vendor
 /Cache
 /Test/cert
-/composer.lock
+/nbproject
+/composer.lock

vendor/zoujingli/wechat-developer/AliPay/Bill.php

@@ -41,6 +41,6 @@ class Bill extends BasicAliPay
      */
     public function apply($options)
     {
-        return $this->getResult($options);
+        return $this->getResult($options, 'get');
     }
 }

vendor/zoujingli/wechat-developer/We.php

@@ -74,7 +74,7 @@ class We
      * 定义当前版本
      * @var string
      */
-    const VERSION = '1.2.2';
+    const VERSION = '1.2.3';
 
     /**
      * 静态配置

vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicAliPay.php

@@ -196,15 +196,14 @@ abstract class BasicAliPay
     protected function getResult($options)
     {
         $this->applyData($options);
-        $data = json_decode(Tools::post($this->gateway, $this->options->get()), true);
         $method = str_replace('.', '_', $this->options['method']) . '_response';
+        $data = json_decode(Tools::get($this->gateway, $this->options->get()), true);
         if (!isset($data[$method]['code']) || $data[$method]['code'] !== '10000') {
             throw new \WeChat\Exceptions\InvalidResponseException(
-                "\nResultError" .
+                "Error: " .
-                (empty($data[$method]['code']) ? '' : "\n{$data[$method]['msg']}[{$data[$method]['code']}]") .
+                (empty($data[$method]['code']) ? '' : "{$data[$method]['msg']} [{$data[$method]['code']}]\r\n") .
-                (empty($data[$method]['sub_code']) ? '' : "\n{$data[$method]['sub_msg']}[{$data[$method]['sub_code']}]\n"),
+                (empty($data[$method]['sub_code']) ? '' : "{$data[$method]['sub_msg']} [{$data[$method]['sub_code']}]\r\n"),
-                $data[$method]['code'],
+                $data[$method]['code'], $data
-                $data
             );
         }
         return $this->verify($data[$method], $data['sign'], true);

vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php

@@ -148,10 +148,12 @@ class BasicWeChat
         try {
             return Tools::json2arr(Tools::get($url));
         } catch (InvalidResponseException $e) {
-            if (!$this->isTry && in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
+            if (isset($this->currentMethod['method']) && empty($this->isTry)) {
-                $this->delAccessToken();
+                if (in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
-                $this->isTry = true;
+                    $this->delAccessToken();
-                return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+                    $this->isTry = true;
+                    return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
+                }
             }
             throw new InvalidResponseException($e->getMessage(), $e->getCode());
         }

vendor/zoujingli/wechat-developer/WeChat/Script.php

@@ -14,8 +14,8 @@
 
 namespace WeChat;
 
-use WeChat\Contracts\Tools;
 use WeChat\Contracts\BasicWeChat;
+use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidResponseException;
 
 /**
@@ -104,18 +104,14 @@ class Script extends BasicWeChat
      * 数据生成签名
      * @param array $data 签名数组
      * @param string $method 签名方法
+     * @param array $params 签名参数
      * @return bool|string 签名值
      */
-    protected function getSignature($data, $method = "sha1")
+    protected function getSignature($data, $method = "sha1", $params = [])
     {
-        if (!function_exists($method)) {
-            return false;
-        }
         ksort($data);
-        $params = [];
+        if (!function_exists($method)) return false;
-        foreach ($data as $key => $value) {
+        foreach ($data as $k => $v) array_push($params, "{$k}={$v}");
-            $params[] = "{$key}={$value}";
-        }
         return $method(join('&', $params));
     }
 }

vendor/zoujingli/wechat-developer/WeChat/User.php

@@ -87,6 +87,21 @@ class User extends BasicWeChat
         return $this->httpGetForJson($url);
     }
 
+    /**
+     * 获取标签下粉丝列表
+     * @param integer $tagid 标签ID
+     * @param string $next_openid 第一个拉取的OPENID
+     * @return array
+     * @throws Exceptions\InvalidResponseException
+     * @throws Exceptions\LocalCacheException
+     */
+    public function getUserListByTag($tagid, $next_openid = '')
+    {
+        $url = 'https://api.weixin.qq.com/cgi-bin/user/tag/get?access_token=ACCESS_TOKEN';
+        $this->registerApi($url, __FUNCTION__, func_get_args());
+        return $this->httpPostForJson($url, ['tagid' => $tagid, 'next_openid' => $next_openid]);
+    }
+
     /**
      * 获取公众号的黑名单列表
      * @param string $begin_openid

vendor/zoujingli/wechat-developer/_test/alipay-bill.php

@@ -24,13 +24,11 @@ try {
     // $pay = new \AliPay\Bill($config);
     // 请参考（请求参数）：https://docs.open.alipay.com/api_15/alipay.data.dataservice.bill.downloadurl.query
     $result = $pay->apply([
-        'bill_date' => '2017-11-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
+        'bill_date' => '2018-10-03', // 账单时间(日账单yyyy-MM-dd,月账单 yyyy-MM)
         'bill_type' => 'signcustomer', // 账单类型(trade指商户基于支付宝交易收单的业务账单,signcustomer是指基于商户支付宝余额收入及支出等资金变动的帐务账单)
     ]);
     echo '<pre>';
     var_export($result);
 } catch (Exception $e) {
     echo $e->getMessage();
-}
+}
-
-

vendor/zoujingli/wechat-developer/_test/alipay-transfer.php

@@ -24,7 +24,7 @@ try {
     // $pay = new \AliPay\Scan($config);
     // 参考链接：https://docs.open.alipay.com/api_28/alipay.fund.trans.toaccount.transfer
     $result = $pay->apply([
-        'out_biz_no'      => '', // 订单号
+        'out_biz_no'      => time(), // 订单号
         'payee_type'      => 'ALIPAY_LOGONID', // 收款方账户类型(ALIPAY_LOGONID | ALIPAY_USERID)
         'payee_account'   => 'demo@sandbox.com', // 收款方账户
         'amount'          => '10', // 转账金额

vendor/zoujingli/wechat-developer/include.php

@@ -13,12 +13,15 @@
 // +----------------------------------------------------------------------
 
 spl_autoload_register(function ($classname) {
-    $filename = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
+    $pathname = __DIR__ . DIRECTORY_SEPARATOR;
-    if (file_exists($filename)) {
+    $filename = str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
-        if (stripos($classname, 'WeChat') === 0) include $filename;
+    if (file_exists($pathname . $filename)) {
-        elseif (stripos($classname, 'WeMini') === 0) include $filename;
+        foreach (['WeChat', 'WeMini', 'AliPay', 'WePay', 'We'] as $prefix) {
-        elseif (stripos($classname, 'AliPay') === 0) include $filename;
+            if (stripos($classname, $prefix) === 0) {
-        elseif (stripos($classname, 'WePay') === 0) include $filename;
+                include $pathname . $filename;
-        elseif ($classname === 'We') include $filename;
+                return true;
+            }
+        }
     }
+    return false;
 });