Merge pull request #32 from trollid/master

JWT for laravel 5.5 refer to #31

.gitignore

@@ -24,3 +24,4 @@ yarn-error.log
 phpunit.txt
 public/css
 public/js
+composer.lock
\ No newline at end of file

README.md

@@ -48,7 +48,7 @@ Generate a new application key
 
 Generate a new JWT authentication secret key
 
-    php artisan jwt:generate
+    php artisan jwt:secret
 
 Run the database migrations (**Set the database connection in .env before migrating**)
 

composer.json

@@ -21,7 +21,7 @@
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.5.0",
-        "tymon/jwt-auth": "0.5.12",
+        "tymon/jwt-auth": "dev-develop",
         "yajra/laravel-datatables-oracle": "~8.0"
     },
     "require-dev": {

config/app.php

@@ -200,7 +200,7 @@ return [
         App\Providers\HistoryServiceProvider::class,
         App\Providers\MacroServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-        Tymon\JWTAuth\Providers\JWTAuthServiceProvider::class,
+        Tymon\JWTAuth\Providers\LaravelServiceProvider::class,
         Bvipul\Generator\Provider\CrudGeneratorServiceProvider::class,
     ],