From 4399db26daf1152ab05b2f60402b57cc7afae471 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, 30 Nov 2021 16:36:18 +0900 Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E3=81=AE=E4=BB=AE=E7=99=BB=E9=8C=B2?= =?UTF-8?q?=E3=81=AE=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=82=92=E7=99=BB=E9=8C=B2=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=81=A8=E3=80=81=E6=A8=AA=E5=90=91=E3=81=8D=E3=81=AB=E5=8F=8D?= =?UTF-8?q?=E8=BB=A2=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/Http/Controllers/Api/ChildrenController.php | 2 ++ backend/app/Http/Controllers/Api/FathersController.php | 2 ++ backend/app/Http/Controllers/Api/MeetingImagesController.php | 1 + backend/app/Http/Controllers/Api/MeetingsController.php | 1 + infra/php/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/app/Http/Controllers/Api/ChildrenController.php b/backend/app/Http/Controllers/Api/ChildrenController.php index 64e2c098..0c9a6730 100644 --- a/backend/app/Http/Controllers/Api/ChildrenController.php +++ b/backend/app/Http/Controllers/Api/ChildrenController.php @@ -162,6 +162,7 @@ class ChildrenController extends Controller { $quality = 1; $img = Image::make('/work/storage/app/private/'.$filename)->encode('jpg', $quality); + $img->orientate(); $img->save('/work/storage/app/private/'.$filename); } @@ -421,6 +422,7 @@ class ChildrenController extends Controller { $quality = 1; $img = Image::make('/work/storage/app/private/'.$filename)->encode('jpg', $quality); + $img->orientate(); $img->save('/work/storage/app/private/'.$filename); $child = Child::find((int)$child_id); diff --git a/backend/app/Http/Controllers/Api/FathersController.php b/backend/app/Http/Controllers/Api/FathersController.php index b1954188..8696948c 100644 --- a/backend/app/Http/Controllers/Api/FathersController.php +++ b/backend/app/Http/Controllers/Api/FathersController.php @@ -183,6 +183,7 @@ class FathersController extends Controller { $quality = 1; $img = Image::make('/work/storage/app/private/'.$filename)->encode('jpg', $quality); + $img->orientate(); $img->save('/work/storage/app/private/'.$filename); } @@ -356,6 +357,7 @@ class FathersController extends Controller { $quality = 1; $img = Image::make('/work/storage/app/private/'.$filename)->encode('jpg', $quality); + $img->orientate(); $img->save('/work/storage/app/private/'.$filename); $father = Father::find((int)$father_id); diff --git a/backend/app/Http/Controllers/Api/MeetingImagesController.php b/backend/app/Http/Controllers/Api/MeetingImagesController.php index 086bd67e..150f72cf 100644 --- a/backend/app/Http/Controllers/Api/MeetingImagesController.php +++ b/backend/app/Http/Controllers/Api/MeetingImagesController.php @@ -54,6 +54,7 @@ class MeetingImagesController extends Controller { Storage::disk('private')->put($filename, $image); $quality = 1; $imag = Image::make('/work/storage/app/private/'.$filename)->encode('jpg', $quality); + $img->orientate(); $imag->save('/work/storage/app/private/'.$filename); $insert = [ diff --git a/backend/app/Http/Controllers/Api/MeetingsController.php b/backend/app/Http/Controllers/Api/MeetingsController.php index ca66e9a2..7fe06d80 100644 --- a/backend/app/Http/Controllers/Api/MeetingsController.php +++ b/backend/app/Http/Controllers/Api/MeetingsController.php @@ -123,6 +123,7 @@ class MeetingsController extends Controller { Storage::disk('private')->put($fname, $image); $quality = 1; $imag = Image::make('/work/storage/app/private/'.$fname)->encode('jpg', $quality); + $img->orientate(); $imag->save('/work/storage/app/private/'.$fname); $imgname = '/files/'.$fname; diff --git a/infra/php/Dockerfile b/infra/php/Dockerfile index e3556c9c..7bdcafa9 100644 --- a/infra/php/Dockerfile +++ b/infra/php/Dockerfile @@ -28,7 +28,7 @@ RUN apt-get update && \ rm -rf *.deb && \ rm -rf /var/lib/apt/lists/* && \ docker-php-ext-configure gd --with-jpeg && \ - docker-php-ext-install intl pdo_mysql zip bcmath gd + docker-php-ext-install -j$(nproc) intl pdo_mysql zip bcmath gd exif COPY ./php.ini /usr/local/etc/php/php.ini