Browse Source

队列发送

bianjunhui 1 year ago
parent
commit
cfe18b0c08

+ 1 - 1
application/common/model/Assms.php

@@ -18,7 +18,7 @@ class Assms Extends Model
             ->setUsername($accessKeyId)
             ->setPassword($accessKeySecret);
 
-        $apiInstance = new \ClickSend\Api\SMSApi(new GuzzleHttp\Client(),$config);
+        $apiInstance = new \ClickSend\Api\SMSApi(new \GuzzleHttp\Client(),$config);
         $msg = new \ClickSend\Model\SmsMessage();
         $msg->setBody($template_body);
         $msg->setTo($phone);

+ 9 - 17
application/job/Sendsms.php

@@ -15,25 +15,17 @@ class Sendsms
     {
         $send =new Assms();
         $result = $send->sendSms($data);
-        if (isset($result['msg'])&&!empty($result['msg'])) {
-            $isJobDone = true;
+        $new=array();
+        if ($result) {
+            $new['bizId']= $result['message_id'];
+            $new['requestId']='clicksend';
+            $new['status']=3;
         }else{
-            $isJobDone = false;
+            $new['status']=4;
         }
         $new['uptime']=time();
-        $new['status']=3;
-        if ($isJobDone) {
-            //如果任务执行成功, 删除任务
-            $log_id =$data['log_id'];
-            Db::name('sms_log')->where($log_id)->update($new);
-            $job->delete(); // 删除任务
-        }else{
-            if ($job->attempts() > 3) {
-                $job->delete(); // 删除任务
-            }else{
-                //如果任务执行失败, 重发 100秒后在执行
-                $job->release(100);
-            }
-        }
+        $log_id =$data['log_id'];
+        Db::name('sms_log')->where($log_id)->update($new);
+        $job->delete(); // 删除任务
     }
 }

+ 1 - 1
public/assets/js/backend/sms/log.js

@@ -36,7 +36,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'quote_id', title: __('购物车ID')},
                         {field: 'addtime', title: __('添加时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'sendtime', title: __('发送时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('待发送'),"2":__('发送中'),"3":__('已发送'),"5":__('不发送')}, formatter: Table.api.formatter.status},
+                        {field: 'status', title: __('Status'), searchList: {"1":__('待发送'),"2":__('发送中'),"3":__('已发送'),"4":__('发送失败'),"5":__('不发送')}, formatter: Table.api.formatter.status},
 
 
                       //  {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}