blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-05-22 06:49:15 +08:00
Code Issues Projects Releases Wiki Activity

Update Auth.php

Browse Source
This commit is contained in:
邹景立 2021-02-24 10:22:40 +08:00
parent 5c45c15302
commit 44bbcb2c8a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/data/controller/api/Auth.php
View File

@ -43,10 +43,11 @@ abstract class Auth extends Controller
protected function initialize() protected function initialize()
{ {
// 接口数据类型 // 接口数据类型
$this->type = input('api') ?: $this->request->header('api-type'); $this->type = input('api') ?: $this->request->header('api-name');
$this->type = $this->type ?: $this->request->header('api-type');
$this->type = $this->type ?: UserService::APITYPE_WXAPP; $this->type = $this->type ?: UserService::APITYPE_WXAPP;
if (empty(UserService::TYPES[$this->type])) { if (empty(UserService::TYPES[$this->type])) {
$this->error("接口通道[{$this->type}]未定义规则！"); $this->error("接口通道未定义规则！");
} }
// 获取用户数据 // 获取用户数据
$this->user = $this->getUser(); $this->user = $this->getUser();
@ -60,14 +61,13 @@ abstract class Auth extends Controller
protected function getUser(): array protected function getUser(): array
{ {
try { try {
$user = UserService::instance();
if (empty($this->uuid)) { if (empty($this->uuid)) {
$token = input('token') ?: $this->request->header('api-token'); $token = input('token') ?: $this->request->header('api-token');
if (empty($token)) $this->error('登录认证TOKEN不能为空！'); if (empty($token)) $this->error('登录认证TOKEN不能为空！');
[$state, $info, $this->uuid] = $user->check($this->type, $token); [$state, $info, $this->uuid] = UserService::instance()->check($this->type, $token);
if (empty($state)) $this->error($info, '{-null-}', 401); if (empty($state)) $this->error($info, '{-null-}', 401);
} }
return $user->get($this->type, $this->uuid); return UserService::instance()->get($this->type, $this->uuid);
} catch (HttpResponseException $exception) { } catch (HttpResponseException $exception) {
throw $exception; throw $exception;
} catch (\Exception $exception) { } catch (\Exception $exception) {