bug fix

Author: tangqi1916

src/MiniProgramShareImg.php

@@ -18,9 +18,9 @@ public static function init()
 		return self::$conv;
 	}
 
-	public static function generateShareImage($saveName, $route)
+	public static function generateShareImage($route)
 	{
-		if (!$saveName || !$route) {
+		if (!$route) {
 			return false;
 		}
 
@@ -30,15 +30,18 @@ public static function generateShareImage($saveName, $route)
 			'quality'    => config('phantommagick.quality', 100),
 		];
 
-		$root = config('phantommagick.disks.MiniProgramShare.root');
-		$file = $root . '/' . $saveName;
+		$saveName = config('phantommagick.directory') . '/' . md5(uniqid()) . '.png';
+		$root     = config('phantommagick.disks.MiniProgramShare.root');
+		$file     = $root . '/' . $saveName;
 
 		try {
 			$converter = self::init();
 
 			$converter->source($route)->toPng($options)->save($file);
 
-			self::imagePngSizeAdd($file);
+			if (config('phantommagick.compress', true)) {
+				self::imagePngSizeAdd($file);
+			}
 
 			return Storage::disk('MiniProgramShare')->url($saveName);
 		} catch (\Exception $exception) {

src/PhantoMmagickServiceProvider.php

@@ -15,8 +15,8 @@ public function boot()
 
 	public function register()
 	{
-		$config = $this->app['config']->get('filesystems.disks', []);
+		$filesystems = $this->app['config']->get('filesystems.disks', []);
 
-		$this->app['config']->set('filesystems.disks', array_merge(config('phantommagick.disks', []), $config));
+		$this->app['config']->set('filesystems.disks', array_merge(config('phantommagick.disks', []), $filesystems));
 	}
 }

tests/MiniProgramShareImgTest.php

@@ -17,9 +17,9 @@ public static function init()
 		return self::$conv;
 	}
 
-	public static function generateShareImage($saveName, $route)
+	public static function generateShareImage($route)
 	{
-		if (!$saveName || !$route) {
+		if (!$route) {
 			return false;
 		}
 
@@ -29,6 +29,7 @@ public static function generateShareImage($saveName, $route)
 			'quality'    => config('phantommagick.quality', 100),
 		];
 
+		$saveName = config('phantommagick.directory') . '/' . md5(uniqid()) . '.png';;
 		$root = __DIR__ . '/../tests';
 		$file = $root . '/' . $saveName;
 		$url  = $saveName;
@@ -38,7 +39,9 @@ public static function generateShareImage($saveName, $route)
 
 			$converter->source($route)->toPng($options)->save($file);
 
-			self::imagePngSizeAdd($file);
+			if (config('phantommagick.compress', true)) {
+				self::imagePngSizeAdd($file);
+			}
 
 			return $url;
 		} catch (\Exception $exception) {

tests/ShareImgTest.php

@@ -15,10 +15,9 @@ public function TestConfig()
 	/** @test */
 	public function TestGenerateShareImage()
 	{
-		$saveName = config('phantommagick.directory') . '/' . md5(time() . mt_rand(10000, 99999)) . '_share' . '.png';
-		$route    = 'https://m.baidu.com/';
+		$route = 'https://m.baidu.com/';
 
-		MiniProgramShareImgTest::generateShareImage($saveName, $route);
-		$this->assertTrue(file_exists(__DIR__ . '/' . $saveName));
+		$file = MiniProgramShareImgTest::generateShareImage($route);
+		$this->assertTrue(file_exists(__DIR__ . '/' . $file));
 	}
 }