From f318fccada792ba70b2d8ffcde6d805c78804028 Mon Sep 17 00:00:00 2001 From: koogua Date: Mon, 26 Oct 2020 20:09:31 +0800 Subject: [PATCH] =?UTF-8?q?!9=20=E4=BF=AE=E6=AD=A3=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=8A=A5=E9=94=99=20*=201.=E4=BF=AE=E6=AD=A3=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E7=AE=A1=E7=90=86=E5=B8=90=E5=8F=B7=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20*=20=E7=BA=A0=E6=AD=A3=E8=BF=81=E7=A7=BB=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=92=8C=E6=97=B6=E9=97=B4=E4=BB=A3=E7=A0=81=E4=B8=AD?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E4=B8=80=E8=87=B4=20*=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7=20*=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BB=8A=E6=97=A5=E7=BB=9F=E8=AE=A1,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=EF=BC=8C=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E6=A0=B7=E5=BC=8F=20*=20Merge=20bra?= =?UTF-8?q?nch=20'koogua/I1XFCF'=20of=20https://gitee.com/koogua/course-te?= =?UTF-8?q?ncen=E2=80=A6=20*=20=E5=89=8D=E5=8F=B0=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B5=84=E6=96=99=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=20*=20!2?= =?UTF-8?q?=20=E5=90=8E=E5=8F=B0=E8=BF=90=E8=90=A5=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=90=88=E5=B9=B6=20*=20=E5=90=8E=E5=8F=B0=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B5=84=E6=96=99=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=20*=20Me?= =?UTF-8?q?rge=20branch=20'master'=20into=20develop=20*=20Merge=20branch?= =?UTF-8?q?=20'master'=20of=20https://github.com/xiaochong0302/course-tenc?= =?UTF-8?q?ent-cloud=20*=201.=E5=A2=9E=E5=8A=A0changelog.md=20*=201.?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=83=A8=E5=88=86=E8=B7=AF=E7=94=B1=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=20*=20Merge=20pull=20request=20#2=20from=20xiaochong0?= =?UTF-8?q?302/dependabot/composer/symfony/h=E2=80=A6=20*=20Bump=20symfony?= =?UTF-8?q?/http-foundation=20from=204.3.4=20to=205.1.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Services/AuthMenu.php | 2 +- db/migrations/20200827113559_insert_user_data.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Admin/Services/AuthMenu.php b/app/Http/Admin/Services/AuthMenu.php index 8abcfdc1..1d69cd21 100644 --- a/app/Http/Admin/Services/AuthMenu.php +++ b/app/Http/Admin/Services/AuthMenu.php @@ -77,7 +77,7 @@ class AuthMenu extends Component foreach ($routeIdMapping as $key => $value) { $ids = explode('-', $value); - if (in_array($key, $this->authInfo['routes'])) { + if (is_array($this->authInfo['routes']) && in_array($key, $this->authInfo['routes'])) { $owned1stLevelIds[] = $ids[0]; $owned2ndLevelIds[] = $ids[0] . '-' . $ids[1]; $owned3rdLevelIds[] = $value; diff --git a/db/migrations/20200827113559_insert_user_data.php b/db/migrations/20200827113559_insert_user_data.php index 7cae238a..a11ad937 100644 --- a/db/migrations/20200827113559_insert_user_data.php +++ b/db/migrations/20200827113559_insert_user_data.php @@ -14,7 +14,7 @@ final class InsertUserData extends AbstractMigration $account = [ 'id' => 10000, 'email' => '10000@163.com', - 'password' => '772b6a120699280eb2cce32ec706656a', + 'password' => '1a1e4568f1a3740b8853a8a16e29bc87', 'salt' => 'MbZWxN3L', 'create_time' => $now, ];