|
@@ -66,7 +66,7 @@ class Msg
|
|
|
}
|
|
|
|
|
|
# 发送单条模板消息
|
|
|
- public function sendOne($key, $project_id, $touser, $page, $data, $form_id, $emphasis_keyword = '', $state = false)
|
|
|
+ public function sendOne($key, $project_id, $touser, $page, $data, $form_id = false, $emphasis_keyword = '', $state = false)
|
|
|
{
|
|
|
if ($project_id > 0 && $key && $touser && $page && $data) {
|
|
|
$info = Dever::db('applet/msg')->one(array('option_key' => $key, 'option_project_id' => $project_id));
|
|
@@ -109,16 +109,8 @@ class Msg
|
|
|
Dever::setInput('key', $info['key']);
|
|
|
Dever::setInput('project_id', $info['project_id']);
|
|
|
Dever::setInput('page', $info['page']);
|
|
|
- $data = json_decode(base64_decode($info['content']), true);
|
|
|
- if ($data) {
|
|
|
- $send = array();
|
|
|
- foreach ($data as $k => $v) {
|
|
|
- $send[$v['key']]['value'] = $v['value'];
|
|
|
- }
|
|
|
- $send = json_encode($send, JSON_UNESCAPED_UNICODE);
|
|
|
- Dever::setInput('data', $send);
|
|
|
- }
|
|
|
|
|
|
+ $send = $this->getData($info['content']);
|
|
|
$this->sendMul();
|
|
|
}
|
|
|
}
|
|
@@ -126,6 +118,24 @@ class Msg
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ # 解析data
|
|
|
+ public function getData($data = false)
|
|
|
+ {
|
|
|
+ $send = Dever::input('data');
|
|
|
+ if (!$send && $data) {
|
|
|
+ $data = json_decode(base64_decode($data), true);
|
|
|
+ if ($data) {
|
|
|
+ foreach ($data as $k => $v) {
|
|
|
+ $send[$v['key']]['value'] = $v['value'];
|
|
|
+ }
|
|
|
+ $send = json_encode($send, JSON_UNESCAPED_UNICODE);
|
|
|
+ Dever::setInput('data', $send);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return $send;
|
|
|
+ }
|
|
|
+
|
|
|
# 发送多条模板消息 入队
|
|
|
public function sendMul()
|
|
|
{
|