发信分页 解决大站发公告超时问题

Anankke_dev
围墙 8 years ago
parent 3511611fca
commit 28267d6899
No known key found for this signature in database
GPG Key ID: DAD249658B50F54C

@ -30,43 +30,50 @@ class AnnController extends AdminController
public function add($request, $response, $args)
{
$ann = new Ann();
$ann->date = date("Y-m-d H:i:s");
$ann->content = $request->getParam('content');
$ann->markdown = $request->getParam('markdown');
$issend = $request->getParam('issend');
$vip = $request->getParam('vip');
$users = User::all();
if (!$ann->save()) {
$rs['ret'] = 0;
$rs['msg'] = "添加失败";
return $response->getBody()->write(json_encode($rs));
$beginSend = $request->getParam('page') * Config::get('sendPageLimit');
$users = User::where('class', ">=", $vip)->skip($beginSend)->limit(Config::get('sendPageLimit'))->get();
if($request->getParam('page') == 1){
$ann = new Ann();
$ann->date = date("Y-m-d H:i:s");
$ann->content = $request->getParam('content');
$ann->markdown = $request->getParam('markdown');
if (!$ann->save()) {
$rs['ret'] = 0;
$rs['msg'] = "添加失败";
return $response->getBody()->write(json_encode($rs));
}
}
if ($issend == 1){
foreach($users as $user){
if ($user->class >= $vip){
$subject = Config::get('appName')."-公告";
$to = $user->email;
if (!filter_var($to, FILTER_VALIDATE_EMAIL)) {
continue;
}
$text = $ann->content;
try {
Mail::send($to, $subject, 'news/warn.tpl', [
"user" => $user,"text" => $text
], [
]);
} catch (\Exception $e) {
continue;
}
$subject = Config::get('appName')."-公告";
$to = $user->email;
if (!filter_var($to, FILTER_VALIDATE_EMAIL)) {
continue;
}
$text = $ann->content;
try {
Mail::send($to, $subject, 'news/warn.tpl', [
"user" => $user,"text" => $text
], [
]);
} catch (\Exception $e) {
continue;
}
}
}
Telegram::SendMarkdown("新公告:".PHP_EOL.$request->getParam('markdown'));
$rs['ret'] = 1;
$rs['msg'] = "公告添加成功,邮件发送成功";
return $response->getBody()->write(json_encode($rs));
if(count($users) == Config::get('sendPageLimit')){
$rs['ret'] = 2;
$rs['msg'] = $request->getParam('page') + 1;
return $response->getBody()->write(json_encode($rs));
}else{
Telegram::SendMarkdown("新公告:".PHP_EOL.$request->getParam('markdown'));
$rs['ret'] = 1;
$rs['msg'] = "公告添加成功,邮件发送成功";
return $response->getBody()->write(json_encode($rs));
}
}
public function edit($request, $response, $args)

@ -32,7 +32,7 @@ $System_Config['db_password'] = 'sspanel'; //用户名对应的密码
//邮件设置--------------------------------------------------------------------------------------------
$System_Config['mailDriver'] = 'mailgun'; // mailgun or smtp or sendgrid 选择发送邮件的方式
$System_Config['sendPageLimit']= 50; //发信分页 解决大站发公告超时问题
# mailgun
$System_Config['mailgun_key'] = '';
$System_Config['mailgun_domain'] = '';
@ -157,7 +157,7 @@ $System_Config['number_viplevel'] = '1'; //节点自动化显示,输入要显
//支付系统设置----------------------------------------------------------------------------------------
#取值 none | codepay | doiampay | trimepay | f2fpay | yftpay | chenAlipay | paymentwall | spay | f2fpay_codepay
#取值 none | codepay | doiampay | trimepay | f2fpay | yftpay | chenAlipay | paymentwall | spay | f2fpay_codepay
$System_Config['payment_system']='none';
#codepay码支付

@ -18,7 +18,7 @@
<div class="container">
<div class="col-lg-12 col-md-12">
<section class="content-inner margin-top-no">
<div class="card">
<div class="card-main">
<div class="card-inner">
@ -29,33 +29,34 @@
<textarea style="display:none;" id="content"></textarea>
</div>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-main">
<div class="card-inner">
<div class="form-group">
<div class="row">
<div class="col-md-10 col-md-push-1">
<div class="form-group form-group-label">
<label class="floating-label" for="vip">VIP等级(发送给高于这个等级的用户 0为不分级)</label>
<input class="form-control maxwidth-edit" id="vip" type="text" name="vip">
<div class="checkbox switch">
<label for="issend">
<input class="access-hide" id="issend" type="checkbox" name="issend"><span class="switch-toggle"></span>是否发送邮件
</label>
</div>
</div>
<button id="submit" type="submit" class="btn btn-block btn-brand waves-attach waves-light">添加</button>
</div>
</div>
@ -63,20 +64,20 @@
</div>
</div>
</div>
{include file='dialog.tpl'}
</div>
</div>
</main>
@ -88,8 +89,8 @@
<script src="https://cdn.jsdelivr.net/npm/editor.md@1.5.0/editormd.min.js"></script>
<script>
$(document).ready(function () {
function submit() {
function submit(page = -1) {
if(document.getElementById('issend').checked)
{
var issend=1;
@ -98,23 +99,30 @@
{
var issend=0;
}
if(page == -1){
sedPage = 1;
}else {
sedPage = page;
}
$.ajax({
type: "POST",
url: "/admin/announcement",
dataType: "json",
data: {
content: editor.getHTML(),
markdown: editor.getMarkdown(),
markdown: editor.getMarkdown(),
vip: $("#vip").val(),
issend: issend
issend: issend,
page:sedPage
},
success: function (data) {
if (data.ret) {
if (data.ret == 1) {
$("#result").modal();
$("#msg").html(data.msg);
window.setTimeout("location.href=top.document.referrer", {$config['jump_delay']});
} else {
} else if (data.ret == 2){
submit(data.msg);
}else {
$("#result").modal();
$("#msg").html(data.msg);
}
@ -126,12 +134,12 @@
}
});
}
$("#submit").click(function () {
submit();
});
});
$(function() {
editor = editormd("editormd", {
path : "https://cdn.jsdelivr.net/npm/editor.md@1.5.0/lib/", // Autoload modules mode, codemirror, marked... dependents libs path
@ -147,4 +155,4 @@
});
*/
});
</script>
</script>

Loading…
Cancel
Save