From 092fc0586c048c7aa66509dbb02f9b9856de4bea Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Sun, 25 Jun 2023 14:48:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +-- app/Controller/TestController.php | 1 - app/Services/OrderPrescriptionService.php | 1 - composer.json | 3 +- composer.lock | 51 +---------------------- 5 files changed, 5 insertions(+), 57 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2285338..baaf62fcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,9 +49,9 @@ WORKDIR /opt/www COPY . /opt/www -RUN apk add --no-cache $PHPIZE_DEPS \ - && pecl8 install imagick \ - && echo "extension=imagick.so" > /etc/php8/conf.d/imagick.ini +#RUN apk add --no-cache $PHPIZE_DEPS \ +# && pecl8 install imagick \ +# && echo "extension=imagick.so" > /etc/php8/conf.d/imagick.ini RUN composer install --no-dev -o && php bin/hyperf.php diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index ddd6939..0140cf1 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -53,7 +53,6 @@ use Hyperf\Utils\ApplicationContext; use Hyperf\Utils\Coroutine\Concurrent; use Intervention\Image\ImageManager; use Psr\SimpleCache\CacheInterface; -use Spatie\PdfToImage\Pdf; use Swoole\Coroutine; use Swoole\Coroutine\Channel; use Swoole\Coroutine\WaitGroup; diff --git a/app/Services/OrderPrescriptionService.php b/app/Services/OrderPrescriptionService.php index 779a345..dd48625 100644 --- a/app/Services/OrderPrescriptionService.php +++ b/app/Services/OrderPrescriptionService.php @@ -29,7 +29,6 @@ use Extend\Ca\CaOnline; use Extend\Prescription\Prescription; use Hyperf\Contract\LengthAwarePaginatorInterface; use Hyperf\Utils\WaitGroup; -use Intervention\Image\ImageManager; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Swoole\Coroutine\Channel; diff --git a/composer.json b/composer.json index 8435962..f6501b8 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,6 @@ "hyperf/snowflake": "^3.0", "hyperf/validation": "^3.0", "intervention/image": "^2.7", - "spatie/pdf-to-image": "^1.2", "tecnickcom/tcpdf": "^6.6", "w7corp/easywechat": "^6.7" }, @@ -105,4 +104,4 @@ ] } } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index f0f7ae9..9794d00 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b678797d6b653d9891f0a1a1b542650d", + "content-hash": "05e3ba05b453d5d07af51ee1337d0eaf", "packages": [ { "name": "adbario/php-dot-notation", @@ -5285,55 +5285,6 @@ "description": "A polyfill for getallheaders.", "time": "2019-03-08T08:55:37+00:00" }, - { - "name": "spatie/pdf-to-image", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://github.com/spatie/pdf-to-image.git", - "reference": "8deb3d899ecbef7e8e1dad16e3e7b57997582abc" - }, - "dist": { - "type": "zip", - "url": "https://mirrors.huaweicloud.com/repository/php/spatie/pdf-to-image/1.4.0/spatie-pdf-to-image-1.4.0.zip", - "reference": "8deb3d899ecbef7e8e1dad16e3e7b57997582abc", - "shasum": "" - }, - "require": { - "ext-imagick": "*", - "php": ">=5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\PdfToImage\\": "src" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "homepage": "https://spatie.be", - "role": "Developer" - } - ], - "description": "Convert a pdf to an image", - "homepage": "https://github.com/spatie/pdf-to-image", - "keywords": [ - "convert", - "image", - "pdf", - "pdf-to-image", - "spatie" - ], - "time": "2017-06-15T18:15:09+00:00" - }, { "name": "symfony/cache", "version": "v6.0.19",