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

修改接口参数

Browse Source
This commit is contained in:
Anyon 2020-11-24 18:24:54 +08:00
parent 5150842527
commit 57780a39b4
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@ abstract class Auth extends Controller
*/
protected function initialize()
{
$this->type = input('api', 'web');
$this->user = $this->getUser();
$this->uuid = $this->user['id'];
}
@ -51,7 +52,7 @@ abstract class Auth extends Controller
$token = input('token') ?: $this->request->header('token');
if (empty($token)) $this->error('接口认证令牌不能为空！');
[$state, $message, $this->uuid] = UserService::instance()->checkUserToken($this->type, $token);
if ($state) $this->error($message);
if (empty($state)) $this->error($message);
}
return UserService::instance()->get($this->type, $this->uuid);
} catch (HttpResponseException $exception) {

2
app/data/controller/api/Login.php
View File

@ -74,7 +74,7 @@ class Login extends Controller
}
$data['password'] = md5($data['password']);
$user = UserService::instance()->save($map, $data, 'web', true);
empty($user) ? $this->success('用户注册成功！', $user) : $this->error('手机注册失败！');
empty($user) ? $this->error('手机注册失败！') : $this->success('用户注册成功！', $user);
}
/**

16
app/data/service/UserService.php
View File

@ -53,16 +53,16 @@ class UserService extends Service
public function save(array $map, array $data, string $type, bool $force = false): array
{
unset($data['id'], $data['deleted'], $data['create_at']);
if ($uid = $this->app->db->name('DataUser')->where($map)->where(['deleted' => 0])->value('id')) {
if ($uuid = $this->app->db->name('DataUser')->where($map)->where(['deleted' => 0])->value('id')) {
if (!empty($data)) {
$map = ['id' => $uid, 'deleted' => 0];
$map = ['id' => $uuid, 'deleted' => 0];
$this->app->db->name('DataUser')->strict(false)->where($map)->update($data);
}
} else {
$uid = $this->app->db->name('DataUser')->strict(false)->insertGetId($data);
$uuid = $this->app->db->name('DataUser')->strict(false)->insertGetId($data);
}
if ($force) $this->buildUserToken($uid, $type);
return $this->get($type, $uid);
if ($force) $this->buildUserToken(intval($uuid), $type);
return $this->get($type, $uuid);
}
/**
@ -92,9 +92,9 @@ class UserService extends Service
// 创建用户新的用户认证数据
do $map = ['type' => $type, 'token' => md5(uniqid('', true) . rand(100, 999))];
while ($this->app->db->name('DataUserToken')->where($map)->count() > 0);
$token = array_merge($map, ['time' => $time + $this->expire, 'tokenv' => $this->_buildTokenVerify()]);
if ($this->app->db->name('DataUserToken')->insert($token) !== false) {
return [1, '刷新用户认证成功', $token];
$data = array_merge($map, ['uid' => $uid, 'time' => $time + $this->expire, 'tokenv' => $this->_buildTokenVerify()]);
if ($this->app->db->name('DataUserToken')->insert($data) !== false) {
return [1, '刷新用户认证成功', $data];
} else {
return [0, '刷新用户认证失败', []];
}