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

application/models/Business/Message/MessageService.php

@@ -157,8 +157,7 @@ class MessageServiceModel extends \Business\AbstractModel
 
         if ($type == ApiConst::memberMessageType || $type == ApiConst::serviceMessageType) {
             $member = \DAO\MemberModel::getInstance();
-            $memerAvatar = $member->getInfo($userid, 'member_avatar');
-            $avatar = $member->getMemberAvatarUrl($userid, $memerAvatar);
+            $avatar=$member->getMemberAvatar($userid);
         }
         return $avatar;
     }

application/models/DAO/Member.php

@@ -8,6 +8,7 @@ use Our\Common;
 use Our\ImageConst;
 use Our\NameConst;
 use Our\ApiConst;
+use Our\PathConst;
 use Our\Validate;
 
 
@@ -48,6 +49,20 @@ class MemberModel extends \DAO\AbstractModel
         return \Our\Common::getStaticFile($filename, \Our\ImageConst::memberAvatar);
     }
 
+    public function getMemberAvatar($memberId){
+        $basePath=\Bootstrap::getUrlIniConfig('source');
+        $memberPath=ImageConst::memberAvatar;
+        $fileName=Common::format(ImageConst::memberAvatarPrefix."{0}".'.jpg',$memberId);
+        $file=$basePath.$memberPath.$fileName;
+        if(file_exists($file)){
+            $avatar=\Our\Common::getStaticFile($fileName, \Our\ImageConst::memberAvatar);
+        }else{
+            $memerAvatar = $this->getInfo($memberId, 'member_avatar');
+            $avatar = $this->getMemberAvatarUrl($memberId, $memerAvatar);
+        }
+        return $avatar;
+    }
+
     //原生方法
     public function query()
     {

application/models/DAO/StoreGoodsClassGoods.php

@@ -27,7 +27,7 @@ class StoreGoodsClassGoodsModel extends \DAO\AbstractModel {
     public function getList($where,$field,$order = true){
         $this->setDb($this->dbName);
         if($order){
-            return $this->db->select($field)->from($this->_tableName)->where($where)->order('gc_sort','DESC')->fetchAll();
+            return $this->db->select($field)->from($this->_tableName)->where($where)->order('gc_sort','ASC')->fetchAll();
         }
         return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
     }

conf/application.ini

@@ -432,4 +432,5 @@ push.user.service.type=7
 
 elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
-elastic.master.scheme="http";
\ No newline at end of file
+elastic.master.scheme="http";
+

conf/url.ini

@@ -18,7 +18,7 @@ config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 config.url.pushHost="172.16.142.15:9503";
 config.url.indexUrl="/alidata/www/api.shenbd.com/application/library/React"
 config.url.libary="/alidata/www/api.shenbd.com/application/library"
-
+config.url.source="/alidata/www/qmcsadmin/public_html/data/upload/"
 [product : common]
 ; 测试环境配置
 
@@ -37,6 +37,7 @@ config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 config.url.pushHost="127.0.0.1:9503";
 config.url.indexUrl="/www/web/api_shenbd_com/public_html/application/library/React"
 config.url.libary="/www/web/api_shenbd_com/public_html/application/library"
+config.url.source="/www/web/admin_shenbd_com/public_html/qmcs/data/upload/"
 [pre : common]
 ; 测试环境配置
 
@@ -55,6 +56,8 @@ config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 config.url.pushHost="127.0.0.1:9503";
 config.url.indexUrl="/www/web/apitest_shenbd_com/public_html/application/library/React"
 config.url.libary="/www/web/apitest_shenbd_com/public_html/application/library"
+
+config.url.source="/www/web/testadmin_shenbd_com/public_html/data/upload/"
 [test : common]
 ; 测试环境配置
 
@@ -85,6 +88,8 @@ config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
+
+config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
 ; 文件目录
 ;店铺图片报错目录
 ;config.url.storePath = '/data/upload/mall/store';
@@ -114,6 +119,7 @@ config.url.pushHost="127.0.0.1:9503";
 config.url.convert="/usr/local/bin/wkhtmltoimage";
 config.url.indexUrl="/www/local.qm.com/application/library/React"
 config.url.libary="/www/local.qm.com/application/library"
+config.url.source="/data/upload/"
 ; 文件目录
 
 [ccw : common]
@@ -167,4 +173,5 @@ config.url.pushHost="127.0.0.1:9503";
 
 config.url.convert="/usr/local/bin/wkhtmltoimage";
 config.url.indexUrl="/www/local.qm.com/application/library/React"
-config.url.libary="/www/local.qm.com/application/library"
\ No newline at end of file
+config.url.libary="/www/local.qm.com/application/library"
+