bug fix

Author: tangqi1916

config/config.php

@@ -10,6 +10,7 @@
 			'visibility' => 'public',
 		],
 	],
+	'directory'  => 'travel',
 	//图片宽度
 	'width'      => '575',
 	//放大倍数

src/MiniProgramShareImg.php

@@ -18,9 +18,9 @@ public static function init()
 		return self::$conv;
 	}
 
-	public static function generateShareImage($dir, $saveName, $route)
+	public static function generateShareImage($saveName, $route)
 	{
-		if (!$dir || !$saveName || !$route) {
+		if (!$saveName || !$route) {
 			return false;
 		}
 
@@ -31,7 +31,7 @@ public static function generateShareImage($dir, $saveName, $route)
 		];
 
 		$root = config('phantommagick.disks.MiniProgramShare.root');
-		$file = $root . $dir . $saveName;
+		$file = $root . '/' . config('phantommagick.directory') . '/' . $saveName;
 
 		try {
 			$converter = self::init();
@@ -40,7 +40,7 @@ public static function generateShareImage($dir, $saveName, $route)
 
 			self::imagePngSizeAdd($file);
 
-			return Storage::disk('MiniProgramShare')->url($dir . $saveName);
+			return Storage::disk('MiniProgramShare')->url(config('phantommagick.directory') . '/' . $saveName);
 		} catch (\Exception $exception) {
 
 			return false;

tests/MiniProgramShareImgTest.php

@@ -17,9 +17,9 @@ public static function init()
 		return self::$conv;
 	}
 
-	public static function generateShareImage($dir, $saveName, $route)
+	public static function generateShareImage($saveName, $route)
 	{
-		if (!$dir || !$saveName || !$route) {
+		if (!$saveName || !$route) {
 			return false;
 		}
 
@@ -30,7 +30,7 @@ public static function generateShareImage($dir, $saveName, $route)
 		];
 
 		$root = __DIR__ . '/../tests';
-		$file = $root . $dir . $saveName;
+		$file = $root . '/' . config('phantommagick.directory') . '/' . $saveName;
 		$url  = $saveName;
 
 		try {

tests/ShareImgTest.php

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

tests/config/phantommagick.php

@@ -10,8 +10,9 @@
 			'visibility' => 'public',
 		],
 	],
+	'directory'  => 'travel',
 	//图片宽度
-	'width'      => '575px',
+	'width'      => '575',
 	//放大倍数
 	'zoomfactor' => 1.5,
 	//0-100,100质量最高