LD 6 лет назад
Родитель
Сommit
3acfbdedc2

+ 11 - 6
app/Exceptions/Handler.php

@@ -4,6 +4,9 @@ namespace App\Exceptions;
 
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -29,10 +32,11 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param Throwable $exception
      * @return void
+     * @throws Exception
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -40,11 +44,12 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @param Request $request
+     * @param Throwable $exception
+     * @return Response
+     * @throws Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }

+ 5 - 22
app/Http/Controllers/TestController.php

@@ -4,38 +4,20 @@ namespace App\Http\Controllers;
 
 
 use App\Authority;
-use App\OracleBas_SKU;
 use App\Batch;
-use App\Carrier;
-use App\Commodity;
-use App\CommodityBarcode;
 use App\Events\CancelOrder;
-use App\Events\WeighedEvent;
 use App\Events\WmsReceiveNewEvent;
-use App\Jobs\MeasuringMachineQueue;
-use App\Jobs\ProcessReceiveCombinedJob;
 use App\Logistic;
-use App\MeasuringMachine;
+use App\OracleBasSKU;
 use App\Order;
 use App\Package;
-use App\ProcessDaily;
 use App\Rejected;
 use App\RejectedBill;
 use App\RejectedBillItem;
-use App\Role;
-use App\User;
-use App\UserDutyCheck;
 use App\WMSReflectReceive;
 use Carbon\Carbon;
-use Endroid\QrCode\QrCode;
 use Endroid\QrCode\Response\QrCodeResponse;
-use http\Client\Response;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Gate;
 use Zttp\Zttp;
 
 class TestController extends Controller
@@ -50,9 +32,10 @@ class TestController extends Controller
         return call_user_func([$this, $method],$request);
     }
     function t1(Request $request){ //x
-        $bills=RejectedBill::where('logistic_number_return','like','45jh56jk%')->get();
-        $bills->each(function(RejectedBill $bill){
-            $bill->setIsLoaded_toWaitConfirm();
+        $packages=Package::where('batch_number','W200430000003')->get();
+        $packages->each(function(Package $package){
+            $fluxC=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
+            $fluxC->accomplishToWMS($package);
         });
     }
     function tj(Request $request){

+ 27 - 16
app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -29,8 +29,22 @@ class PackageController extends Controller
                 'errors'=>$errors]];
         }
         $package=Package::where('logistic_number',$receiveInputs['SOReference5'])->first();
+        if (!$receiveInputs['Customer']) {
+            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发货主!快递单号:'.$receiveInputs['SOReference5'] , null);
+        }
         $owner=Owner::select('id')->where('code',$receiveInputs['Customer'])->first();
-        $carrier=Logistic::select('id')->where('code',$receiveInputs['CarrierID'])->first();
+        if (!$owner&&$receiveInputs['SOReference5']) {
+            Owner::create(['code'=>$receiveInputs['Customer'],'name'=>$receiveInputs['Customer']]);
+            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到货主,添加. 快递单号:'.$receiveInputs['SOReference5'] , null);
+        }
+        if (!$receiveInputs['CarrierID']) {
+            $this->log(__METHOD__, __FUNCTION__, '富勒没有下发快递公司!快递单号:'.$receiveInputs['SOReference5'] , null);
+        }
+        $logistic=Logistic::select('id')->where('code',$receiveInputs['CarrierID'])->first();
+        if (!$logistic&&$receiveInputs['CarrierID']) {
+            Logistic::create(['code'=>$receiveInputs['CarrierID'],'name'=>$receiveInputs['CarrierID']]);
+            $this->log(__METHOD__, __FUNCTION__, '富勒下发找不到承运商,添加. 快递单号:' .$receiveInputs['SOReference5'] , null);
+        }
         if ($package) {
             $package->delivery_number = $receiveInputs['palletid'];
             if ($owner) {
@@ -42,7 +56,7 @@ class PackageController extends Controller
                 $package->status = '记录异常';
             }
             $package->recipient = $receiveInputs['Consigneename'];
-            if ($carrier) $package->logistic_id = $carrier->id;
+            if ($logistic) $package->logistic_id = $logistic->id;
             $package->batch_number = $receiveInputs['USERDEFINE1'];
             $package->batch_rule = $receiveInputs['USERDEFINE2'];
             $package->save();
@@ -53,9 +67,6 @@ class PackageController extends Controller
             } else {
                 $package->status = "上传异常";
             }
-            if (!$owner || !$carrier) {
-                $this->log(__METHOD__, 'fluxPackageApi(no owner or carrier)' . __FUNCTION__, json_encode($request->all()), null);
-            }
             $package->save();
             $this->log(__METHOD__, 'fluxPackageApi' . __FUNCTION__, json_encode($request->all()), null);
             return response()->json(['response' => ['flag' => 'Y', 'code' => '0000', 'message' => '正确接收']])
@@ -64,13 +75,13 @@ class PackageController extends Controller
         //package不存在
         $receive = new WMSReflectPackage($receiveInputs);
         $receive->save();
-        if (isset($owner->id)&&isset($carrier->id)){
+        if (isset($owner->id)&&isset($logistic->id)){
             $createPackage = new Package([
                 'logistic_number'=>$receiveInputs['SOReference5'],
                 'delivery_number'=>$receiveInputs['palletid'],
                 'recipient'=>$receiveInputs['Consigneename'],
                 'owner_id'=>$owner->id,
-                'logistic_id'=>$carrier->id,
+                'logistic_id'=>$logistic->id,
                 'batch_number'=>$receiveInputs['USERDEFINE1'],
                 'batch_rule'=>$receiveInputs['USERDEFINE2'],
                 'status'=>'未测量'
@@ -153,15 +164,15 @@ class PackageController extends Controller
     public function accomplishToWMS(Package $package)
     {
         $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
-                'SOReference5'=>$package->logistic_number,
-                'Weigh'=>$package->weight,
-                'Addwho'=>'',
-                'Addtime'=>Carbon::now(),
-                'Package'=>$package->paperBox_name,
-                'USERDEFINE1'=>$package->batch_number,
-                'USERDEFINE2'=>$package->batch_rule,
-                'USERDEFINE3'=>'OK',
-            ]];
+            'SOReference5'=>$package->logistic_number,
+            'Weigh'=>$package->weight,
+            'Addwho'=>'',
+            'Addtime'=>Carbon::now(),
+            'Package'=>$package->paperBox_name,
+            'USERDEFINE1'=>$package->batch_number,
+            'USERDEFINE2'=>$package->batch_rule,
+            'USERDEFINE3'=>'OK',
+        ]];
         $json=json_encode($json);
         $url=url(config('api.flux.package.new'));
         $response = Zttp::post($url, json_decode($json));

+ 18 - 0
bootstrap/cache/packages.php

@@ -17,6 +17,17 @@
       0 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
     ),
   ),
+  'facade/ignition' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    ),
+    'aliases' => 
+    array (
+      'Flare' => 'Facade\\Ignition\\Facades\\Flare',
+    ),
+  ),
   'fideloper/proxy' => 
   array (
     'providers' => 
@@ -31,6 +42,13 @@
       0 => 'Laravel\\Tinker\\TinkerServiceProvider',
     ),
   ),
+  'laravel/ui' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Laravel\\Ui\\UiServiceProvider',
+    ),
+  ),
   'maatwebsite/excel' => 
   array (
     'providers' => 

+ 44 - 47
bootstrap/cache/services.php

@@ -25,20 +25,22 @@
     21 => 'Illuminate\\View\\ViewServiceProvider',
     22 => 'Barryvdh\\Debugbar\\ServiceProvider',
     23 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
-    24 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    25 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    26 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    27 => 'Carbon\\Laravel\\ServiceProvider',
-    28 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    29 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    30 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    31 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    32 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    33 => 'App\\Providers\\AppServiceProvider',
-    34 => 'App\\Providers\\AuthServiceProvider',
-    35 => 'App\\Providers\\BroadcastServiceProvider',
-    36 => 'App\\Providers\\EventServiceProvider',
-    37 => 'App\\Providers\\RouteServiceProvider',
+    24 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    25 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    26 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    27 => 'Laravel\\Ui\\UiServiceProvider',
+    28 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    29 => 'Carbon\\Laravel\\ServiceProvider',
+    30 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    31 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    32 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    33 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    34 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    35 => 'App\\Providers\\AppServiceProvider',
+    36 => 'App\\Providers\\AuthServiceProvider',
+    37 => 'App\\Providers\\BroadcastServiceProvider',
+    38 => 'App\\Providers\\EventServiceProvider',
+    39 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -54,17 +56,21 @@
     9 => 'Illuminate\\View\\ViewServiceProvider',
     10 => 'Barryvdh\\Debugbar\\ServiceProvider',
     11 => 'BeyondCode\\DumpServer\\DumpServerServiceProvider',
-    12 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
-    13 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
-    14 => 'Carbon\\Laravel\\ServiceProvider',
-    15 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
-    16 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    17 => 'Yajra\\Oci8\\Oci8ServiceProvider',
-    18 => 'App\\Providers\\AppServiceProvider',
-    19 => 'App\\Providers\\AuthServiceProvider',
-    20 => 'App\\Providers\\BroadcastServiceProvider',
-    21 => 'App\\Providers\\EventServiceProvider',
-    22 => 'App\\Providers\\RouteServiceProvider',
+    12 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    13 => 'Fideloper\\Proxy\\TrustedProxyServiceProvider',
+    14 => 'Laravel\\Ui\\UiServiceProvider',
+    15 => 'Maatwebsite\\Excel\\ExcelServiceProvider',
+    16 => 'Carbon\\Laravel\\ServiceProvider',
+    17 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    18 => 'Overtrue\\LaravelPinyin\\ServiceProvider',
+    19 => 'Te7aHoudini\\LaravelTrix\\LaravelTrixServiceProvider',
+    20 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    21 => 'Yajra\\Oci8\\Oci8ServiceProvider',
+    22 => 'App\\Providers\\AppServiceProvider',
+    23 => 'App\\Providers\\AuthServiceProvider',
+    24 => 'App\\Providers\\BroadcastServiceProvider',
+    25 => 'App\\Providers\\EventServiceProvider',
+    26 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (
@@ -76,6 +82,7 @@
     'Illuminate\\Contracts\\Bus\\QueueingDispatcher' => 'Illuminate\\Bus\\BusServiceProvider',
     'cache' => 'Illuminate\\Cache\\CacheServiceProvider',
     'cache.store' => 'Illuminate\\Cache\\CacheServiceProvider',
+    'cache.psr6' => 'Illuminate\\Cache\\CacheServiceProvider',
     'memcached.connector' => 'Illuminate\\Cache\\CacheServiceProvider',
     'command.cache.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.cache.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -83,23 +90,16 @@
     'command.auth.resets.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.config.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.config.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.db.wipe' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.down' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.environment' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.list' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.key.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.optimize' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.optimize.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.package.discover' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.preset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.queue.failed' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.queue.flush' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.queue.forget' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -117,10 +117,9 @@
     'command.up' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.view.cache' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.view.clear' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.app.name' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.auth.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.cache.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.channel.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.component.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.console.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.controller.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.event.generate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -131,7 +130,6 @@
     'command.listener.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.mail.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.middleware.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
-    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.model.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.notification.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.notification.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
@@ -146,17 +144,25 @@
     'command.seeder.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.session.table' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.serve' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.stub.publish' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.test.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'command.vendor.publish' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migrator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migration.repository' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'migration.creator' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.fresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.install' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.refresh' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.reset' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.rollback' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.status' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
+    'command.migrate.make' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'composer' => 'Illuminate\\Foundation\\Providers\\ConsoleSupportServiceProvider',
     'hash' => 'Illuminate\\Hashing\\HashServiceProvider',
     'hash.driver' => 'Illuminate\\Hashing\\HashServiceProvider',
+    'mail.manager' => 'Illuminate\\Mail\\MailServiceProvider',
     'mailer' => 'Illuminate\\Mail\\MailServiceProvider',
-    'swift.mailer' => 'Illuminate\\Mail\\MailServiceProvider',
-    'swift.transport' => 'Illuminate\\Mail\\MailServiceProvider',
     'Illuminate\\Mail\\Markdown' => 'Illuminate\\Mail\\MailServiceProvider',
     'Illuminate\\Contracts\\Pipeline\\Hub' => 'Illuminate\\Pipeline\\PipelineServiceProvider',
     'queue' => 'Illuminate\\Queue\\QueueServiceProvider',
@@ -173,9 +179,6 @@
     'validator' => 'Illuminate\\Validation\\ValidationServiceProvider',
     'validation.presence' => 'Illuminate\\Validation\\ValidationServiceProvider',
     'command.tinker' => 'Laravel\\Tinker\\TinkerServiceProvider',
-    'NunoMaduro\\Collision\\Contracts\\Provider' => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    'Overtrue\\Pinyin\\Pinyin' => 'Overtrue\\LaravelPinyin\\ServiceProvider',
-    'pinyin' => 'Overtrue\\LaravelPinyin\\ServiceProvider',
   ),
   'when' => 
   array (
@@ -218,11 +221,5 @@
     'Laravel\\Tinker\\TinkerServiceProvider' => 
     array (
     ),
-    'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider' => 
-    array (
-    ),
-    'Overtrue\\LaravelPinyin\\ServiceProvider' => 
-    array (
-    ),
   ),
 );

+ 7 - 5
composer.json

@@ -17,14 +17,16 @@
         "endroid/qr-code": "^3.7",
         "fideloper/proxy": "^4.0",
         "kitetail/zttp": "^0.6.0",
-        "laravel/framework": "5.8.*",
-        "laravel/tinker": "^1.0",
+        "laravel/framework": "7.*",
+        "laravel/tinker": "^2.0",
         "maatwebsite/excel": "^3.1",
         "overtrue/laravel-pinyin": "^4.0",
         "predis/predis": "^1.1",
         "pusher/pusher-php-server": "^4.1",
         "te7a-houdini/laravel-trix": "^2.0",
-        "yajra/laravel-oci8": "5.8"
+        "yajra/laravel-oci8": "7.0",
+        "facade/ignition": "^2.0",
+        "laravel/ui": "^2.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.2",
@@ -32,8 +34,8 @@
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^3.0",
-        "phpunit/phpunit": "^7.5"
+        "nunomaduro/collision": "^4.1",
+        "phpunit/phpunit": "^8.5"
     },
     "config": {
         "optimize-autoloader": true,

Разница между файлами не показана из-за своего большого размера
+ 534 - 230
composer.lock


+ 1 - 1
config/session.php

@@ -166,7 +166,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE', null),
 
     /*
     |--------------------------------------------------------------------------

+ 1 - 1
public/t.php

@@ -1,4 +1,4 @@
 <?php
 
 
-echo date('Y-m-d h:i:s', 1585274333);
+phpinfo();

+ 0 - 2
storage/framework/cache/data/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

+ 0 - 1
storage/framework/cache/data/49/4d/494dfad6834fa890621ed9d7525bb1c7e6041aa6

@@ -1 +0,0 @@
-1572401068i:1;

+ 0 - 1
storage/framework/cache/data/7d/d4/7dd4dec6c85ec5e1192f81a6a7c3675fcddeabb1

@@ -1 +0,0 @@
-1572401068i:1572401068;

Некоторые файлы не были показаны из-за большого количества измененных файлов