Commit 06d03949 by 杨树贤

解决冲突

parents d2f95f4a ba7b2d29
Showing with 10 additions and 8 deletions
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
use App\Http\Middleware\UniqueMiddleware; use App\Http\Middleware\UniqueMiddleware;
use Common\Exceptions\Handler; use Common\Exceptions\Handler;
use Hhxsv5\LaravelS\Illuminate\LaravelSServiceProvider;
use Illuminate\Redis\RedisServiceProvider;
require_once __DIR__.'/../vendor/autoload.php'; require_once __DIR__.'/../vendor/autoload.php';
...@@ -26,12 +28,10 @@ $app = new Laravel\Lumen\Application( ...@@ -26,12 +28,10 @@ $app = new Laravel\Lumen\Application(
realpath(__DIR__.'/../') realpath(__DIR__.'/../')
); );
$app->withFacades(); $app->withFacades();
$app->withEloquent(); $app->withEloquent();
$app->register(Hhxsv5\LaravelS\Illuminate\LaravelSServiceProvider::class);
$app->register(Illuminate\Redis\RedisServiceProvider::class);
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -46,7 +46,7 @@ $app->register(Illuminate\Redis\RedisServiceProvider::class); ...@@ -46,7 +46,7 @@ $app->register(Illuminate\Redis\RedisServiceProvider::class);
$app->singleton( $app->singleton(
Illuminate\Contracts\Debug\ExceptionHandler::class, Illuminate\Contracts\Debug\ExceptionHandler::class,
// App\Exceptions\Handler::class // App\Exceptions\Handler::class
Common\Exceptions\Handler::class Common\Exceptions\Handler::class
); );
...@@ -66,10 +66,10 @@ $app->singleton( ...@@ -66,10 +66,10 @@ $app->singleton(
| |
*/ */
$app->middleware([ $app->middleware([
// App\Http\Middleware\ExampleMiddleware::class // App\Http\Middleware\ExampleMiddleware::class
App\Http\Middleware\UniqueMiddleware::class, App\Http\Middleware\UniqueMiddleware::class,
]); ]);
// $app->routeMiddleware([ // $app->routeMiddleware([
// 'auth' => App\Http\Middleware\Authenticate::class, // 'auth' => App\Http\Middleware\Authenticate::class,
...@@ -89,6 +89,8 @@ $app->singleton( ...@@ -89,6 +89,8 @@ $app->singleton(
// $app->register(App\Providers\AppServiceProvider::class); // $app->register(App\Providers\AppServiceProvider::class);
// $app->register(App\Providers\AuthServiceProvider::class); // $app->register(App\Providers\AuthServiceProvider::class);
// $app->register(App\Providers\EventServiceProvider::class); // $app->register(App\Providers\EventServiceProvider::class);
$app->register(Hhxsv5\LaravelS\Illuminate\LaravelSServiceProvider::class);
$app->register(Illuminate\Redis\RedisServiceProvider::class);
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment