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

application/models/DAO/FavoritesStore.php

@@ -33,12 +33,16 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         return $this->db->select($field)->from($this->_tableName)->join('han_store',"han_favorites_store.store_id = han_store.store_id",'inner')->join('han_store_score_statistics',"han_favorites_store.store_id = han_store_score_statistics.store_id",'left')->where(['han_favorites_store.member_id'=>$memberId,'fav_type'=>1])->where($where)->page($pageIndex,$pageSize)->order('fav_time','DESC')->fetchAll();
     }
 
-    public function selectList($where,$field = \Our\NameConst::allField){
+    public function selectList($where,$field = \Our\NameConst::allField,$order=array('fav_time'=>'desc')){
         $this->setDb($this->dbName);
         if(is_array($where)){
             $where = $this->db->getSqlWhereByArray($where);
         }
-        return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+        $this->db->select($field)->from($this->_tableName)->where($where);
+        foreach($order as $key=>$val){
+            $this->db->order($key,$val);
+        }
+        return $this->db->fetchAll();
     }
 
     public function getOne($field,$where){

conf/application.ini

@@ -277,7 +277,7 @@ resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "root"
+resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -287,7 +287,7 @@ 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 = "root"
-resources.database.slave.params.password = "root"
+resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"