优化

Author: tangqi1916

README.md

@@ -79,4 +79,4 @@ composer require ibrand/laravel-miniprogram-poster
 ```
 
 * 生成图片效果如下：<br/>
-![效果图](http://admin.dev.tnf.ibrand.cc/storage/uploads/images/2018_09_13/3A3x1TlJgfFZWfbr58lo5exeBQ3rBCbE9VdTEf6H.jpeg)
+![效果图](http://admin.dev.tnf.ibrand.cc/storage/upload/image/72b60d1d2daa9395b7d502e74a08c138.png)

src/MiniProgramShareImg.php

@@ -42,22 +42,18 @@ public static function generateShareImage($url, $type = 'default')
 		$saveName = date('Ymd') . '/' . $type . '_' . md5(uniqid()) . '.png';
 		$file     = config('ibrand.miniprogram-poster.disks.MiniProgramShare.root') . '/' . $saveName;
 
-		try {
-			$converter = self::init();
+		$converter = self::init();
 
-			$converter->source($url)->toPng($options)->save($file);
+		$converter->source($url)->toPng($options)->save($file);
 
-			if (config('ibrand.miniprogram-poster.compress', true)) {
-				self::imagePngSizeAdd($file);
-			}
-
-			return [
-				'url'  => Storage::disk('MiniProgramShare')->url($saveName),
-				'path' => $saveName,
-			];
-		} catch (\Exception $exception) {
-			return false;
+		if (config('ibrand.miniprogram-poster.compress', true)) {
+			self::imagePngSizeAdd($file);
 		}
+
+		return [
+			'url'  => Storage::disk('MiniProgramShare')->url($saveName),
+			'path' => $saveName,
+		];
 	}
 
 	public static function imagePngSizeAdd($file)

src/PhantoMmagickServiceProvider.php

@@ -15,17 +15,21 @@
 
 class PhantoMmagickServiceProvider extends ServiceProvider
 {
-    public function boot()
-    {
-        if ($this->app->runningInConsole()) {
-            $this->publishes([__DIR__.'/../config/config.php' => config_path('ibrand/miniprogram-poster.php')], 'config');
-        }
-    }
+	public function boot()
+	{
+		if ($this->app->runningInConsole()) {
+			$this->publishes([__DIR__ . '/../config/config.php' => config_path('ibrand/miniprogram-poster.php')], 'config');
+		}
+	}
 
-    public function register()
-    {
-        $filesystems = $this->app['config']->get('filesystems.disks', []);
+	public function register()
+	{
+		$this->mergeConfigFrom(
+			__DIR__ . '/../config/config.php', 'ibrand.miniprogram-poster'
+		);
 
-        $this->app['config']->set('filesystems.disks', array_merge(config('ibrand.miniprogram-poster.disks', []), $filesystems));
-    }
+		$filesystems = $this->app['config']->get('filesystems.disks', []);
+
+		$this->app['config']->set('filesystems.disks', array_merge(config('ibrand.miniprogram-poster.disks'), $filesystems));
+	}
 }

tests/ShareImgTest.php

@@ -18,15 +18,13 @@ public function TestConfig()
 	/** @test */
 	public function TestGenerateShareImage()
 	{
-		$url    = 'https://m.baidu.com/';
-		$result = MiniProgramShareImg::generateShareImage($url, 'travel');
+		config(['ibrand.miniprogram-poster.width' => '1300px']);
+
+		$url    = 'https://www.ibrand.cc/';
+		$result = MiniProgramShareImg::generateShareImage($url, 'ibrand');
 		$this->assertTrue(Storage::disk('MiniProgramShare')->exists($result['path']));
 
 		$result = MiniProgramShareImg::generateShareImage('');
 		$this->assertFalse($result);
-
-		$url    = 'www.xxxx.com/';
-		$result = MiniProgramShareImg::generateShareImage($url);
-		$this->assertFalse($result);
 	}
 }