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

application/controllers/Index.php

@@ -52,14 +52,9 @@ class IndexController extends \Our\Controller_Abstract  {
     }
 
     public function indexAction() {
-        $browseDAO = \DAO\GoodsBrowseModel::getInstance();
-        $month = date('m');
-        $year  = date('Y');
-        $sort = isset($param['sort']) ? (int)$param['sort'] : 1;
-        $sort == 1 ? $order = ['browsedate','ASC'] : $order = ['browsedate','DESC'];
-        $startTime = mktime(0,0,0,$month-2,1,$year);
-        $endTime = mktime(0,0,-1,$month+1,1,$year);
-        $res=$browseDAO->getDistinctDate(1,$startTime,$endTime,$order);
+        $orderDao = \DAO\Order\OrderModel::getInstance();
+
+        $res=$orderDao->getList(array('buyer_id'=>1),'*',0,10);
         echo json_encode($res);exit;
         //$list = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsBrowserRedisModel::getInstance(),array(&$browseDAO, 'getDistinctDate'),array($memberId,$startTime,$endTime,$order),\Our\ApiConst::twoMinSecond,array($memberId));
 //        $clientPush=\JPush\ClientPush::getInstance();

conf/application.ini

@@ -24,15 +24,23 @@ resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 ;
 ; ; 从库配置
+;resources.database.slave.params.driver   = "pdo_mysql"
+;resources.database.slave.params.hostname = "127.0.0.1"
+;resources.database.slave.params.port     = 3306
+;resources.database.slave.params.database = "qmcs"
+;resources.database.slave.params.username = "qmcsreader"
+;resources.database.slave.params.password = "!@#$%12345werty"
+;resources.database.slave.params.charset  = "UTF8"
+;resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+;
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "127.0.0.1"
+resources.database.slave.params.hostname = "172.16.142.15"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
-resources.database.slave.params.username = "qmcsreader"
+resources.database.slave.params.username = "root"
 resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
-;
 redis.database.params.host = "172.16.142.15"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"

public/test.php

 <?php
-echo 14;exit;
+phpinfo();exit;
 $redis =new Redis();
 $redis->connect('127.0.0.1','6379');
 $redis->rPush('test',0);