|
@@ -36,37 +36,35 @@ class MemberAuthMiddleware
|
|
|
{
|
|
{
|
|
|
//验证会员授权信息
|
|
//验证会员授权信息
|
|
|
$clientRoute = request()->route()->getName();
|
|
$clientRoute = request()->route()->getName();
|
|
|
|
|
+ $token=request()->header('Authorization');
|
|
|
|
|
+ if(empty($token)){
|
|
|
|
|
+ $token = $request->input('token','');
|
|
|
|
|
+ }
|
|
|
if (!in_array($clientRoute, $this->noAuth)) {
|
|
if (!in_array($clientRoute, $this->noAuth)) {
|
|
|
- $m_id = $request->input('m_id','5');
|
|
|
|
|
- $token = $request->input('token','04c97f7287eb8242ca0fc3cc41b7b555');
|
|
|
|
|
- if (empty($m_id) || empty($token) || !is_numeric($m_id)) {
|
|
|
|
|
|
|
+ if ( empty($token) ) {
|
|
|
throw new MemberAuthException('缺少认证信息', 401);
|
|
throw new MemberAuthException('缺少认证信息', 401);
|
|
|
}
|
|
}
|
|
|
- $member = RedisDataServer::creatServer()->getData( 'login_' . $m_id, 'json');
|
|
|
|
|
|
|
+ $member = RedisDataServer::creatServer()->getData( 'login_' . $token, 'json');
|
|
|
if (empty($member)) {
|
|
if (empty($member)) {
|
|
|
- $member = Member::where('id', $m_id)->where('status',1)->select(['id', 'phone', 'nickname', 'status', 'token_str', 'level_id', 'source'])->first();
|
|
|
|
|
|
|
+ $member = Member::where('token_str', $token)->where('status',1)->select(['id', 'address', 'status', 'token_str', 'level_id'])->first();
|
|
|
|
|
|
|
|
if(empty($member)){
|
|
if(empty($member)){
|
|
|
throw new MemberAuthException('认证信息已过期', 401);
|
|
throw new MemberAuthException('认证信息已过期', 401);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if ($member['token_str'] != $token) {
|
|
|
|
|
- throw new MemberAuthException('认证信息已过期', 401);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
//用户信息缓存30秒
|
|
//用户信息缓存30秒
|
|
|
- RedisDataServer::creatServer()->setData($token . '_' . $m_id, $member, 'json', 300);
|
|
|
|
|
|
|
+ RedisDataServer::creatServer()->setData($token . '_' . $token, $member, 'json', 300);
|
|
|
$request->member = $member;
|
|
$request->member = $member;
|
|
|
}else{
|
|
}else{
|
|
|
- $m_id = $request->input('m_id','');
|
|
|
|
|
- $token = $request->input('token','');
|
|
|
|
|
- if($m_id && $token){
|
|
|
|
|
- $member = RedisDataServer::creatServer()->getData( 'login_' . $m_id, 'json');
|
|
|
|
|
|
|
+ if( $token){
|
|
|
|
|
+ $member = RedisDataServer::creatServer()->getData( 'login_' . $token, 'json');
|
|
|
if (empty($member)) {
|
|
if (empty($member)) {
|
|
|
- $member = Member::where('id', $m_id)->where('status',1)->select(['id', 'phone', 'nickname', 'status', 'token_str', 'level_id', 'source'])->first();
|
|
|
|
|
|
|
+ $member = Member::where('token_str', $token)->where('status',1)->select(['id', 'address', 'status', 'token_str', 'level_id'])->first();
|
|
|
}
|
|
}
|
|
|
//用户信息缓存30秒
|
|
//用户信息缓存30秒
|
|
|
if($member){
|
|
if($member){
|
|
|
- RedisDataServer::creatServer()->setData($token . '_' . $m_id, $member, 'json', 300);
|
|
|
|
|
|
|
+ RedisDataServer::creatServer()->setData('login_' . $token, $member, 'json', 300);
|
|
|
$request->member = $member;
|
|
$request->member = $member;
|
|
|
}else{
|
|
}else{
|
|
|
$request->member = ['id'=>0];
|
|
$request->member = ['id'=>0];
|