MigrateRepos/pushdeer
1
0
Fork 0
mirror of https://github.com/easychen/pushdeer.git synced 2025-04-30 16:29:51 +08:00
Code Issues Projects Releases Wiki Activity

支持批量key推送，更新文档说明

Browse Source
This commit is contained in:
Easy 2022-02-19 22:50:47 +08:00
parent 9f669714b2
commit d1f1940bd2
3 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -376,7 +376,7 @@ API_BASE=http://127.0.0.1:8800
|参数|说明|备注| |参数|说明|备注|
|-|-|-| |-|-|-|
|pushkey|PushKey| |pushkey|PushKey|多个key用`,`隔开，在线版最多10个，自架版默认最多100个|
|text|推送消息内容| |text|推送消息内容|
|desp|消息内容第二部分，选填| |desp|消息内容第二部分，选填|
|type|格式，选填|文本=text，markdown，图片=image，默认为markdown| |type|格式，选填|文本=text，markdown，图片=image，默认为markdown|

1
api/.env.example
View File

@ -65,3 +65,4 @@ WECHAT_APPID=
WECHAT_APPSECRET= WECHAT_APPSECRET=
MAX_PUSH_EVERY_USER_PER_MINUTE=60 MAX_PUSH_EVERY_USER_PER_MINUTE=60
MAX_PUSH_KEY_PER_TIME=100

30
api/app/Http/Controllers/PushDeerMessageController.php
View File

@ -60,14 +60,19 @@ class PushDeerMessageController extends Controller
$validated['type'] = 'markdown'; $validated['type'] = 'markdown';
} }
// if (strtolower($validated['type'])=='image') {
// $validated['text'] = '[图片]';
// }
$key = PushDeerKey::where('key', $validated['pushkey'])->get()->first();
$result = []; $result = [];
$keys = explode(",", $validated['pushkey']);
// 去掉重复的key
$keys = array_unique($keys);
// 限制key的数量
$keys = array_slice($keys, 0, intval(env('MAX_PUSH_KEY_PER_TIME')));
foreach ($keys as $thekey) {
$key = PushDeerKey::where('key', $thekey)->get()->first();
if ($key) { if ($key) {
$readkey = Str::random(32); $readkey = Str::random(32);
$the_message = []; $the_message = [];
@ -79,6 +84,12 @@ class PushDeerMessageController extends Controller
$the_message['pushkey_name'] = $key->name; $the_message['pushkey_name'] = $key->name;
$pd_message = Message::create($the_message); $pd_message = Message::create($the_message);
// 因为通知是悬浮显示，所以将URL改为文字提示
// 如果需要访问原始内容，使用 $the_message['text']
if (strtolower($validated['type'])=='image') {
$validated['text'] = '[图片]';
}
$sent = false; $sent = false;
// 如果配置MQTT服务 // 如果配置MQTT服务
// if (strtolower(env('MQTT_ON')) == 'true') { // if (strtolower(env('MQTT_ON')) == 'true') {
@ -86,9 +97,9 @@ class PushDeerMessageController extends Controller
// 给 mqtt/send 转发消息 // 给 mqtt/send 转发消息
$result[] = make_post('http://mqtt/send', [ $result[] = make_post('http://mqtt/send', [
'key' => env('MQTT_API_KEY'), 'key' => env('MQTT_API_KEY'),
'content' => $validated['text'], 'content' => $the_message['text'],
'type' => $validated['type'] == 'image' ? 'bg_url' : 'text', 'type' => $validated['type'] == 'image' ? 'bg_url' : 'text',
'topic' => $validated['pushkey'], 'topic' => $thekey,
], 3); ], 3);
} }
@ -107,6 +118,9 @@ class PushDeerMessageController extends Controller
} }
} }
} }
}
return http_result(['result'=>$result]); return http_result(['result'=>$result]);
} }