Commit 95a29bbb authored by 王源's avatar 王源
Browse files

调整拼图文件名的组成

parent 128cd85a

src/Tools/Drawer.php

+3 −2
Original line number Original line Diff line number Diff line
@@ -305,9 +305,10 @@ class Drawer 
    /**

    /**

     * 拼图

     * 拼图

     * @param $imgPathList

     * @param $imgPathList

     * @param string $name

     * @return bool|string

     * @return bool|string

     */

     */

    public function mergeImages($imgPathList)

    public function mergeImages($imgPathList, $name = '')

    {

    {

        $maxW = $maxH = 0;

        $maxW = $maxH = 0;

        $filenameList = [];

        $filenameList = [];
@@ -338,7 +339,7 @@ class Drawer 
            // 判断路径是否存在,不存在,则创建

            // 判断路径是否存在,不存在,则创建

            mkdir($savePath, 0777, true);

            mkdir($savePath, 0777, true);

        }

        }

        $imgNewPath = $savePath . '/' . $filename . '.png';

        $imgNewPath = $savePath . '/' . ($name ?: $filename) . '.png';

        if (file_exists($imgNewPath)) {

        if (file_exists($imgNewPath)) {

            return $imgNewPath;

            return $imgNewPath;

        }

        }