更改冲突

.gitignore

@@ -5,4 +5,3 @@ Homestead.yaml
 .env
 /storage/*
 storage/laravels.json
-composer.lock

bootstrap/app.php

@@ -81,7 +81,6 @@ $app->register(App\Providers\AuthServiceProvider::class);
 
 $app->register(Dingo\Api\Provider\LumenServiceProvider::class);
 $app->register(Tymon\JWTAuth\Providers\LumenServiceProvider::class);
-$app->register(\Junliuxian\AliOSS\AliOssServiceProvider::class);
 /*
 |--------------------------------------------------------------------------
 | Load The Application Routes

config/api.php

@@ -57,7 +57,7 @@ return [
     |
     */
 
-    'prefix' => env('API_PREFIX', '/'),
+    'prefix' => env('API_PREFIX', 'api'),
 
     /*
     |--------------------------------------------------------------------------

config/laravels.php

@@ -8,7 +8,7 @@ return [
     'listen_port'              => env('LARAVELS_LISTEN_PORT', 18207),
     'socket_type'              => defined('SWOOLE_SOCK_TCP') ? SWOOLE_SOCK_TCP : 1,
     'enable_coroutine_runtime' => false,
-    'server'                   => env('LARAVELS_SERVER', 'config-manage'),
+    'server'                   => env('LARAVELS_SERVER', 'admin-manage'),
     'handle_static'            => env('LARAVELS_HANDLE_STATIC', false),
     'laravel_base_path'        => env('LARAVEL_BASE_PATH', base_path()),
     'inotify_reload'           => [

routes/api.php

@@ -45,16 +45,4 @@ $api->version('v1', [
         //自提点分组新增
         $api->post('/pickupGroup/add','ConfigPickupGroupController@add');
     });
-});
-
-
-
-
-
-
-
-
-
-
-
-
+});