|
@@ -14,6 +14,9 @@ use App\Models\Manager\Process\StatisticsNotices as StatisticsNoticesModel;
|
|
|
use App\Servers\Email\VerifyCode as EmailVerifyCode;
|
|
use App\Servers\Email\VerifyCode as EmailVerifyCode;
|
|
|
use App\Servers\Sms\VerifyCode as SmsVerifyCode;
|
|
use App\Servers\Sms\VerifyCode as SmsVerifyCode;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\DB;
|
|
|
|
|
+use App\Jobs\Manager\Other\SendEmailJobs;
|
|
|
|
|
+use App\Jobs\Manager\Process\SendAliyunSmsJobs;
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 发送订阅通知
|
|
* 发送订阅通知
|
|
@@ -127,13 +130,15 @@ class SendNoticeJobs implements ShouldQueue
|
|
|
$SubNoticeLogModel->where(['id' => $value['id']])->update(['email_status' => 0]);
|
|
$SubNoticeLogModel->where(['id' => $value['id']])->update(['email_status' => 0]);
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
- $email_content = json_decode($value['email_content'], true);
|
|
|
|
|
- $email_title = $email_content['title'];
|
|
|
|
|
- $email_content = $email_content['content'];
|
|
|
|
|
- $res_msg = $EmailVerifyCode->sendSmtpEmail($email_to, $email_title, $email_content);
|
|
|
|
|
- Log::info('job_send_email', '订阅邮件通知推送队列记录', ['email' => $email_to, 'email_content' => $email_content, 'msg' => $res_msg]);
|
|
|
|
|
- //更新发送状态
|
|
|
|
|
- $SubNoticeLogModel->where(['id' => $value['id']])->update(['email_status' => 0]);
|
|
|
|
|
|
|
+ SendEmailJobs::dispatch(['notice_data_info'=> $value]);
|
|
|
|
|
+ // SendEmailJobs::dispatchSync(['notice_data_info'=> $value]);
|
|
|
|
|
+ // $email_content = json_decode($value['email_content'], true);
|
|
|
|
|
+ // $email_title = $email_content['title'];
|
|
|
|
|
+ // $email_content = $email_content['content'];
|
|
|
|
|
+ // $res_msg = $EmailVerifyCode->sendSmtpEmail($email_to, $email_title, $email_content);
|
|
|
|
|
+ // Log::info('job_send_email', '订阅邮件通知推送队列记录', ['email' => $email_to, 'email_content' => $email_content, 'msg' => $res_msg]);
|
|
|
|
|
+ // //更新发送状态
|
|
|
|
|
+ // $SubNoticeLogModel->where(['id' => $value['id']])->update(['email_status' => 0]);
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
@@ -159,16 +164,18 @@ class SendNoticeJobs implements ShouldQueue
|
|
|
$SubNoticeLogModel->where(['id' => $value['id']])->update(['status' => 0]);
|
|
$SubNoticeLogModel->where(['id' => $value['id']])->update(['status' => 0]);
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
- $sms_content = json_decode($value['mobile_content'], true);
|
|
|
|
|
- $totle_number = $sms_content['totle_number'];
|
|
|
|
|
- $number1 = $sms_content['number1'];
|
|
|
|
|
- $number2 = $sms_content['number2'];
|
|
|
|
|
- $number3 = $sms_content['number3'];
|
|
|
|
|
- $sms_tpl_id = $sms_content['sms_tpl_id'];
|
|
|
|
|
- $res_msg = $SmsVerifyCode->sendContent($mobile, ['totle_number' => $totle_number, 'number1' => $number1, 'number2' => $number2, 'number3' => $number3], $sms_tpl_id);
|
|
|
|
|
- Log::info('job_send_sms', '订阅短信通知推送队列记录', ['email' => $mobile, 'sms_tpl_id' => $sms_tpl_id, 'msg' => $res_msg]);
|
|
|
|
|
- //更新发送状态
|
|
|
|
|
- $SubNoticeLogModel->where(['id' => $value['id']])->update(['sms_status' => 0]);
|
|
|
|
|
|
|
+ SendAliyunSmsJobs::dispatch(['notice_data_info'=> $value]);
|
|
|
|
|
+ // SendAliyunSmsJobs::dispatchSync(['notice_data_info'=> $value]);
|
|
|
|
|
+ // $sms_content = json_decode($value['mobile_content'], true);
|
|
|
|
|
+ // $totle_number = $sms_content['totle_number'];
|
|
|
|
|
+ // $number1 = $sms_content['number1'];
|
|
|
|
|
+ // $number2 = $sms_content['number2'];
|
|
|
|
|
+ // $number3 = $sms_content['number3'];
|
|
|
|
|
+ // $sms_tpl_id = $sms_content['sms_tpl_id'];
|
|
|
|
|
+ // $res_msg = $SmsVerifyCode->sendContent($mobile, ['totle_number' => $totle_number, 'number1' => $number1, 'number2' => $number2, 'number3' => $number3], $sms_tpl_id);
|
|
|
|
|
+ // Log::info('job_send_sms', '订阅短信通知推送队列记录', ['email' => $mobile, 'sms_tpl_id' => $sms_tpl_id, 'msg' => $res_msg]);
|
|
|
|
|
+ // //更新发送状态
|
|
|
|
|
+ // $SubNoticeLogModel->where(['id' => $value['id']])->update(['sms_status' => 0]);
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|