From 4dd6d804ed258b22d4bda8be06cb757235cd62a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Tue, 14 Dec 2021 15:17:59 +0900 Subject: [PATCH 1/2] KIKI --- backend/.env.example | 2 +- backend/.env.release | 2 +- backend/app/Mail/FathersRegistrationTemporaryMail.php | 2 +- .../views/emails/fathers/registration/temporary.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/.env.example b/backend/.env.example index 340b207b..e0150aa9 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -1,4 +1,4 @@ -APP_NAME=KIKIkan +APP_NAME=KIKI APP_ENV=local APP_KEY= APP_DEBUG=true diff --git a/backend/.env.release b/backend/.env.release index 340b207b..e0150aa9 100644 --- a/backend/.env.release +++ b/backend/.env.release @@ -1,4 +1,4 @@ -APP_NAME=KIKIkan +APP_NAME=KIKI APP_ENV=local APP_KEY= APP_DEBUG=true diff --git a/backend/app/Mail/FathersRegistrationTemporaryMail.php b/backend/app/Mail/FathersRegistrationTemporaryMail.php index 5a12c259..696c81a1 100644 --- a/backend/app/Mail/FathersRegistrationTemporaryMail.php +++ b/backend/app/Mail/FathersRegistrationTemporaryMail.php @@ -16,7 +16,7 @@ class FathersRegistrationTemporaryMail extends Mailable { } public function build () { - return $this->subject('【KIKIkan】会員登録のご案内')->markdown('emails.fathers.registration.temporary', [ + return $this->subject('【KIKI】会員登録のご案内')->markdown('emails.fathers.registration.temporary', [ 'token' => $this->token ]); } diff --git a/backend/resources/views/emails/fathers/registration/temporary.blade.php b/backend/resources/views/emails/fathers/registration/temporary.blade.php index b0e98ede..4331452e 100644 --- a/backend/resources/views/emails/fathers/registration/temporary.blade.php +++ b/backend/resources/views/emails/fathers/registration/temporary.blade.php @@ -1,5 +1,5 @@ @component('mail::message') -# 【KIKIkan】会員登録のご案内 +# 【KIKI】会員登録のご案内 KIKIサービスの会員登録のご案内です。 From 3016695277cd3a9606892e8aa8bafe7730914b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Tue, 14 Dec 2021 15:25:37 +0900 Subject: [PATCH 2/2] =?UTF-8?q?5=20MiB=20=E2=86=92=2010=20MiB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/app/Http/Controllers/Controller.php b/backend/app/Http/Controllers/Controller.php index 55059246..296cc4ae 100644 --- a/backend/app/Http/Controllers/Controller.php +++ b/backend/app/Http/Controllers/Controller.php @@ -43,7 +43,7 @@ class Controller extends BaseController public function imagesize ($value) { try { - return strlen($value) < 5242880; // 5 MiB(メビバイト) / 5.24288 MB(メガバイト) + return strlen($value) < 10485760; // 10 MiB(メビバイト) / 10.48576 MB(メガバイト) } catch (\Throwable $e) { Log::critical($e->getMessage()); return false; @@ -124,7 +124,7 @@ class Controller extends BaseController try { $ok = true; foreach (json_decode($value) as $v) { - if (strlen(base64_decode($v)) > 5242880) { // 5 MiB(メビバイト) / 5.24288 MB(メガバイト) + if (strlen(base64_decode($v)) > 10485760) { // 10 MiB(メビバイト) / 10.48576 MB(メガバイト) $ok = false; } }