Merge pull request #66 from toplan/dev

优化代码;使用phpsms v1.3.1解决queue为sync是的bug
toplan · Apr 15, 2016 · 581bba7 · 581bba7
2 parents 1278f2b + 76cbc0b
commit 581bba7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ phpsms为laravel-sms提供了全套的短信发送机制，而且phpsms也有自
 在项目根目录下运行如下composer命令:
 ```php
    //安装2.3版本(推荐)
-   composer require 'toplan/laravel-sms:~2.3.0',
+   composer require 'toplan/laravel-sms:~2.3.1',
 
    //安装开发中版本
    composer require 'toplan/laravel-sms:dev-master'

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "toplan/laravel-sms",
     "description": "sms send package for laravel",
     "license": "MIT",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "keywords": ["sms", "laravel sms", "laravel-sms"],
     "authors": [
         {
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "toplan/phpsms": "~1.3.0"
+        "toplan/phpsms": "~1.3.1"
     },
     "autoload": {
         "classmap": [

diff --git a/src/Toplan/LaravelSms/SendReminderSms.php b/src/Toplan/LaravelSms/SendReminderSms.php
@@ -1,25 +1,25 @@
 <?php
 
-namespace App\Jobs;
+namespace Toplan\Sms;
 
+use App\Jobs\Job;
 use Illuminate\Contracts\Bus\SelfHandling;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 use Toplan\PhpSms\Sms;
 
 class SendReminderSms extends Job implements SelfHandling, ShouldQueue
 {
-    use InteractsWithQueue, SerializesModels;
+    use InteractsWithQueue;
 
     protected $sms;
 
     /**
      * Create a new job instance.
      *
-     * @return void
+     * @param Sms $sms
      */
-    public function __construct($sms)
+    public function __construct(Sms $sms)
     {
         $this->sms = $sms;
     }
@@ -31,8 +31,6 @@ public function __construct($sms)
      */
     public function handle()
     {
-        if ($this->sms instanceof Sms) {
-            $this->sms->send();
-        }
+        $this->sms->send();
     }
 }
diff --git a/src/Toplan/LaravelSms/SmsManagerServiceProvider.php b/src/Toplan/LaravelSms/SmsManagerServiceProvider.php
@@ -63,8 +63,8 @@ protected function initPhpSms()
         }
 
         // define how to use queue
-        $queueJob = config('laravel-sms.queueJob', 'App\Jobs\SendReminderSms');
-        PS::queue(false, function ($sms, $data) use ($queueJob) {
+        $queueJob = config('laravel-sms.queueJob', 'Toplan\Sms\SendReminderSms');
+        PS::queue(false, function ($sms) use ($queueJob) {
             if (!class_exists($queueJob)) {
                 throw new LaravelSmsException("Class [$queueJob] does not exists.");
             }

diff --git a/src/config/laravel-sms.php b/src/config/laravel-sms.php
@@ -87,5 +87,5 @@
      * queue job
      * -----------------------------------
      */
-    'queueJob' => 'App\Jobs\SendReminderSms',
+    'queueJob' => 'Toplan\Sms\SendReminderSms',
 ];