Commit d64c42de authored by wwccw0591's avatar wwccw0591

pc

parent a7c9ccb3
...@@ -26,6 +26,26 @@ class AuthinfoController extends \Our\Controller_Abstract ...@@ -26,6 +26,26 @@ class AuthinfoController extends \Our\Controller_Abstract
$name = $this->req->getQuery('name'); $name = $this->req->getQuery('name');
throw new Exception('hello ', 404); throw new Exception('hello ', 404);
} }
public function otherLoginAction(){
$this->req=$this->getRequest()->getQuery();
$postData['key']=$this->req['key'];
$postData['authSign']=$this->req['authSign'];
if($postData['authSign']==md5($postData['key'].\Our\SecretKeys::authKey)){
session_id($postData['key']);
$this->sess=\Yaf\Session::getInstance();
$this->sess->start();
$memberId=$this->sess->get('member_id');
if(!empty($memberId)){
$this->sess->set('other_login',\Our\ApiConst::one);
}else{
}
}else{
}
\Yaf\Dispatcher::getInstance()->disableView();
}
public function testAction() public function testAction()
{ {
......
...@@ -14,11 +14,18 @@ class UserController extends \Our\Controller_AbstractIndex { ...@@ -14,11 +14,18 @@ class UserController extends \Our\Controller_AbstractIndex {
} }
public function indexAction() { private function indexAction() {
$login=LoginV2Model::getInstance(); $login=LoginV2Model::getInstance();
echo $login->login(); 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);
}
/** /**
* 用户登录 * 用户登录
* *
...@@ -41,12 +48,15 @@ class UserController extends \Our\Controller_AbstractIndex { ...@@ -41,12 +48,15 @@ class UserController extends \Our\Controller_AbstractIndex {
if(!$result['status']){ if(!$result['status']){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::loginBindUserInfoFailed); \Error\ErrorModel::throwException(\Error\CodeConfigModel::loginBindUserInfoFailed);
} }
if(isset($result['member'])&&$member){ if(isset($result['member'])&&$member){
$member = array_merge($member,$result['member']); $member = array_merge($member,$result['member']);
} }
} }
$userToken=$this->memberService->findMbUserTokenByMemberId($member['member_id']); $userToken=$this->memberService->findMbUserTokenByMemberId($member['member_id']);
$this->memberService->clearKey($userToken['token']); if(!empty($userToken['token'])){
$this->updateOldLoginKey($userToken['token']);
//$this->memberService->clearKey($userToken['token']);
}
if($member){ if($member){
$this->memberService->clearKey($this->key); $this->memberService->clearKey($this->key);
$this->key=Common::bulidToken($mobile,$password); $this->key=Common::bulidToken($mobile,$password);
...@@ -129,6 +139,7 @@ class UserController extends \Our\Controller_AbstractIndex { ...@@ -129,6 +139,7 @@ class UserController extends \Our\Controller_AbstractIndex {
$this->sess['user_type'] = $where['userType']; $this->sess['user_type'] = $where['userType'];
$this->sess[NameConst::sessionKey]=$this->key; $this->sess[NameConst::sessionKey]=$this->key;
$member[NameConst::sessionKey]=$this->key; $member[NameConst::sessionKey]=$this->key;
$member['login_time']=TIMESTAMP;
$this->memberService->saveMember($member); $this->memberService->saveMember($member);
$this->success(array('userFlag'=>\Our\ApiConst::one,'key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'])); $this->success(array('userFlag'=>\Our\ApiConst::one,'key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl']));
}else{ }else{
......
<?php <?php
namespace Our; namespace Our;
use Business\User\MemberServiceModel;
use Error\CodeConfigModel; use Error\CodeConfigModel;
use Error\ErrorModel; use Error\ErrorModel;
/** /**
...@@ -33,6 +34,11 @@ abstract class Controller_AbstractApi extends \Our\Controller_Abstract { ...@@ -33,6 +34,11 @@ abstract class Controller_AbstractApi extends \Our\Controller_Abstract {
if(empty($this->memberId)){ if(empty($this->memberId)){
ErrorModel::throwException(CodeConfigModel::noLogin); ErrorModel::throwException(CodeConfigModel::noLogin);
} }
if(isset($sess['other_login']) && $sess['other_login']==ApiConst::one){
$memberService=MemberServiceModel::getInstance();
$memberService->clearKey($this->req['data']['key']);
ErrorModel::throwException(CodeConfigModel::otherDriverLogin);
}
\Yaf\Dispatcher::getInstance()->disableView(); \Yaf\Dispatcher::getInstance()->disableView();
} }
public function getAuthKey(){ public function getAuthKey(){
......
...@@ -39,6 +39,8 @@ class PathConst { ...@@ -39,6 +39,8 @@ class PathConst {
const orderConfirmTaskAddTime="/orderConfirmTaskAddTime.conf"; const orderConfirmTaskAddTime="/orderConfirmTaskAddTime.conf";
const orderId="orderId={0}"; const orderId="orderId={0}";
const authInfoOtherLogin="/authInfo/otherLogin";
//const favoritesStoreFavTimeConf="favoritesStoreFavTime.conf"; //const favoritesStoreFavTimeConf="favoritesStoreFavTime.conf";
......
...@@ -102,7 +102,6 @@ class MemberModel extends \DAO\AbstractModel ...@@ -102,7 +102,6 @@ class MemberModel extends \DAO\AbstractModel
$this->setDb(\Our\DbNameConst::masterDBConnectName); $this->setDb(\Our\DbNameConst::masterDBConnectName);
$result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute(); $result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute();
if ($result) { if ($result) {
$memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance(); $memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
$member = $data; $member = $data;
if (isset($member['member_avatar']) && $member['member_avatar']) { if (isset($member['member_avatar']) && $member['member_avatar']) {
......
...@@ -89,6 +89,7 @@ class CodeConfigModel { ...@@ -89,6 +89,7 @@ class CodeConfigModel {
const updateMobileMembmerFailed = 10076; const updateMobileMembmerFailed = 10076;
const updateMobileMembmerMappingFailed = 10077; const updateMobileMembmerMappingFailed = 10077;
const currentMobileHasBeenBind = 10078; const currentMobileHasBeenBind = 10078;
const otherDriverLogin=10105;
//访问错误 //访问错误
const illegalAccess=200001; const illegalAccess=200001;
...@@ -743,6 +744,7 @@ class CodeConfigModel { ...@@ -743,6 +744,7 @@ class CodeConfigModel {
self::updateMobileMembmerFailed => '更新手机号对应会员信息失败', self::updateMobileMembmerFailed => '更新手机号对应会员信息失败',
self::updateMobileMembmerMappingFailed => '更新手机号码对应会员mapping信息失败', self::updateMobileMembmerMappingFailed => '更新手机号码对应会员mapping信息失败',
self::currentMobileHasBeenBind => '当前手机号码已经绑定其他微信,如需绑定,请先手机号码登录app进行微信解绑', self::currentMobileHasBeenBind => '当前手机号码已经绑定其他微信,如需绑定,请先手机号码登录app进行微信解绑',
self::otherDriverLogin=>'当前用户已被其他用户登录,请重新登录',
self::elasticsError=>'全文索引连接出错' self::elasticsError=>'全文索引连接出错'
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment