diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2a815509a..235fad98e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -401,12 +401,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "df2aa0872d2da7d3b37dd76f0816500c15280626" + "reference": "7f20352fb92f249f64f9299cfdb9eda386adca86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/df2aa0872d2da7d3b37dd76f0816500c15280626", - "reference": "df2aa0872d2da7d3b37dd76f0816500c15280626", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7f20352fb92f249f64f9299cfdb9eda386adca86", + "reference": "7f20352fb92f249f64f9299cfdb9eda386adca86", "shasum": "", "mirrors": [ { @@ -426,7 +426,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-11-27T12:45:33+00:00", + "time": "2019-11-28T03:18:19+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/src/service/CaptchaService.php b/vendor/zoujingli/think-library/src/service/CaptchaService.php index 96872b871..c56dd6231 100644 --- a/vendor/zoujingli/think-library/src/service/CaptchaService.php +++ b/vendor/zoujingli/think-library/src/service/CaptchaService.php @@ -146,7 +146,11 @@ class CaptchaService extends Service $_x = $this->width / $this->codelen; for ($i = 0; $i < $this->codelen; $i++) { $this->fontcolor = imagecolorallocate($this->img, mt_rand(0, 156), mt_rand(0, 156), mt_rand(0, 156)); - imagettftext($this->img, $this->fontsize, mt_rand(-30, 30), $_x * $i + mt_rand(1, 5), $this->height / 1.4, $this->fontcolor, $this->font, $this->code[$i]); + if (function_exists('imagettftext')) { + imagettftext($this->img, $this->fontsize, mt_rand(-30, 30), $_x * $i + mt_rand(1, 5), $this->height / 1.4, $this->fontcolor, $this->font, $this->code[$i]); + } else { + imagestring($this->img, 15, $_x * $i + mt_rand(0, 25), mt_rand(15, 20), $this->code[$i], $this->fontcolor); + } } ob_start(); imagepng($this->img); diff --git a/vendor/zoujingli/think-library/src/service/ProcessService.php b/vendor/zoujingli/think-library/src/service/ProcessService.php index e58fbd923..5fa8f5a6e 100644 --- a/vendor/zoujingli/think-library/src/service/ProcessService.php +++ b/vendor/zoujingli/think-library/src/service/ProcessService.php @@ -55,7 +55,7 @@ class ProcessService extends Service if ($this->iswin()) { $this->exec(__DIR__ . "/bin/console.exe {$command}"); } else { - $this->exec("{$command} &"); + $this->exec("{$command} > /dev/null &"); } return $this; }