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

application/models/Business/User/MemberService.php

@@ -275,7 +275,12 @@ class MemberServiceModel extends \Business\AbstractModel
     private function saveRegisterMemberInfo($where){
         $memberDao = \DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $addKey=Common::getConfig('password.key');
+        if(!empty($addKey)){
             $md5Str=TIMESTAMP.$addKey.$where['password'];
+        }else{
+            $md5Str=$where['password'];
+        }
+
         //构造需要保存的会员信息
         $member['member_name'] = \Our\CommonExtension::createNewMemberName();
         $member['member_mobile'] = $where['mobile'];

application/models/DAO/Member.php

@@ -4,6 +4,7 @@ namespace DAO;
 
 use Error\CodeConfigModel;
 use Error\ErrorModel;
+use Our\Common;
 use Our\ImageConst;
 use Our\NameConst;
 use Our\ApiConst;
@@ -68,7 +69,12 @@ class MemberModel extends \DAO\AbstractModel
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $where[NameConst::memberMobile] = $mobile;
-        $where[NameConst::memberPasswd] = md5($password);
+        $addKey=Common::getConfig('password.key');
+        if(!empty($addKey)){
+            $where[NameConst::memberPasswd] = Common::format("MD5(CONCAT(member_time,member_passwd,'{0}'))",$addKey);
+        }else{
+            $where[NameConst::memberPasswd]=md5($password);
+        }
         $result = $this->db->select($this->availMemberColumn)->from($this->_tableName)->where($where)->fetchOne();
         if ($result) {
             $memberAvatarUrl = $this->getMemberAvatarUrl($result['member_id'], $result['member_avatar']);