|
@@ -59,12 +59,11 @@ class Push
|
|
$send[] = \XingeApp::IOSENV_DEV;
|
|
$send[] = \XingeApp::IOSENV_DEV;
|
|
}
|
|
}
|
|
|
|
|
|
- $result[$source_type] = call_user_func_array(array($push, $method), $send);
|
|
|
|
|
|
+ $result[$source_type]['send'] = $send;
|
|
|
|
+ $result[$source_type]['message'] = array($name, $content, $param);
|
|
|
|
+ $result[$source_type]['result'] = call_user_func_array(array($push, $method), $send);
|
|
|
|
|
|
- $log['result'] = $result;
|
|
|
|
- $log['send'] = $send;
|
|
|
|
- $log['message'] = array($name, $content, $param);
|
|
|
|
- $log = Dever::json_encode($log);
|
|
|
|
|
|
+ $log = Dever::json_encode($result[$source_type]);
|
|
Dever::log($log, 'message_app_push');
|
|
Dever::log($log, 'message_app_push');
|
|
|
|
|
|
return $result;
|
|
return $result;
|
|
@@ -112,7 +111,7 @@ class Push
|
|
{
|
|
{
|
|
$result = array();
|
|
$result = array();
|
|
$info = Dever::db('passport/app')->one(array('uid' => $account));
|
|
$info = Dever::db('passport/app')->one(array('uid' => $account));
|
|
- //$info['source_type'] = 'ios';
|
|
|
|
|
|
+ $info['source_type'] = 'ios';
|
|
if ($info && $info['source_type']) {
|
|
if ($info && $info['source_type']) {
|
|
$result = $this->sendAction($info['source_type'], 2, $this->prefix . $account, $name, $content, $param);
|
|
$result = $this->sendAction($info['source_type'], 2, $this->prefix . $account, $name, $content, $param);
|
|
}
|
|
}
|