t push origin masterMerge branch '3.0'

Author: overtrue

.gitignore

@@ -1,8 +1,6 @@
 # laravel-wechat
 
-> 注意：此版本为 2.x 版本，不兼容 1.x，已经移除外观，与 [overtrue/wechat 2.x](https://github.com/overtrue/wechat) 同步
-
-> 1.x 的配置文件里面的项目为驼峰，2.x 系列已经改为下划线，请参考: [src/config.php](https://github.com/overtrue/laravel-wechat/blob/master/src/config.php)
+> 注意：此版本为 3.x 版本，不兼容 2.x 与 1.x，与 [overtrue/wechat 3.x](https://github.com/overtrue/wechat) 同步
 
 微信 SDK for Laravel 5 / Lumen， 基于 [overtrue/wechat](https://github.com/overtrue/wechat)
 
@@ -15,7 +13,7 @@
 1. 安装包文件
 
   ```shell
-  composer require "overtrue/laravel-wechat:2.1.*"
+  composer require "overtrue/laravel-wechat:~3.0"
   ```
 
 ## 配置
@@ -50,15 +48,29 @@
   $app->register(Overtrue\LaravelWechat\ServiceProvider::class);
   ```
 
-2. 在 ENV 中配置以下选项：
+2. ENV 中支持以下配置：
 
 ```php
-WECHAT_USE_ALIAS=false
-WECHAT_APPID=xxx
-WECHAT_SECRET=xxx
-WECHAT_TOKEN=xxx
-WECHAT_ENCODING_KEY=xxx
+WECHAT_APPID
+WECHAT_SECRET
+WECHAT_TOKEN
+WECHAT_AES_KEY
+
+WECHAT_LOG_LEVEL
+WECHAT_LOG_FILE
+
+WECHAT_OAUTH_SCOPES
+WECHAT_OAUTH_CALLBACK
+
+WECHAT_PAYMENT_MERCHANT_ID
+WECHAT_PAYMENT_KEY
+WECHAT_PAYMENT_CERT_PATH
+WECHAT_PAYMENT_KEY_PATH
+WECHAT_PAYMENT_DEVICE_INFO
+WECHAT_PAYMENT_SUB_APP_ID
+WECHAT_PAYMENT_SUB_MERCHANT_ID
 ```
+
 3. 如果你习惯使用 `config/wechat.php` 来配置的话，请记得在 `bootstrap/app.php` 中19行以后添加：
 
 ```php
@@ -72,26 +84,6 @@ $app->configure('wechat');
 > 1. Laravel 5 默认启用了 CSRF 中间件，因为微信的消息是 POST 过来，所以会触发 CSRF 检查导致无法正确响应消息，所以请去除默认的 CSRF 中间件，改成路由中间件。可以参考我的写法：[overtrue gist:Kernel.php](https://gist.github.com/overtrue/ff6cd3a4e869fbaf6c01#file-kernel-php-L31)
 > 5.1 里的 CSRF 已经带了可忽略部分url的功能，你可以参考：http://laravel.com/docs/master/routing#csrf-protection
 
-所有的Wechat对象都已经放到了容器中，直接从容器中取就好。
-
-别名对应关系如下：
-
-    'wechat.server'    => 'Overtrue\Wechat\Server',
-    'wechat.user'      => 'Overtrue\Wechat\User',
-    'wechat.group'     => 'Overtrue\Wechat\Group',
-    'wechat.auth'      => 'Overtrue\Wechat\Auth',
-    'wechat.menu'      => 'Overtrue\Wechat\Menu',
-    'wechat.menu.item' => 'Overtrue\Wechat\MenuItem',
-    'wechat.js'        => 'Overtrue\Wechat\Js',
-    'wechat.staff'     => 'Overtrue\Wechat\Staff',
-    'wechat.store'     => 'Overtrue\Wechat\Store',
-    'wechat.card'      => 'Overtrue\Wechat\Card',
-    'wechat.qrcode'    => 'Overtrue\Wechat\QRCode',
-    'wechat.url'       => 'Overtrue\Wechat\Url',
-    'wechat.media'     => 'Overtrue\Wechat\Media',
-    'wechat.image'     => 'Overtrue\Wechat\Image',
-    'wechat.notice'     => 'Overtrue\Wechat\Notice',
-    'wechat.media'     => 'Overtrue\Wechat\Media',
 
 下面以接收普通消息为例写一个例子：
 
@@ -110,21 +102,19 @@ Route::any('/wechat', 'WechatController@serve');
 ```php
 <?php namespace App\Http\Controllers;
 
-use Overtrue\Wechat\Server;
 use Log;
 
 class WechatController extends Controller {
 
     /**
      * 处理微信的请求消息
      *
-     * @param Overtrue\Wechat\Server $server
-     *
      * @return string
      */
-    public function serve(Server $server)
+    public function serve()
     {
-        $server->on('message', function($message){
+        $wechat = app('wechat');
+        $wechat->server->setMessageHandler(function($message){
             return "欢迎关注 overtrue！";
         });
 
@@ -133,47 +123,42 @@ class WechatController extends Controller {
 }
 ```
 
-> 注意：不要忘记在头部 `use` 哦，或者你就得用 `\Overtrue\Wechat\Server` 全称咯。:smile:
-
 ### 我们有三种方式获取 SDK 的服务实例
 
 ##### 使用容器的自动注入
 
 ```php
 <?php namespace App\Http\Controllers;
 
-use Overtrue\Wechat\Auth;
+use EasyWeChat\Foundation\Application;
 
 class WechatController extends Controller {
 
-    public function demo(Auth $auth)
+    public function demo(Application $wechat)
     {
-        // $auth 则为容器中 Overtrue\Wechat\Auth 的实例
+        // $wechat 则为容器中 EasyWeChat\Foundation\Application 的实例
     }
 }
 ```
 
-##### 使用别名/类名从容器获取对应实例
+##### 使用外观
 
-上面已经列出了所有可用的别名对应关系，你可以使用别名或者类名获取对应的实例：
+在 `config/app.php` 中 `alias` 部分添加外观别名：
 
 ```php
-  $wechatServer = App::make('wechat.server'); // 服务端
-  $wechatUser = App::make('wechat.user'); // 用户服务
-  或者：
-  $wechatUser = App::make('Overtrue\Wechat\User'); // 用户服务
-  // ... 其它同理
+'EasyWeChat' => Overtrue\LaravelWechat\Facade::class,
 ```
 
-#### 使用外观 `Wechat`
+然后就可以在任何地方使用外观方式调用 SDK 对应的服务了：
 
 ```php
-$wechatServer = Wechat::server();
-$wechatUser = Wechat::user();
-//... 其它同理
+  $wechatServer = EasyWeChat::server(); // 服务端
+  $wechatUser = EasyWeChat::user(); // 用户服务
+  // ... 其它同理
 ```
 
-更多使用请参考：https://github.com/overtrue/wechat/wiki/
+
+更多 SDK 的具体使用请参考：https://easywechat.org
 
 ## License
 

LICENSE

@@ -3,7 +3,7 @@
     "description": "微信 SDK for Laravel",
     "keywords": ["wechat", "weixin","laravel", "sdk"],
     "require": {
-        "overtrue/wechat": "2.1.*"
+        "overtrue/wechat": "~3.0"
     },
     "autoload": {
         "psr-4": {
@@ -12,17 +12,6 @@
     },
 
     "license": "MIT",
-
-    "scripts": {
-        "post-install-cmd": [
-            "php artisan vendor:publish  --provider=Overtrue\\LaravelWechat\\ServiceProvider"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    },
     "minimum-stability" : "dev",
     "authors": [
         {

README.md

@@ -0,0 +1,77 @@
+<?php
+
+namespace Overtrue\LaravelWechat;
+
+use Doctrine\Common\Cache\Cache as CacheInterface;
+use Illuminate\Support\Facades\Cache;
+
+/**
+ * Cache bridge for laravel.
+ */
+class CacheBridge implements CacheInterface 
+{
+    /**
+     * Fetches an entry from the cache.
+     *
+     * @param string $id The id of the cache entry to fetch.
+     *
+     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
+     */
+    public function fetch($id) 
+    {
+        return Cache::get($id);
+    }
+
+    /**
+     * Tests if an entry exists in the cache.
+     *
+     * @param string $id The cache id of the entry to check for.
+     *
+     * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     */
+    public function contains($id)
+    {
+        return Cache::has($id);
+    }
+
+    /**
+     * Puts data into the cache.
+     *
+     * If a cache entry with the given id already exists, its data will be replaced.
+     *
+     * @param string $id       The cache id.
+     * @param mixed  $data     The cache entry/data.
+     * @param int    $lifeTime The lifetime in number of seconds for this cache entry.
+     *                         If zero (the default), the entry never expires (although it may be deleted from the cache
+     *                         to make place for other entries).
+     *
+     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     */
+    public function save($id, $data, $lifeTime = 0)
+    {
+        return Cache::put($id, $data, $lifeTime / 60);
+    }
+
+    /**
+     * Deletes a cache entry.
+     *
+     * @param string $id The cache id.
+     *
+     * @return bool TRUE if the cache entry was successfully deleted, FALSE otherwise.
+     *              Deleting a non-existing entry is considered successful.
+     */
+    public function delete($id)
+    {
+        return Cache::forget($id);
+    }
+
+    /**
+     * Retrieves cached information from the data store.
+     *
+     * @return array|null An associative array with server's statistics if available, NULL otherwise.
+     */
+    public function getStats() 
+    {
+        return null;
+    }
+}

composer.json

@@ -12,7 +12,7 @@ class Facade extends LaravelFacade
      */
     static public function getFacadeAccessor()
     {
-        return "wechat.server";
+        return "wechat";
     }
 
     /**
@@ -25,6 +25,12 @@ static public function getFacadeAccessor()
      */
     static public function __callStatic($name, $args)
     {
-        return self::resolveFacadeInstance("wechat.{$name}");
+        $app = static::getFacadeRoot();
+
+        if (method_exists($app, $name)) {
+            return call_user_func_array([$app, $name], $args);
+        }
+
+        return $app->$name;
     }
 }

src/CacheBridge.php

@@ -3,8 +3,7 @@
 namespace Overtrue\LaravelWechat;
 
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
-use Overtrue\Wechat\Server as WechatServer;
-use Overtrue\Wechat\Alias;
+use EasyWeChat\Foundation\Application;
 
 class ServiceProvider extends LaravelServiceProvider
 {
@@ -15,39 +14,6 @@ class ServiceProvider extends LaravelServiceProvider
      */
     protected $defer = true;
 
-    /**
-     * 补充
-     *
-     * @var array
-     */
-    protected $providesAppends = ['wechat.server', 'Overtrue\\Wechat\\Server'];
-
-    /**
-     * 服务列表
-     *
-     * @var array
-     */
-    protected $services = [
-        'wechat.user'      => 'Overtrue\\Wechat\\User',
-        'wechat.group'     => 'Overtrue\\Wechat\\Group',
-        'wechat.auth'      => 'Overtrue\\Wechat\\Auth',
-        'wechat.menu'      => 'Overtrue\\Wechat\\Menu',
-        'wechat.menu.item' => 'Overtrue\\Wechat\\MenuItem',
-        'wechat.js'        => 'Overtrue\\Wechat\\Js',
-        'wechat.staff'     => 'Overtrue\\Wechat\\Staff',
-        'wechat.store'     => 'Overtrue\\Wechat\\Store',
-        'wechat.card'      => 'Overtrue\\Wechat\\Card',
-        'wechat.qrcode'    => 'Overtrue\\Wechat\\QRCode',
-        'wechat.url'       => 'Overtrue\\Wechat\\Url',
-        'wechat.media'     => 'Overtrue\\Wechat\\Media',
-        'wechat.image'     => 'Overtrue\\Wechat\\Image',
-        'wechat.notice'    => 'Overtrue\\Wechat\\Notice',
-        'wechat.color'     => 'Overtrue\\Wechat\\Color',
-        'wechat.semantic'  => 'Overtrue\\Wechat\\Semantic',
-        'wechat.stats'     => 'Overtrue\\Wechat\\Stats',
-    ];
-
-
     /**
      * Boot the provider.
      *
@@ -73,19 +39,15 @@ public function register()
             __DIR__.'/config.php', 'wechat'
         );
 
-        if (config('wechat.use_alias')) {
-            Alias::register();
-        }
+        $this->app->singleton(['EasyWeChat\\Foundation\\Application' => 'wechat'], function($app){
+            $app = new Application(config('wechat'));
 
-        $this->app->singleton(['Overtrue\\Wechat\\Server' => 'wechat.server'], function($app){
-            return new WechatServer(config('wechat.app_id'), config('wechat.token'), config('wechat.encoding_key'));
-        });
+            if (config('wechat.use_laravel_cache')) {
+                $app->cache = new CacheBridge();
+            }
 
-        foreach ($this->services as $alias => $service) {
-            $this->app->singleton([$service => $alias], function($app) use ($service){
-                return new $service(config('wechat.app_id'), config('wechat.secret'));
-            });
-        }
+            return $app;
+        });
     }
 
     /**
@@ -95,6 +57,6 @@ public function register()
      */
     public function provides()
     {
-        return array_merge(array_keys($this->services), array_values($this->services), $this->providesAppends);
+        return ['wechat', 'EasyWeChat\\Foundation\\Application'];
     }
 }