4
This commit is contained in:
@@ -27,30 +27,31 @@ class Auth
|
||||
* 获取用户token
|
||||
* 直接从服务器获取,不使用缓存
|
||||
* @param string $userID 用户ID
|
||||
* @param int $platformID 平台ID,默认为1
|
||||
* @param string $platformID 平台ID,默认为android
|
||||
* @return array
|
||||
*/
|
||||
public function getUserToken(string $userID, int $platformID = 1): array
|
||||
public function getUserToken(string $userID, string $platformID = 'android'): array
|
||||
{
|
||||
// 获取管理员token
|
||||
$adminToken = Utils::getAdminToken();
|
||||
$platformID = Utils::getPlatformId( $platformID );
|
||||
return Utils::send(Url::$getUserToken, ['userID' => $userID, 'platformID' => $platformID], '获取用户token错误', $adminToken);
|
||||
}
|
||||
|
||||
/**
|
||||
* 强制登出
|
||||
* @param string $userID 要登出的用户ID
|
||||
* @param int $platformID 平台ID,默认为1
|
||||
* @param string $platformID 平台ID,默认为android
|
||||
* @return array
|
||||
*/
|
||||
public function forceLogout(string $userID, int $platformID = 1): array
|
||||
public function forceLogout(string $userID, string $platformID = 'android'): array
|
||||
{
|
||||
// 获取管理员token
|
||||
$adminToken = Utils::getAdminToken();
|
||||
|
||||
// 清除本地缓存的用户token
|
||||
Utils::clearToken($userID);
|
||||
|
||||
$platformID = Utils::getPlatformId( $platformID );
|
||||
return Utils::send(Url::$forceLogout, ['userID' => $userID, 'platformID' => $platformID], '强制登出错误', $adminToken);
|
||||
}
|
||||
|
||||
|
||||
@@ -92,11 +92,14 @@ class User
|
||||
* @param array $data 用户信息
|
||||
* @return array
|
||||
*/
|
||||
public function updateUserInfo(string $userID, array $data): array
|
||||
public function updateUserInfo(string $userID, array $data): array|bool
|
||||
{
|
||||
// 获取管理员token
|
||||
$adminToken = Utils::getAdminToken();
|
||||
$data = array_merge(['userID' => $userID], $data);
|
||||
$data = [
|
||||
'userInfo' => $data
|
||||
];
|
||||
return Utils::send(Url::$updateUserInfo, $data, '修改用户信息错误', $adminToken);
|
||||
}
|
||||
|
||||
@@ -244,7 +247,7 @@ class User
|
||||
* @param string $faceURL 头像地址
|
||||
* @return array
|
||||
*/
|
||||
public function userRegister(string $userID, string $nickname = '', string $faceURL = ''): array
|
||||
public function userRegister(string $userID, string $nickname = '', string $faceURL = ''): array|bool
|
||||
{
|
||||
// 获取管理员token
|
||||
$adminToken = Utils::getAdminToken();
|
||||
|
||||
@@ -85,7 +85,10 @@ class Utils
|
||||
{
|
||||
$url = Url::buildUrl($path);
|
||||
//cp($url);
|
||||
$res = json_decode(self::request($url, $data, $token), true);
|
||||
$res = self::request($url, $data, $token);
|
||||
//cp($data);
|
||||
//cp($res);
|
||||
$res = json_decode($res, true);
|
||||
if($res['errCode'] !==0 ){
|
||||
throw new \Exception($res['errMsg'],$res['errCode']);
|
||||
//throw new \Exception($res['errDlt'],$res['errCode']);
|
||||
@@ -139,10 +142,10 @@ class Utils
|
||||
* 获取用户Token
|
||||
* 如果缓存中没有,则自动获取并缓存
|
||||
* @param string $userID 用户ID
|
||||
* @param int $platformID 平台ID
|
||||
* @param string $platformID 平台ID
|
||||
* @return string|null
|
||||
*/
|
||||
public static function getUserToken(string $userID, int $platformID = 1): ?string
|
||||
public static function getUserToken(string $userID, string $platformID = 'android'): ?string
|
||||
{
|
||||
$tokenManager = self::getTokenManager();
|
||||
$token = $tokenManager->getUserToken($userID);
|
||||
@@ -156,7 +159,7 @@ class Utils
|
||||
|
||||
$result = self::send(Url::$getUserToken, [
|
||||
'userID' => $userID,
|
||||
'platformID' => $platformID
|
||||
'platformID' => self::getPlatformId($platformID)
|
||||
], '获取用户Token失败', $adminToken);
|
||||
|
||||
$token = $result['token'];
|
||||
@@ -181,4 +184,23 @@ class Utils
|
||||
{
|
||||
return self::getTokenManager()->clearToken($userID, $isAdmin);
|
||||
}
|
||||
public static function getPlatformId($name=''): int{
|
||||
$arr = [
|
||||
'ios' => 1,
|
||||
'android' => 2,
|
||||
'windows' => 3,
|
||||
'macos' => 4,
|
||||
'web' => 5,
|
||||
'mp-weixin' => 6,
|
||||
'linux' => 7,
|
||||
'androidpad' => 8,
|
||||
'ipad' => 9,
|
||||
'admin' => 10,
|
||||
];
|
||||
$name = strtolower($name);
|
||||
if(isset($arr[$name])){
|
||||
return $arr[$name];
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user