Merge branch '2.x'

# Conflicts:
#	README.md

Author: chenbidepro

README.md

@@ -1,33 +1,30 @@
 # Laravel 小程序图文海报生成包
 
-微信小程序中生成朋友圈分享图文海报的一种解决方案
+微信小程序中生成朋友圈分享图文海报一种可以实际使用的解决方案
 
 [![Build Status](https://travis-ci.org/ibrandcc/laravel-miniprogram-poster.svg?branch=master)](https://travis-ci.org/ibrandcc/laravel-miniprogram-poster)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ibrandcc/laravel-miniprogram-poster/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ibrandcc/laravel-miniprogram-poster/?branch=master)
 [![Code Coverage](https://scrutinizer-ci.com/g/ibrandcc/laravel-miniprogram-poster/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/ibrandcc/laravel-miniprogram-poster/?branch=master)
 [![Build Status](https://scrutinizer-ci.com/g/ibrandcc/laravel-miniprogram-poster/badges/build.png?b=master)](https://scrutinizer-ci.com/g/ibrandcc/laravel-miniprogram-poster/build-status/master)
 
-## Featrue
+## 特性
 
-1. 基于html可实现复杂的文字，图片，阴影效果。 
+1. 基于 html 可实现复杂的文字，图片，阴影效果。 
 2. 清晰度和文件大小合理
 3. 使用简单、即插即用
-
-## TODO：
-
-1. 存储 Model 对象和图片对应关系，避免重复生成图片。
+4. 存储 Model 对象和图片对应关系，避免重复生成图片。
 
 ## 体验
 
 扫码进入商品详情页分享生成图文体验
 
 ![iBrand开源体验店](https://iyoyo.oss-cn-hangzhou.aliyuncs.com/post/miniprogramcode/1.jpg)
 
-### 安装
+## 安装
 ```
-composer require ibrand/laravel-miniprogram-poster 
+composer require ibrand/laravel-miniprogram-poster:~2.0 -vvv
 ```
-- 低于 Laravel5.5 版本，`config/app.php` 文件中 'providers' 添加`iBrand\Poster\PhantoMmagickServiceProvider::class`
+- 低于 Laravel5.5 版本，`config/app.php` 文件中 `providers` 添加`iBrand\Poster\PhantoMmagickServiceProvider::class`
 
 - 图片保存在  `storage/app/public` 下所以需要执行  `php artisan storage:link`
 
@@ -37,41 +34,82 @@ composer require ibrand/laravel-miniprogram-poster
 
 ``` 
     return [
-    	//图片存储位置
-    	'disks'      => [
-    		'MiniProgramShare' => [
-    			'driver'     => 'local',
-    			'root'       => storage_path('app/public/share'),
-    			'url'        => env('APP_URL') . '/storage/share',
-    			'visibility' => 'public',
-    		],
-    	],
-    	//图片宽度
-    	'width'      => '575px',
-    	//放大倍数
-    	'zoomfactor' => 1.5,
-    	//0-100,100质量最高
-    	'quality'    => 100,
-    	//是否压缩图片
-    	'compress'   => true,
-    ];
+    //图片存储位置
+    'disks'      => [
+        'MiniProgramShare' => [
+            'driver'     => 'local',
+            'root'       => storage_path('app/public/share'),
+            'url'        => env('APP_URL') . '/storage/share',
+            'visibility' => 'public',
+        ],
+    ],
+    //图片宽度
+    'width'      => '575px',
+    //放大倍数
+    'zoomfactor' => 1.5,
+    //1-9,9质量最高
+    'quality'    => 9,
+    //是否压缩图片
+    'compress'   => true,
+    //是否删除废弃图片文件
+    'delete'=>true,
+   ];
 ```
 
-### 使用
+## 使用
+
+### 定义路由和视图
+
+```php
+Router::get('share/goods','ShareController@goods')->name('share.goods');
+
+public function goods()
+{
+	//你的业务逻辑代码，获取到相关数据
+    return view('share.goods',compact('data'));
+}
 ```
-use iBrand\Miniprogram\Poster\MiniProgramShareImg;
-    
-$url = 'https://www.ibrand.cc/';
+
+这个步骤通过 Laravel 路由视图来实现海报样式展示
+
+###  生成图片
+
+生成图片，不关联模型。
+
+```php
+$url = route('share.goods');
 $result = MiniProgramShareImg::generateShareImage($url);
+```
+
+### 关联模型
 
+执行 命令生成 `posters`表
 ```
-返回结果：
+php artisan vendor:publish
+php artisan migrate
+```
+
+生成图片并关联模型
+```php
+$goods = Goods::find(1);
+$result = MiniProgramShareImg::run($goods, $url);
+```
+生成图片、关联模型并且重新生成图片
+```php
+$goods = Goods::find(1);
+$result = MiniProgramShareImg::run($goods, $url,true);
+```
+
+
+### 返回结果示例
 ```
     [
         'url'  => 'http://xxx.png',   图片访问url
         'path' => 'path/to/image', 图片文件路径
     ]
 ```
+
+
 ### 字体安装
 
 如果需要实现复杂的字体效果，需要安装字体，比如在 centos 上就没有微软雅黑的字体，所以如果生成的图片有指定的特殊字体，需要在服务器上进行安装。
@@ -95,6 +133,10 @@ mkfontdir
 fc-cache -fv
 ```
 
-### Resource
+## Resource
 
 项目基于[PhantomMagick](https://github.com/anam-hossain/phantommagick)
+
+## 贡献源码
+
+如果你发现任何错误或者问题，请[提交ISSUE](https://github.com/ibrandcc/laravel-miniprogram-poster/issues)

config/config.php

@@ -23,8 +23,10 @@
 	'width'      => '575px',
 	//放大倍数
 	'zoomfactor' => 1.5,
-	//0-100,100质量最高
-	'quality'    => 100,
+	//1-9,9质量最高
+	'quality'    => 9,
 	//是否压缩图片
 	'compress'   => true,
+    //是否删除废弃图片文件
+    'delete'=>true,
 ];

migrations/create_poster_tables.php.stub

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePosterTables extends Migration
+{
+    public function up()
+    {
+        if (!Schema::hasTable('posters')) {
+            Schema::create('posters', function (Blueprint $table) {
+                $table->increments('id');
+                $table->text('content')->nullable();
+                $table->integer('posterable_id')->unsigned();
+                $table->string('posterable_type');
+                $table->timestamps();
+                $table->index(['posterable_id', 'posterable_type']);
+            });
+        }
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('posters');
+    }
+}

src/HasPoster.php

@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of ibrand/laravel-miniprogram-poster.
+ *
+ * (c) iBrand <https://www.ibrand.cc>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace iBrand\Miniprogram\Poster;
+
+trait HasPoster
+{
+    public function posters()
+    {
+        return $this->morphMany(Poster::class, 'posterable');
+    }
+}