Commit 0f67e609 authored by chenchuanwen's avatar chenchuanwen

conflict

parents bf28104b 22284e14
......@@ -54,7 +54,9 @@ class IndexController extends \Our\Controller_Abstract {
public function indexAction() {
// $clientPush=\JPush\ClientPush::getInstance();
// $clientPush->pushAll();
echo 'success';
$mongoDb= new \Mongo\MongoDbModel();
$res= $mongoDb->insert('message_history',array('id'=>1,'name'=>'chenchuanwen'));
echo json_encode($res);
exit;
\Our\Log::getInstance()->write('testLog|||||testLog');
var_dump($_SERVER);exit;
......
......@@ -36,7 +36,7 @@ abstract class Controller_Abstract extends \Yaf\Controller_Abstract {
$data['responseContent']=$returnMessage['responseContent'];
$data['data']=array();
$data['data'] =$this->req[NameConst::data];
if(APP_ENV=='test'){
if(APP_ENV=='test' || APP_ENV=='pre'){
$log = \Our\Log::getInstance();
$log->write(json_encode($data));
}
......
This diff is collapsed.
......@@ -49,6 +49,8 @@ push.clientHost="wss://api.shenbd.com/wss"
push.host="172.16.142.15"
push.port="9503"
push.open=1
push.user.service.id=293
push.user.service.type=7
;
elastic.master.host="172.16.142.15"
elastic.master.port="9200"
......
......@@ -15,5 +15,6 @@ if(APP_ENV=='test' || APP_ENV=='pre' ||APP_ENV=='ccwdevelop' || APP_ENV=='produc
error_reporting(0);
}
}
error_reporting(E_ALL);
$app = new \Yaf\Application(APPLICATION_PATH . "/conf/application.ini", APP_ENV);
$app->bootstrap()->run();
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":"all","notification":{"alert":"Hi, JPush"},"options":{"sendno":1913510038,"apns_production":false}}, times:1
Send POST https://api.jpush.cn/v3/push, body:{"platform":"all","audience":"all","notification":{"alert":"Hi, JPush"},"options":{"sendno":93988000,"apns_production":false}}, times:1
<?php
phpinfo();exit;
echo 444;exit;
<?php
echo 22;exit;
$redis =new Redis();
$redis->connect('127.0.0.1','6379');
$redis->rPush('test',0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment