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

application/controllers/Member.php

@@ -58,11 +58,14 @@ class MemberController extends \Our\Controller_AbstractApi {
      * 取消第三方绑定
      */
     public function cancelBindingAction(){
-
         $data = $this->req[\Our\NameConst::data];
-
         $this->memberService->cancelBinding($data,$this->memberId);
-
+        if($data['userType']==\Our\ApiConst::userFromWx){
+            $userToken=$this->memberService->getWxUserToken($this->memberId);
+            if(!empty($userToken)){
+                $this->updateOldLoginKey($userToken);
+            }
+        }
         $this->success(new stdClass(),\Our\DescribeConst::cancelBindingSuccess,\Our\DescribeConst::cancelBindingSuccess);
     }
 

application/controllers/User.php

@@ -18,14 +18,7 @@ class UserController extends \Our\Controller_AbstractIndex {
         $login=LoginV2Model::getInstance();
         echo $login->login();
     }
-    private function updateOldLoginKey($token){
-        $params['authSign']=md5($token.\Our\SecretKeys::authKey);
-        $params['key']=$token;
-        $paramsStr=http_build_query($params);
-        $domain=  Bootstrap::getUrlIniConfig('resourcesHost');
-        $getUrl=$domain.\Our\PathConst::authInfoOtherLogin.'?'.$paramsStr;
-        file_get_contents($getUrl);
-    }
+
     /**
      * 用户登录
      *

application/library/Our/Controller/Abstract.php

@@ -96,4 +96,14 @@ abstract class Controller_Abstract extends \Yaf\Controller_Abstract {
         [NameConst::pageSize]:($pageSize>0?$pageSize:ApiConst::pageSize);
     }
 
+
+    protected function updateOldLoginKey($token){
+        $params['authSign']=md5($token.\Our\SecretKeys::authKey);
+        $params['key']=$token;
+        $paramsStr=http_build_query($params);
+        $domain=  \Bootstrap::getUrlIniConfig('resourcesHost');
+        $getUrl=$domain.\Our\PathConst::authInfoOtherLogin.'?'.$paramsStr;
+        file_get_contents($getUrl);
+    }
+
 }