Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/Business/Goods/GoodsCommonService.php

@@ -24,7 +24,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyCommonId);
         }
         $commonGoodsInstance = \DAO\GoodsCommonModel::getInstance();
-        $commonInfo = $this->getOneByIdCache($goodsCommonId);
+        $commonInfo = $commonGoodsInstance->getOneByIdCache($goodsCommonId);
         $saleNum = $commonGoodsInstance->getGoodsSaleNumFromCache($goodsCommonId);
         $commonInfo['sale_num'] = $saleNum;
         if(!$commonInfo){

conf/application.ini

@@ -57,7 +57,7 @@ elastic.master.host="172.16.142.15"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 
-
+password.key='~!@#$`1234qwertasdfgzxcvb';
 //生产环境
 [product : common]
 ; 数据库配置
@@ -103,7 +103,7 @@ push.user.service.type=7
 elastic.master.host="127.0.0.1"
 elastic.master.port="9200"
 elastic.master.scheme="http";
-
+password.key='~!@#$`1234qwertasdfgzxcvb';
 
 ; 生 产环境配置
 [pre : common]

scripts/crontab/push/news_server.php

@@ -94,7 +94,7 @@ $serv->on('Message', function($server, $frame) use($conf){
                     $sendMessage['message']['href']=isset($rev_data['messageHref'])?$rev_data['messageHref']:'';
                     $sendMessage['message']['price']=isset($rev_data['messagePrice'])?$rev_data['messagePrice']:'';
                     $sendMessage['message']['thumb']=isset($rev_data['messageThumb'])?$rev_data['messageThumb']:'';
-                    $sendMessage['message']['gmtCreate']= TIMESTAMP;
+                    $sendMessage['message']['gmtCreate']= time();
                     $sendMessage['fromId']=$memberId;
                     $sendMessage['fromUserId']=  $rev_data['fromUserId'];
                     $sendMessage['fromUserName']= $rev_data['fromUserName'];