From b63674012e0d5ae4c344ef327848cf07c14943b6 Mon Sep 17 00:00:00 2001
From: bill <276957690@qq.com>
Date: Mon, 1 Nov 2021 14:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9laravel=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                             | 8 ++++++--
 config/database.php                       | 2 +-
 resources/views/wap/index/index.blade.php | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 511d1b7..be06bf6 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         "php": ">=5.6.4",
         "intervention/image": "^2.3",
         "jpush/jpush": "v3.5.*",
-        "laravel/framework": "5.4.*",
+        "laravel/framework": "5.5.*",
         "laravel/tinker": "~1.0",
         "maatwebsite/excel": "~2.1.0",
         "overtrue/laravel-wechat": "~3.1",
@@ -20,7 +20,7 @@
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~5.7"
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "classmap": [
@@ -52,6 +52,10 @@
         "post-update-cmd": [
             "Illuminate\\Foundation\\ComposerScripts::postUpdate",
             "php artisan clear-compiled"
+        ],
+        "post-autoload-dump": [
+            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+            "@php artisan package:discover"
         ]
     },
     "config": {
diff --git a/config/database.php b/config/database.php
index 6291687..84c2020 100644
--- a/config/database.php
+++ b/config/database.php
@@ -50,7 +50,7 @@ return [
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => env('DB_PREFIX', 'fl_'),
-            'strict' => true,
+            'strict' => false,
             'engine' => null,
         ],
 
diff --git a/resources/views/wap/index/index.blade.php b/resources/views/wap/index/index.blade.php
index 1076a9b..8e845a9 100644
--- a/resources/views/wap/index/index.blade.php
+++ b/resources/views/wap/index/index.blade.php
@@ -80,4 +80,6 @@ $('#listbu').click(function(){
 });
 });
 </script>
+
+@include('wap.common.footer')
 </body></html>
\ No newline at end of file