用户密码问题

application/models/Business/User/MemberService.php

@@ -275,8 +275,9 @@ class MemberServiceModel extends \Business\AbstractModel
     private function saveRegisterMemberInfo($where){
         $memberDao = \DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $addKey=Common::getConfig('password.key');
+        $memberTime = TIMESTAMP;
         if(!empty($addKey)){
-            $md5Str=TIMESTAMP.$addKey.$where['password'];
+            $md5Str=$memberTime.$addKey.$where['password'];
         }else{
             $md5Str=$where['password'];
         }
@@ -286,7 +287,7 @@ class MemberServiceModel extends \Business\AbstractModel
         $member['member_mobile'] = $where['mobile'];
         $member['member_mobile_bind'] = \Our\ApiConst::one;
         $member['member_passwd'] = md5($md5Str);
-        $member['member_time'] = TIMESTAMP;
+        $member['member_time'] = $memberTime;
         $result = $memberDao->addInfo($member);
         return $result;
     }
@@ -591,9 +592,15 @@ class MemberServiceModel extends \Business\AbstractModel
         if($existMember['memberMobile']&&$existMember['memberMobileBind']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::registerMemberInfoFailed);
         }
+        $memberTime= $memberDao->getInfo($memberMapping['member_id'],'member_time');
+        if(!$memberTime){
+            $memberTime = TIMESTAMP;
+        }
+        $passwordStr = $this->getRealPassword($where['password'],$memberTime);
         $member['member_mobile'] = $where['mobile'];
         $member['member_mobile_bind'] = \Our\ApiConst::one;
-        $member['member_passwd'] = md5($where['password']);
+        $member['member_passwd'] = md5($passwordStr);
+        $member['member_time'] = $memberTime;
         $updateMemberResult = $memberDao->saveInfo($member,$memberMapping['member_id']);
         if(!$updateMemberResult){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::authMemberExistMobile);
@@ -683,7 +690,13 @@ class MemberServiceModel extends \Business\AbstractModel
         }
         $memberDao = \DAO\MemberModel::getInstance();
         $memberDao->checkPassword($data);
-        $result = $memberDao->updateInfo(array('member_passwd'=>md5($data['password'])),array('member_mobile'=>$passwordMobile));
+        $memberTimeArray = $memberDao->getOneByWhereWithField(array('member_mobile'=>$passwordMobile),'member_time');
+        $memberTime = TIMESTAMP;
+        if($memberTimeArray&&$memberTimeArray['member_time']){
+            $memberTime = $memberTimeArray['member_time'];
+        }
+        $passwordStr = $this->getRealPassword($data['password'],$memberTime);
+        $result = $memberDao->updateInfo(array('member_passwd'=>  md5($passwordStr),'member_time'=>$memberTime),array('member_mobile'=>$passwordMobile));
         if($result===false){
             return false;
         }
@@ -700,8 +713,12 @@ class MemberServiceModel extends \Business\AbstractModel
 
         $data['messageType'] = \Our\ApiConst::messageTypeValidNewMobile;
         $shortMessageDao->validCode($data);
-
-        $result = $memberDao->updateInfo(array('member_passwd'=>md5($data['password']),'member_mobile'=>$data['mobile'],'member_mobile_bind'=>\Our\ApiConst::one),array('member_id'=>$memberId));
+        $memberTime = $memberDao->getInfo($memberId,'member_time');
+        if(!$memberTime){
+            $memberTime = TIMESTAMP;
+        }
+        $passwordStr = $this->getRealPassword($data['password'],$memberTime);
+        $result = $memberDao->updateInfo(array('member_passwd'=>md5($passwordStr),'member_mobile'=>$data['mobile'],'member_time'=>$memberTime,'member_mobile_bind'=>\Our\ApiConst::one),array('member_id'=>$memberId));
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::changeMobileFailed);
         }
@@ -721,7 +738,13 @@ class MemberServiceModel extends \Business\AbstractModel
     public function changePassword($where,$memberId){
         $memberDao = \DAO\MemberModel::getInstance();
         $memberDao->checkOldPassword($where,$memberId);
-        $result = $memberDao->updateInfo(array('member_passwd'=>md5($where['password'])),array('member_id'=>$memberId));
+        $memberTime = TIMESTAMP;
+        $memberTimeStr = $memberDao->getInfo($memberId,'member_time');
+        if(!$memberTimeStr){
+            $memberTime = $memberTimeStr;
+        }
+        $passwordStr = $this->getRealPassword($where['password'],$memberTime);
+        $result = $memberDao->updateInfo(array('member_passwd'=>md5($passwordStr),'member_time'=>$memberTime),array('member_id'=>$memberId));
         if($result){
             $this->logOut($where['key']);
             return true;
@@ -888,7 +911,13 @@ class MemberServiceModel extends \Business\AbstractModel
 
         $data['messageType'] = \Our\ApiConst::messageTypeWxLietBindMobile;
         $shortMessageDao->validCode($data);
-        $updateMember = array('member_passwd'=>md5($data['password']),'member_mobile'=>$data['mobile'],'member_mobile_bind'=>\Our\ApiConst::one);
+        $memberTime = TIMESTAMP;
+        $memberTimeStr = $memberDao->getInfo($memberId,'member_time');
+        if(!$memberTimeStr){
+            $memberTime = $memberTimeStr;
+        }
+        $passwordStr = $this->getRealPassword($data['password'],$memberTime);
+        $updateMember = array('member_passwd'=>md5($passwordStr),'member_mobile'=>$data['mobile'],'member_mobile_bind'=>\Our\ApiConst::one,'member_time'=>$memberTime);
         $result = $memberDao->updateInfo($updateMember,array('member_id'=>$memberId));
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::wxMemberBindMobileFailed);
@@ -920,11 +949,18 @@ class MemberServiceModel extends \Business\AbstractModel
         //验证短信验证码
         $shortMessageDao = \DAO\ShortMessageModel::getInstance();
 
+        $memberTime = TIMESTAMP;
+        $memberTimeStr = $memberDao->getInfo($memberId,'member_time');
+        if(!$memberTimeStr){
+            $memberTime = $memberTimeStr;
+        }
+        $passwordStr = $this->getRealPassword($data['password'],$memberTime);
         $data['messageType'] = \Our\ApiConst::messageTypeWxLietBindMobile;
         $shortMessageDao->validCode($data);
         if($mobileMember){
             $memberDao->db->doTransaction();
-            $updateMobileMember['member_passwd'] = md5($data['password']);
+            $updateMobileMember['member_passwd'] = md5($passwordStr);
+            $updateMobileMember['member_time'] = $memberTime;
             $resultMember = $memberDao->updateInfo($updateMobileMember,array('member_id'=>$mobileMember['member_id']));
             if($resultMember===false){
                 $memberDao->db->doRollback();
@@ -942,7 +978,15 @@ class MemberServiceModel extends \Business\AbstractModel
             $memberDao->db->doCommit();
             $sess['member_id'] = $mobileMember['member_id'];
         }else{
-            $updateMember = array('member_passwd'=>md5($data['password']),'member_mobile'=>$data['mobile'],'member_mobile_bind'=>\Our\ApiConst::one);
+
+            $memberTime = TIMESTAMP;
+            $memberTimeStr = $memberDao->getInfo($memberId,'member_time');
+            if(!$memberTimeStr){
+                $memberTime = $memberTimeStr;
+            }
+            $passwordStr = $this->getRealPassword($data['password'],$memberTime);
+            $data['messageType'] = \Our\ApiConst::messageTypeWxLietBindMobile;
+            $updateMember = array('member_passwd'=>md5($passwordStr),'member_mobile'=>$data['mobile'],'member_mobile_bind'=>\Our\ApiConst::one,'member_time'=>$memberTime);
             $result = $memberDao->updateInfo($updateMember,array('member_id'=>$memberId));
             if(!$result){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::wxMemberBindMobileFailed);
@@ -955,6 +999,7 @@ class MemberServiceModel extends \Business\AbstractModel
         return true;
     }
 
+
     public function growMembers(){
         $memberDao=\DAO\MemberModel::getInstance();
         $res =$memberDao->getAll();