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-09-14 11:36:58 +08:00
parent 21324a74da
commit bed728e07e
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ abstract class Auth extends Controller
protected $mid;
/**
* 接口授权TOKEN
* 接口授权令牌
* @var string
*/
protected $token;
@ -45,7 +45,7 @@ abstract class Auth extends Controller
* 获取会员数据
* @return array
*/
protected function getMember(): array
protected function getMember()
{
try {
if (empty($this->token)) $this->error('接口授权TOKEN无效');

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

@ -37,7 +37,7 @@ class Login extends Controller
if (empty($user)) $this->error('该手机号还没有注册哦！');
if (empty($user['status'])) $this->error('该会员账号状态异常！');
if (md5($data['password']) === $user['password']) {
$this->success('手机登录成功！', UserService::instance()->get($map, true));
$this->success('手机登录成功！', UserService::instance()->get($user['id'], true));
} else {
$this->error('账号登录失败，请稍候再试！');
}

3
app/data/controller/api/auth/Center.php
View File

@ -60,6 +60,7 @@ class Center extends Auth
/**
* 绑定会员邀请人
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
@ -71,7 +72,7 @@ class Center extends Auth
$this->error('邀请人不能是自己哦', UserService::instance()->total($this->mid));
}
$from = $this->app->db->name($this->table)->where(['id' => $data['from']])->find();
if (empty($from)) $this->error('邀请人状态异常', UserService::instance()->total($this->mid));
if (empty($from)) $this->error('邀请人状态异常', UserService::instance()->get($this->mid));
if ($this->member['from'] > 0) $this->error('您已经绑定了邀请人', UserService::instance()->total($this->mid));
if ($this->app->db->name($this->table)->where(['id' => $this->mid])->update($data) !== false) {
$this->success('绑定邀请人成功！', UserService::instance()->total($this->mid));

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

@ -19,22 +19,27 @@ class UserService extends Service
/**
* 获取会员资料
* @param array $map 查询条件
* @param bool $force 强制令牌
* @param mixed $map 查询条件
* @param boolean $force 强制令牌
* @return array
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function get(array $map, bool $force = false): array
public function get($map, bool $force = false): array
{
$member = $this->save($map, [], $force);
if (empty($member)) throw new \think\Exception('登录授权失败');
if (is_numeric($map)) {
$map = ['id' => $map];
} elseif (is_string($map)) {
$map = ['token|openid' => $map];
}
$user = $this->save($map, [], $force);
if (empty($user)) throw new \think\Exception('登录授权失败');
// if ($member['tokenv'] !== $this->buildTokenVerify()) {
// throw new \think\Exception('请重新登录授权');
// }
return $member;
return $user;
}
/**