From 27f68f20c2f30f41f5581f1ce7f667cce734d2b8 Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Mon, 11 Nov 2024 13:25:08 +0800
Subject: [PATCH] add exiftool for docker image

---
 Dockerfile                         | 2 +-
 themes/beauty/views/site/index.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8dfef6e..946f115 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:8.2-fpm-alpine3.20
-RUN apk add autoconf gcc musl-dev make imagemagick-dev rsync nginx zlib-dev libpng-dev freetype-dev libjpeg-turbo-dev libwebp-dev \
+RUN apk add autoconf gcc musl-dev make imagemagick-dev rsync nginx zlib-dev libpng-dev freetype-dev libjpeg-turbo-dev libwebp-dev exiftool \
     && docker-php-ext-install exif \
     && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
     && docker-php-ext-install -j$(nproc) gd \
diff --git a/themes/beauty/views/site/index.php b/themes/beauty/views/site/index.php
index 04b7caf..34c215b 100644
--- a/themes/beauty/views/site/index.php
+++ b/themes/beauty/views/site/index.php
@@ -327,7 +327,7 @@ eof;
 
                 //图片、视频显示文件修改日期
                 if (!empty($file['original_ctime'])) {      //优先使用照片的拍摄日期
-                    $title = '摄于' . date('Y-m-d', $file['original_ctime']);
+                    $title = '摄于' . date('Y-m-d H:i', $file['original_ctime']);
                 }else {
                     $title = Common::getDateFromString($file['filename']);      //根据文件名获取拍摄日期
                     if (empty($title) && !empty($file['fstat']['mtime']) && !empty($file['fstat']['ctime'])) {