mojiahui/webman-buildadmin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API接口

Browse Source 
1.新增鉴权接口/api/v1/authToken
2.修复注册，登录，获取首页初始化数据，获取用户信息接口报错
This commit is contained in:
zhenhui
2026-04-16 18:42:44 +08:00
parent 5ee0f2b1f4
commit cfe5ec6fb0
12 changed files with 93 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/common/controller/Frontend.php
View File

@@ -36,7 +36,13 @@ class Frontend extends Api
try {
$this->auth = Auth::instance(['request' => $request]);
$token = get_auth_token(['ba', 'user', 'token'], $request);
$token = trim((string) $request->header('user-token', ''));
if ($token === '') {
$token = trim((string) $request->header('user_token', ''));
}
if ($token === '') {
$token = get_auth_token(['ba', 'user', 'token'], $request);
}
if ($token) $this->auth->init($token);
} catch (TokenExpirationException) {
if ($needLogin) return $this->error(__('Token expiration'), [], 409);

20
app/common/library/Auth.php
View File

@@ -67,7 +67,8 @@ class Auth extends \ba\Auth
$this->setError('Account not exist');
return false;
}
if ($this->model->status != 'enable') {
$status = $this->model->status ?? '';
if ($status === 'disable' || $status === 0 || $status === '0') {
$this->setError('Account disabled');
return false;
}
@@ -81,7 +82,7 @@ class Auth extends \ba\Auth
return false;
}
public function register(string $username, string $password = '', string $mobile = '', string $email = '', int $group = 1, array $extend = []): bool
public function register(string $username, string $password = '', string $phone = '', string $email = '', int $group = 1, array $extend = []): bool
{
$request = function_exists('request') ? request() : null;
$ip = $request ? $request->getRealIp() : '0.0.0.0';
@@ -90,7 +91,9 @@ class Auth extends \ba\Auth
$this->setError(__('Email'));
return false;
}
if ($username && !preg_match('/^[a-zA-Z][a-zA-Z0-9_]{2,15}$/', $username)) {
$isMobileUsername = preg_match('/^1[3-9]\d{9}$/', $username) === 1;
$isNormalUsername = preg_match('/^[a-zA-Z][a-zA-Z0-9_]{2,15}$/', $username) === 1;
if ($username && !$isMobileUsername && !$isNormalUsername) {
$this->setError(__('Username'));
return false;
}
@@ -112,9 +115,9 @@ class Auth extends \ba\Auth
'join_time' => $time,
'last_login_ip' => $ip,
'last_login_time' => $time,
'status' => 'enable',
'status' => 1,
];
$data = array_merge(compact('username', 'password', 'mobile', 'email'), $data, $extend);
$data = array_merge(compact('username', 'password', 'phone', 'email'), $data, $extend);
Db::startTrans();
try {
@@ -139,7 +142,7 @@ class Auth extends \ba\Auth
public function login(string $username, string $password, bool $keep): bool
{
$accountType = false;
if (preg_match('/^1[3-9]\d{9}$/', $username)) $accountType = 'mobile';
if (preg_match('/^1[3-9]\d{9}$/', $username)) $accountType = 'phone';
elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) $accountType = 'email';
elseif (preg_match('/^[a-zA-Z][a-zA-Z0-9_]{2,15}$/', $username)) $accountType = 'username';
if (!$accountType) {
@@ -152,7 +155,8 @@ class Auth extends \ba\Auth
$this->setError('Account not exist');
return false;
}
if ($this->model->status == 'disable') {
$status = $this->model->status ?? '';
if ($status === 'disable' || $status === 0 || $status === '0') {
$this->setError('Account disabled');
return false;
}
@@ -171,7 +175,7 @@ class Auth extends \ba\Auth
}
}
if (!verify_password($password, $this->model->password, ['salt' => $this->model->salt])) {
if (!verify_password($password, $this->model->password, ['salt' => $this->model->salt ?? ''])) {
$this->loginFailed();
$this->setError('Password is incorrect');
return false;

2
app/common/middleware/AllowCrossDomain.php
View File

@@ -30,7 +30,7 @@ class AllowCrossDomain implements MiddlewareInterface
'Access-Control-Allow-Credentials' => 'true',
'Access-Control-Max-Age' => '1800',
'Access-Control-Allow-Methods' => 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
'Access-Control-Allow-Headers' => 'Content-Type, Authorization, batoken, ba-user-token, think-lang, server',
'Access-Control-Allow-Headers' => 'Content-Type, Authorization, batoken, ba-user-token, user-token, access-token, think-lang, server',
];
$origin = $request->header('origin');
if (is_array($origin)) {

5
app/common/model/User.php
View File

@@ -32,4 +32,9 @@ class User extends Model
{
return $this->belongsTo(\app\admin\model\Admin::class, 'admin_id', 'id');
}
public function resetPassword(int|string $uid, string $newPassword): int
{
return $this->where(['id' => $uid])->update(['password' => hash_password($newPassword)]);
}
}