Merge branch 'feature/jwt' into develop

cb0e56b6 · shajiaiming · b778e52e · 3e2d84cd · cb0e56b6 · cb0e56b6
Commit cb0e56b6 authored Jul 27, 2020 by shajiaiming
20 changed files
--- a/common/behaviors/LoginStatusAuthInterceptor.php
+++ b/common/behaviors/LoginStatusAuthInterceptor.php
@@ -20,25 +20,24 @@ class LoginStatusAuthInterceptor extends ActionFilter
    {
        $request_class = get_class($action->controller);
        $request_action = $action->id;
-        if('login' == $request_action || 'user-sync' == $request_action){
+        if ('login' == $request_action || 'user-sync' == $request_action) {
            return true;
        }
        $token_string = Yii::$app->request->headers->get('Token');
-        if(false == $token_string){
+        if (false == $token_string) {
            $msg = 'platform auth error';
            $code = '40001';
            goto doEnd;
        }
-        $model = new Admin();
+        $user = Admin::verfication($token_string, '');
-        $user = $model->loginByAccessToken($token_string,'');
+        if (-1 == $user['code']) {
-        if(false == $user){
+            $code = '40001';
-            $msg = 'user auth error';
+            $msg = $user['data'];
-            $code = '40002';
            goto doEnd;
        }
-        $group = $user->group;
+        $group = $user["data"]->group;
-        $user_id = $user->uid;
+        $user_id = $user["data"]->uid;
-        $platform_id = $user->platform_id;
+        $platform_id = $user["data"]->platform_id;
        Yii::$app->request->setGroup($group);
        Yii::$app->request->setUserId($user_id);
        Yii::$app->request->setPlatformId($platform_id);

--- a/common/behaviors/UserAuthInterceptor.php
+++ b/common/behaviors/UserAuthInterceptor.php
@@ -23,20 +23,20 @@ class UserAuthInterceptor extends ActionFilter
        $request_class = get_class($action->controller);
        $request_action = $action->id;
-        if('login' == $request_action || 'user-sync' == $request_action){
+        if ('login' == $request_action || 'user-sync' == $request_action) {
            return true;
        }
        $token_string = Yii::$app->request->headers->get('Token');
-        $model = new Admin();
+        $user = Admin::verfication($token_string, '');
-        $user = $model->loginByAccessToken($token_string, '');
+        if (-1 == $user['code']) {
-        if (empty($user)) {
            $code = '40001';
-            $msg = 'user auth error';
+            $msg = $user['msg'];
            goto doEnd;
        }
-        $group = $user->group;
-        $user_id = $user->uid;
+        $group = $user["data"]->group;
-        $platform_id = $user->platform_id;
+        $user_id = $user["data"]->uid;
+        $platform_id = $user["data"]->platform_id;
        Yii::$app->request->setGroup($group);
        Yii::$app->request->setUserId($user_id);
        Yii::$app->request->setPlatformId($platform_id);

--- a/common/business/ExchangeBusiness.php
+++ b/common/business/ExchangeBusiness.php
@@ -360,7 +360,7 @@ class ExchangeBusiness
            $quotation['low'] = (float)sprintf("%0.4f", $quotation['low']);
            $quotation['high'] = (float)sprintf("%0.4f", $quotation['high']);
            $quotation['last'] = (float)sprintf("%0.4f", $quotation['last']);
-            $quotation['open'] = (float)sprintf("%0.4f", $quotation['open']);
+            $quotation['open'] = isset($quotation['open']) ? (float)sprintf("%0.4f", $quotation['open']) : $quotation['last'];
        } else if (in_array(strtoupper($tag), ['SUSD'])) {
            $quotation['usd'] = (float)sprintf("%0.4f", 1);
        } else {

--- a/common/models/Admin.php
+++ b/common/models/Admin.php
@@ -2,6 +2,7 @@
 namespace common\models;
+use Firebase\JWT\JWT;
 use Yii;
 use yii\base\NotSupportedException;
 use yii\web\IdentityInterface;
@@ -76,7 +77,7 @@ class Admin extends \common\modelsgii\Admin implements IdentityInterface
            return false;
        }
-        $timestamp = (int) substr($token, strrpos($token, '_') + 1);
+        $timestamp = (int)substr($token, strrpos($token, '_') + 1);
        $expire = Yii::$app->params['user.passwordResetTokenExpire'];
        return $timestamp + $expire >= time();
    }
@@ -168,8 +169,31 @@ class Admin extends \common\modelsgii\Admin implements IdentityInterface
        return $user;
    }
-    public function loginByAccessToken($accessToken, $type) {
+    public function loginByAccessToken($accessToken, $type)
-        return static::findIdentityByAccessToken($accessToken, $type);
+    {
+        print_r(static::findIdentityByAccessToken($accessToken, $type));
+        exit;
+    }
+    public static function verfication($accessToken)
+    {
+        $key = '344'; //key要和签发的时候一样
+        try {
+            JWT::$leeway = 60;//当前时间减去60，把时间留点余地
+            $decoded = JWT::decode($accessToken, $key, ['HS256']); //HS256方式，这里要和签发的时候对应
+            $arr = (array)$decoded;
+            $resp = [
+                'code' => 0,
+                'data' => $arr['data']
+            ];
+        } catch (\Exception $e) {  //其他错误
+            $resp = [
+                'code' => -1,
+                'data' => $e->getMessage()
+            ];
+        }
+        return $resp;
    }
    /**

--- a/common/models/LoginForm.php
+++ b/common/models/LoginForm.php
 <?php
 namespace common\models;
 use Yii;
@@ -34,11 +35,12 @@ class LoginForm extends Model
        ];
    }
-    public function scenarios() {
+    public function scenarios()
+    {
        $scenarios = [
            self:: SCENARIOS_LOGIN => ['username', 'password'],
        ];
-        return array_merge( parent:: scenarios(), $scenarios);
+        return array_merge(parent:: scenarios(), $scenarios);
    }
    /**
@@ -67,10 +69,7 @@ class LoginForm extends Model
    {
        if ($this->validate()) {
            if ($this->getUser()) {
-                $access_token = $this->_user->generateAccessToken();
+                return $this->_user;
-                $this->_user->access_token = $access_token ;
-                $this->_user->save();
-                return $access_token;
            }
        }

--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,8 @@
    "yiisoft/yii2-elasticsearch": "~2.0.0",
    "workerman/workerman": "^3.5",
    "aliyuncs/oss-sdk-php": "^2.3",
-    "elasticsearch/elasticsearch": "^7.4"
+    "elasticsearch/elasticsearch": "^7.4",
+    "firebase/php-jwt": "^5.2"
  },
  "require-dev": {
    "yiisoft/yii2-debug": "~2.0.0",

--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "c74650379de435f8618ee861ec785d20",
+    "content-hash": "e1686d1bba6dc1878258a26d6da1d392",
    "packages": [
        {
            "name": "aliyuncs/oss-sdk-php",
@@ -463,6 +463,56 @@
            "time": "2018-02-23T01:58:20+00:00"
        },
        {
+            "name": "firebase/php-jwt",
+            "version": "v5.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/firebase/php-jwt.git",
+                "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/feb0e820b8436873675fd3aca04f3728eb2185cb",
+                "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=4.8 <=9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Firebase\\JWT\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Neuman Vong",
+                    "email": "neuman+pear@twilio.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Anant Narayanan",
+                    "email": "anant@php.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+            "homepage": "https://github.com/firebase/php-jwt",
+            "keywords": [
+                "jwt",
+                "php"
+            ],
+            "time": "2020-03-25T18:49:23+00:00"
+        },
+        {
            "name": "guzzlehttp/ringphp",
            "version": "1.1.1",
            "source": {
@@ -511,6 +561,7 @@
                }
            ],
            "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
+            "abandoned": true,
            "time": "2018-07-31T13:22:33+00:00"
        },
        {
@@ -561,6 +612,7 @@
                "Guzzle",
                "stream"
            ],
+            "abandoned": true,
            "time": "2014-10-12T19:18:40+00:00"
        },
        {
@@ -5329,5 +5381,6 @@
    "platform": {
        "php": ">=5.4.0"
    },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -74,6 +74,7 @@ return array(
    'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'),
    'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'),
    'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
+    'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'),
    'Faker\\' => array($vendorDir . '/fzaninotto/faker/src/Faker'),
    'Elasticsearch\\' => array($vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch'),
    'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/EmailValidator'),

--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -13,6 +13,9 @@ class ComposerAutoloaderInit33057934f3e7eaaa1ce2d53797277936
        }
    }
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
    public static function getLoader()
    {
        if (null !== self::$loader) {

--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -128,6 +128,7 @@ class ComposerStaticInit33057934f3e7eaaa1ce2d53797277936
        ),
        'F' => 
        array (
+            'Firebase\\JWT\\' => 13,
            'Faker\\' => 6,
        ),
        'E' => 
@@ -423,6 +424,10 @@ class ComposerStaticInit33057934f3e7eaaa1ce2d53797277936
        array (
            0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src',
        ),
+        'Firebase\\JWT\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/firebase/php-jwt/src',
+        ),
        'Faker\\' => 
        array (
            0 => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker',

--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -380,7 +380,8 @@
            "acceptance testing",
            "functional testing",
            "unit testing"
-        ]
+        ],
+        "abandoned": true
    },
    {
        "name": "codeception/phpunit-wrapper",
@@ -826,6 +827,58 @@
        ]
    },
    {
+        "name": "firebase/php-jwt",
+        "version": "v5.2.0",
+        "version_normalized": "5.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/firebase/php-jwt.git",
+            "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/firebase/php-jwt/zipball/feb0e820b8436873675fd3aca04f3728eb2185cb",
+            "reference": "feb0e820b8436873675fd3aca04f3728eb2185cb",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": ">=4.8 <=9"
+        },
+        "time": "2020-03-25T18:49:23+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Firebase\\JWT\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Neuman Vong",
+                "email": "neuman+pear@twilio.com",
+                "role": "Developer"
+            },
+            {
+                "name": "Anant Narayanan",
+                "email": "anant@php.net",
+                "role": "Developer"
+            }
+        ],
+        "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+        "homepage": "https://github.com/firebase/php-jwt",
+        "keywords": [
+            "jwt",
+            "php"
+        ]
+    },
+    {
        "name": "fzaninotto/faker",
        "version": "v1.8.0",
        "version_normalized": "1.8.0.0",
@@ -995,7 +1048,8 @@
                "homepage": "https://github.com/mtdowling"
            }
        ],
-        "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function."
+        "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
+        "abandoned": true
    },
    {
        "name": "guzzlehttp/streams",
@@ -1047,7 +1101,8 @@
        "keywords": [
            "Guzzle",
            "stream"
-        ]
+        ],
+        "abandoned": true
    },
    {
        "name": "kartik-v/bootstrap-fileinput",

--- a/vendor/firebase/php-jwt/LICENSE
+++ b/vendor/firebase/php-jwt/LICENSE
+Copyright (c) 2011, Neuman Vong
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Neuman Vong nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/vendor/firebase/php-jwt/README.md
+++ b/vendor/firebase/php-jwt/README.md
+[![Build Status](https://travis-ci.org/firebase/php-jwt.png?branch=master)](https://travis-ci.org/firebase/php-jwt)
+[![Latest Stable Version](https://poser.pugx.org/firebase/php-jwt/v/stable)](https://packagist.org/packages/firebase/php-jwt)
+[![Total Downloads](https://poser.pugx.org/firebase/php-jwt/downloads)](https://packagist.org/packages/firebase/php-jwt)
+[![License](https://poser.pugx.org/firebase/php-jwt/license)](https://packagist.org/packages/firebase/php-jwt)
+PHP-JWT
+=======
+A simple library to encode and decode JSON Web Tokens (JWT) in PHP, conforming to [RFC 7519](https://tools.ietf.org/html/rfc7519).
+Installation
+------------
+Use composer to manage your dependencies and download PHP-JWT:
+```bash
+composer require firebase/php-jwt
+```
+Example
+-------
+```php
+<?php
+use \Firebase\JWT\JWT;
+$key = "example_key";
+$payload = array(
+    "iss" => "http://example.org",
+    "aud" => "http://example.com",
+    "iat" => 1356999524,
+    "nbf" => 1357000000
+);
+/**
+ * IMPORTANT:
+ * You must specify supported algorithms for your application. See
+ * https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40
+ * for a list of spec-compliant algorithms.
+ */
+$jwt = JWT::encode($payload, $key);
+$decoded = JWT::decode($jwt, $key, array('HS256'));
+print_r($decoded);
+/*
+ NOTE: This will now be an object instead of an associative array. To get
+ an associative array, you will need to cast it as such:
+*/
+$decoded_array = (array) $decoded;
+/**
+ * You can add a leeway to account for when there is a clock skew times between
+ * the signing and verifying servers. It is recommended that this leeway should
+ * not be bigger than a few minutes.
+ *
+ * Source: http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#nbfDef
+ */
+JWT::$leeway = 60; // $leeway in seconds
+$decoded = JWT::decode($jwt, $key, array('HS256'));
+?>
+```
+Example with RS256 (openssl)
+----------------------------
+```php
+<?php
+use \Firebase\JWT\JWT;
+$privateKey = <<<EOD
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQC8kGa1pSjbSYZVebtTRBLxBz5H4i2p/llLCrEeQhta5kaQu/Rn
+vuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t0tyazyZ8JXw+KgXTxldMPEL9
+5+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4ehde/zUxo6UvS7UrBQIDAQAB
+AoGAb/MXV46XxCFRxNuB8LyAtmLDgi/xRnTAlMHjSACddwkyKem8//8eZtw9fzxz
+bWZ/1/doQOuHBGYZU8aDzzj59FZ78dyzNFoF91hbvZKkg+6wGyd/LrGVEB+Xre0J
+Nil0GReM2AHDNZUYRv+HYJPIOrB0CRczLQsgFJ8K6aAD6F0CQQDzbpjYdx10qgK1
+cP59UHiHjPZYC0loEsk7s+hUmT3QHerAQJMZWC11Qrn2N+ybwwNblDKv+s5qgMQ5
+5tNoQ9IfAkEAxkyffU6ythpg/H0Ixe1I2rd0GbF05biIzO/i77Det3n4YsJVlDck
+ZkcvY3SK2iRIL4c9yY6hlIhs+K9wXTtGWwJBAO9Dskl48mO7woPR9uD22jDpNSwe
+k90OMepTjzSvlhjbfuPN1IdhqvSJTDychRwn1kIJ7LQZgQ8fVz9OCFZ/6qMCQGOb
+qaGwHmUK6xzpUbbacnYrIM6nLSkXgOAwv7XXCojvY614ILTK3iXiLBOxPu5Eu13k
+eUz9sHyD6vkgZzjtxXECQAkp4Xerf5TGfQXGXhxIX52yH+N2LtujCdkQZjXAsGdm
+B2zNzvrlgRmgBrklMTrMYgm1NPcW+bRLGcwgW2PTvNM=
+-----END RSA PRIVATE KEY-----
+EOD;
+$publicKey = <<<EOD
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8kGa1pSjbSYZVebtTRBLxBz5H
+4i2p/llLCrEeQhta5kaQu/RnvuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t
+0tyazyZ8JXw+KgXTxldMPEL95+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4
+ehde/zUxo6UvS7UrBQIDAQAB
+-----END PUBLIC KEY-----
+EOD;
+$payload = array(
+    "iss" => "example.org",
+    "aud" => "example.com",
+    "iat" => 1356999524,
+    "nbf" => 1357000000
+);
+$jwt = JWT::encode($payload, $privateKey, 'RS256');
+echo "Encode:\n" . print_r($jwt, true) . "\n";
+$decoded = JWT::decode($jwt, $publicKey, array('RS256'));
+/*
+ NOTE: This will now be an object instead of an associative array. To get
+ an associative array, you will need to cast it as such:
+*/
+$decoded_array = (array) $decoded;
+echo "Decode:\n" . print_r($decoded_array, true) . "\n";
+?>
+```
+Changelog
+---------
+#### 5.0.0 / 2017-06-26
+- Support RS384 and RS512.
+  See [#117](https://github.com/firebase/php-jwt/pull/117). Thanks [@joostfaassen](https://github.com/joostfaassen)!
+- Add an example for RS256 openssl.
+  See [#125](https://github.com/firebase/php-jwt/pull/125). Thanks [@akeeman](https://github.com/akeeman)!
+- Detect invalid Base64 encoding in signature.
+  See [#162](https://github.com/firebase/php-jwt/pull/162). Thanks [@psignoret](https://github.com/psignoret)!
+- Update `JWT::verify` to handle OpenSSL errors.
+  See [#159](https://github.com/firebase/php-jwt/pull/159). Thanks [@bshaffer](https://github.com/bshaffer)!
+- Add `array` type hinting to `decode` method
+  See [#101](https://github.com/firebase/php-jwt/pull/101). Thanks [@hywak](https://github.com/hywak)!
+- Add all JSON error types.
+  See [#110](https://github.com/firebase/php-jwt/pull/110). Thanks [@gbalduzzi](https://github.com/gbalduzzi)!
+- Bugfix 'kid' not in given key list.
+  See [#129](https://github.com/firebase/php-jwt/pull/129). Thanks [@stampycode](https://github.com/stampycode)!
+- Miscellaneous cleanup, documentation and test fixes.
+  See [#107](https://github.com/firebase/php-jwt/pull/107), [#115](https://github.com/firebase/php-jwt/pull/115),
+  [#160](https://github.com/firebase/php-jwt/pull/160), [#161](https://github.com/firebase/php-jwt/pull/161), and
+  [#165](https://github.com/firebase/php-jwt/pull/165). Thanks [@akeeman](https://github.com/akeeman),
+  [@chinedufn](https://github.com/chinedufn), and [@bshaffer](https://github.com/bshaffer)!
+#### 4.0.0 / 2016-07-17
+- Add support for late static binding. See [#88](https://github.com/firebase/php-jwt/pull/88) for details. Thanks to [@chappy84](https://github.com/chappy84)!
+- Use static `$timestamp` instead of `time()` to improve unit testing. See [#93](https://github.com/firebase/php-jwt/pull/93) for details. Thanks to [@josephmcdermott](https://github.com/josephmcdermott)!
+- Fixes to exceptions classes. See [#81](https://github.com/firebase/php-jwt/pull/81) for details. Thanks to [@Maks3w](https://github.com/Maks3w)!
+- Fixes to PHPDoc. See [#76](https://github.com/firebase/php-jwt/pull/76) for details. Thanks to [@akeeman](https://github.com/akeeman)!
+#### 3.0.0 / 2015-07-22
+- Minimum PHP version updated from `5.2.0` to `5.3.0`.
+- Add `\Firebase\JWT` namespace. See
+[#59](https://github.com/firebase/php-jwt/pull/59) for details. Thanks to
+[@Dashron](https://github.com/Dashron)!
+- Require a non-empty key to decode and verify a JWT. See
+[#60](https://github.com/firebase/php-jwt/pull/60) for details. Thanks to
+[@sjones608](https://github.com/sjones608)!
+- Cleaner documentation blocks in the code. See
+[#62](https://github.com/firebase/php-jwt/pull/62) for details. Thanks to
+[@johanderuijter](https://github.com/johanderuijter)!
+#### 2.2.0 / 2015-06-22
+- Add support for adding custom, optional JWT headers to `JWT::encode()`. See
+[#53](https://github.com/firebase/php-jwt/pull/53/files) for details. Thanks to
+[@mcocaro](https://github.com/mcocaro)!
+#### 2.1.0 / 2015-05-20
+- Add support for adding a leeway to `JWT:decode()` that accounts for clock skew
+between signing and verifying entities. Thanks to [@lcabral](https://github.com/lcabral)!
+- Add support for passing an object implementing the `ArrayAccess` interface for
+`$keys` argument in `JWT::decode()`. Thanks to [@aztech-dev](https://github.com/aztech-dev)!
+#### 2.0.0 / 2015-04-01
+- **Note**: It is strongly recommended that you update to > v2.0.0 to address
+  known security vulnerabilities in prior versions when both symmetric and
+  asymmetric keys are used together.
+- Update signature for `JWT::decode(...)` to require an array of supported
+  algorithms to use when verifying token signatures.
+Tests
+-----
+Run the tests using phpunit:
+```bash
+$ pear install PHPUnit
+$ phpunit --configuration phpunit.xml.dist
+PHPUnit 3.7.10 by Sebastian Bergmann.
+.....
+Time: 0 seconds, Memory: 2.50Mb
+OK (5 tests, 5 assertions)
+```
+New Lines in private keys
+-----
+If your private key contains `\n` characters, be sure to wrap it in double quotes `""`
+and not single quotes `''` in order to properly interpret the escaped characters.
+License
+-------
+[3-Clause BSD](http://opensource.org/licenses/BSD-3-Clause).
--- a/vendor/firebase/php-jwt/composer.json
+++ b/vendor/firebase/php-jwt/composer.json
+{
+    "name": "firebase/php-jwt",
+    "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
+    "homepage": "https://github.com/firebase/php-jwt",
+    "keywords": [
+        "php",
+        "jwt"
+    ],
+    "authors": [
+        {
+            "name": "Neuman Vong",
+            "email": "neuman+pear@twilio.com",
+            "role": "Developer"
+        },
+        {
+            "name": "Anant Narayanan",
+            "email": "anant@php.net",
+            "role": "Developer"
+        }
+    ],
+    "license": "BSD-3-Clause",
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Firebase\\JWT\\": "src"
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": ">=4.8 <=9"
+    }
+}
--- a/vendor/firebase/php-jwt/src/BeforeValidException.php
+++ b/vendor/firebase/php-jwt/src/BeforeValidException.php
+<?php
+namespace Firebase\JWT;
+class BeforeValidException extends \UnexpectedValueException
+{
+}
--- a/vendor/firebase/php-jwt/src/ExpiredException.php
+++ b/vendor/firebase/php-jwt/src/ExpiredException.php
+<?php
+namespace Firebase\JWT;
+class ExpiredException extends \UnexpectedValueException
+{
+}
--- a/vendor/firebase/php-jwt/src/JWK.php
+++ b/vendor/firebase/php-jwt/src/JWK.php
+<?php
+namespace Firebase\JWT;
+use DomainException;
+use UnexpectedValueException;
+/**
+ * JSON Web Key implementation, based on this spec:
+ * https://tools.ietf.org/html/draft-ietf-jose-json-web-key-41
+ *
+ * PHP version 5
+ *
+ * @category Authentication
+ * @package  Authentication_JWT
+ * @author   Bui Sy Nguyen <nguyenbs@gmail.com>
+ * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
+ * @link     https://github.com/firebase/php-jwt
+ */
+class JWK
+{
+    /**
+     * Parse a set of JWK keys
+     *
+     * @param array $jwks The JSON Web Key Set as an associative array
+     *
+     * @return array An associative array that represents the set of keys
+     *
+     * @throws InvalidArgumentException     Provided JWK Set is empty
+     * @throws UnexpectedValueException     Provided JWK Set was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses parseKey
+     */
+    public static function parseKeySet(array $jwks)
+    {
+        $keys = array();
+        if (!isset($jwks['keys'])) {
+            throw new UnexpectedValueException('"keys" member must exist in the JWK Set');
+        }
+        if (empty($jwks['keys'])) {
+            throw new InvalidArgumentException('JWK Set did not contain any keys');
+        }
+        foreach ($jwks['keys'] as $k => $v) {
+            $kid = isset($v['kid']) ? $v['kid'] : $k;
+            if ($key = self::parseKey($v)) {
+                $keys[$kid] = $key;
+            }
+        }
+        if (0 === \count($keys)) {
+            throw new UnexpectedValueException('No supported algorithms found in JWK Set');
+        }
+        return $keys;
+    }
+    /**
+     * Parse a JWK key
+     *
+     * @param array $jwk An individual JWK
+     *
+     * @return resource|array An associative array that represents the key
+     *
+     * @throws InvalidArgumentException     Provided JWK is empty
+     * @throws UnexpectedValueException     Provided JWK was invalid
+     * @throws DomainException              OpenSSL failure
+     *
+     * @uses createPemFromModulusAndExponent
+     */
+    private static function parseKey(array $jwk)
+    {
+        if (empty($jwk)) {
+            throw new InvalidArgumentException('JWK must not be empty');
+        }
+        if (!isset($jwk['kty'])) {
+            throw new UnexpectedValueException('JWK must contain a "kty" parameter');
+        }
+        switch ($jwk['kty']) {
+            case 'RSA':
+                if (\array_key_exists('d', $jwk)) {
+                    throw new UnexpectedValueException('RSA private keys are not supported');
+                }
+                if (!isset($jwk['n']) || !isset($jwk['e'])) {
+                    throw new UnexpectedValueException('RSA keys must contain values for both "n" and "e"');
+                }
+                $pem = self::createPemFromModulusAndExponent($jwk['n'], $jwk['e']);
+                $publicKey = \openssl_pkey_get_public($pem);
+                if (false === $publicKey) {
+                    throw new DomainException(
+                        'OpenSSL error: ' . \openssl_error_string()
+                    );
+                }
+                return $publicKey;
+            default:
+                // Currently only RSA is supported
+                break;
+        }
+    }
+    /**
+     * Create a public key represented in PEM format from RSA modulus and exponent information
+     *
+     * @param string $n The RSA modulus encoded in Base64
+     * @param string $e The RSA exponent encoded in Base64
+     *
+     * @return string The RSA public key represented in PEM format
+     *
+     * @uses encodeLength
+     */
+    private static function createPemFromModulusAndExponent($n, $e)
+    {
+        $modulus = JWT::urlsafeB64Decode($n);
+        $publicExponent = JWT::urlsafeB64Decode($e);
+        $components = array(
+            'modulus' => \pack('Ca*a*', 2, self::encodeLength(\strlen($modulus)), $modulus),
+            'publicExponent' => \pack('Ca*a*', 2, self::encodeLength(\strlen($publicExponent)), $publicExponent)
+        );
+        $rsaPublicKey = \pack(
+            'Ca*a*a*',
+            48,
+            self::encodeLength(\strlen($components['modulus']) + \strlen($components['publicExponent'])),
+            $components['modulus'],
+            $components['publicExponent']
+        );
+        // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
+        $rsaOID = \pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+        $rsaPublicKey = \chr(0) . $rsaPublicKey;
+        $rsaPublicKey = \chr(3) . self::encodeLength(\strlen($rsaPublicKey)) . $rsaPublicKey;
+        $rsaPublicKey = \pack(
+            'Ca*a*',
+            48,
+            self::encodeLength(\strlen($rsaOID . $rsaPublicKey)),
+            $rsaOID . $rsaPublicKey
+        );
+        $rsaPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
+            \chunk_split(\base64_encode($rsaPublicKey), 64) .
+            '-----END PUBLIC KEY-----';
+        return $rsaPublicKey;
+    }
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @param int $length
+     * @return string
+     */
+    private static function encodeLength($length)
+    {
+        if ($length <= 0x7F) {
+            return \chr($length);
+        }
+        $temp = \ltrim(\pack('N', $length), \chr(0));
+        return \pack('Ca*', 0x80 | \strlen($temp), $temp);
+    }
+}
--- a/vendor/firebase/php-jwt/src/JWT.php
+++ b/vendor/firebase/php-jwt/src/JWT.php
--- a/vendor/firebase/php-jwt/src/SignatureInvalidException.php
+++ b/vendor/firebase/php-jwt/src/SignatureInvalidException.php
+<?php
+namespace Firebase\JWT;
+class SignatureInvalidException extends \UnexpectedValueException
+{
+}
--- a/wallet/controllers/UserController.php
+++ b/wallet/controllers/UserController.php
@@ -3,6 +3,7 @@
 namespace wallet\controllers;
+use Firebase\JWT\JWT;
 use Yii;
 use common\models\Admin;
 use common\models\LoginForm;
@@ -24,13 +25,32 @@ class UserController extends BaseController
        $model = new LoginForm();
        $model->setScenario(LoginForm::SCENARIOS_LOGIN);
        $model->load(Yii::$app->request->post(), '');
-        if (!$model->login()) {
+        $key = 'bwallet'; //key
+        $time = time(); //当前时间
+        if (!$user = $model->login()) {
            $msg = implode(", ", \yii\helpers\ArrayHelper::getColumn($model->errors, 0, false)); // Model's Errors string
            $data = null;
            $code = -1;
            goto doEnd;
        }
-        $data = ['access_token' => $model->login()];
+        $token = [
+            'iss' => 'https://www.bitfeel.cn', //签发者 可选
+            'aud' => 'https://www.bitfeel.cn', //接收该JWT的一方，可选
+            'iat' => time(), //签发时间
+            'nbf' => $time, //(Not Before)：某个时间点后才能访问，比如设置time+30，表示当前时间30秒后才能使用
+            'exp' => $time + 7200, //过期时间,这里设置2个小时
+            'user' => [ //自定义信息，不要定义敏感信息
+                'uid' => $user->uid,
+                'username' => $user->username,
+                'platform_id' => $user->platform_id,
+                'group' => $user->group
+            ]
+        ];
+        $access_token = JWT::encode($token, $key);
+        $data = ['access_token' => $access_token];
        doEnd :
        return ['code' => $code, 'msg' => $msg, 'data' => $data];
@@ -41,13 +61,13 @@ class UserController extends BaseController
        $msg = 'ok';
        $code = 0;
        $token_string = Yii::$app->request->headers->get('Token');
-        $user = Admin::findIdentityByAccessToken($token_string);
+        $user = Admin::verfication($token_string);
        $data = [
-            'username' => $user->username,
+            'username' => $user["data"]->username,
-            'uid' => isset($user->bind_uid) ? $user->bind_uid : $user->uid,
+            'uid' => isset($user["data"]->bind_uid) ? $user["data"]->bind_uid : $user["data"]->uid,
-            'type' => isset($user->bind_uid) ? 2 : 1,
+            'type' => isset($user["data"]->bind_uid) ? 2 : 1,
-            'platform_id' => $user->platform_id,
+            'platform_id' => $user["data"]->platform_id,
-            'group' => $user->group
+            'group' => $user["data"]->group
        ];
        return ['code' => $code, 'msg' => $msg, 'data' => $data];
@@ -127,17 +147,17 @@ class UserController extends BaseController
    public function actionUserList()
    {
        $current_platform_id = Yii::$app->request->getPlatformId();
-        if(1 === $current_platform_id) {
+        if (1 === $current_platform_id) {
            $platform_id = Yii::$app->request->get('platform_id', 1);
            $platform_id = empty($platform_id) ? 1 : $platform_id;
        } else {
            $platform_id = Yii::$app->request->getPlatformId();
        }
-        if(!isset(Yii::$app->params['trusteeship']['node_'. $platform_id])){
+        if (!isset(Yii::$app->params['trusteeship']['node_' . $platform_id])) {
            return ['code' => -1, 'data' => [], 'msg' => '此钱包节点尚未开通'];
        }
-        $node_params = Yii::$app->params['trusteeship']['node_'. $platform_id];
+        $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
        $page = Yii::$app->request->get('page', 1);
        $size = Yii::$app->request->get('size', 15);
@@ -182,17 +202,17 @@ class UserController extends BaseController
    public function actionManualList()
    {
        $current_platform_id = Yii::$app->request->getPlatformId();
-        if(1 === $current_platform_id) {
+        if (1 === $current_platform_id) {
            $platform_id = Yii::$app->request->get('platform_id', 1);
            $platform_id = empty($platform_id) ? 1 : $platform_id;
        } else {
            $platform_id = Yii::$app->request->getPlatformId();
        }
-        if(!isset(Yii::$app->params['trusteeship']['node_'. $platform_id])){
+        if (!isset(Yii::$app->params['trusteeship']['node_' . $platform_id])) {
            return ['code' => -1, 'data' => [], 'msg' => '此钱包节点尚未开通'];
        }
-        $node_params = Yii::$app->params['trusteeship']['node_'. $platform_id];
+        $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
        $page = Yii::$app->request->get('page', 1);
        $size = Yii::$app->request->get('size', 15);
@@ -232,22 +252,22 @@ class UserController extends BaseController
    public function actionVerify()
    {
        $current_platform_id = Yii::$app->request->getPlatformId();
-        if(1 === $current_platform_id) {
+        if (1 === $current_platform_id) {
            $platform_id = Yii::$app->request->get('platform_id', 1);
            $platform_id = empty($platform_id) ? 1 : $platform_id;
        } else {
            $platform_id = Yii::$app->request->getPlatformId();
        }
-        if(!isset(Yii::$app->params['trusteeship']['node_'. $platform_id])){
+        if (!isset(Yii::$app->params['trusteeship']['node_' . $platform_id])) {
            return ['code' => -1, 'data' => [], 'msg' => '此钱包节点尚未开通'];
        }
-        $node_params = Yii::$app->params['trusteeship']['node_'. $platform_id];
+        $node_params = Yii::$app->params['trusteeship']['node_' . $platform_id];
        $post = Yii::$app->request->post();
        $uid = isset($post['uid']) ? $post['uid'] : null;
        $action = isset($post['action']) ? $post['action'] : null;
-        if(false == $uid || false == $action){
+        if (false == $uid || false == $action) {
            return ['code' => -1, 'data' => [], 'msg' => '参数错误'];
        }