panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:更新已知bug,优化代码

Browse Source
This commit is contained in:
Ying
2022-11-28 19:11:12 +08:00
parent f6aee95cfc
commit 9445b206a2
1378 changed files with 53759 additions and 20789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extend/system/Http.php
View File

@@ -24,10 +24,10 @@ class Http
* @param array $params
* @param bool $agent
* @param array $options
* @param $header
* @param array $header
* @return mixed|string
*/
public static function post(string $url, array $params = [], bool $agent = true, array $options = [], $header = '')
public static function post(string $url, array $params = [], bool $agent = true, array $options = [], array $header = [])
{
$req = self::request($url, $params, $agent, 'POST', $options, $header);
return $req['ret'] ? $req['msg'] : '';
@@ -39,10 +39,10 @@ class Http
* @param array $params
* @param bool $agent
* @param array $options
* @param $header
* @param array $header
* @return mixed|string
*/
public static function get(string $url, array $params = [], bool $agent = true, array $options = [], $header = [])
public static function get(string $url, array $params = [], bool $agent = true, array $options = [], array $header = [])
{
$req = self::request($url, $params, $agent, 'GET', $options, $header);
return $req['ret'] ? $req['msg'] : '';

1
extend/system/ZipArchives.php
View File

@@ -111,6 +111,7 @@ class ZipArchives
}
} catch (\Throwable $th) {
var_dump($th->getMessage());
throw new \Exception("压缩 " . $fileName . " 包失败", -115);
} finally {
$zip->close();

21
extend/system/third/weibo.php
View File

@@ -3,6 +3,7 @@ declare (strict_types = 1);
namespace system\third;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
/**
* 微博登录类
@@ -64,22 +65,23 @@ class weibo
return $url;
}
/**
/**
* 获取用户信息
* @param array $params
* @return array
* @throws GuzzleException
*/
public function getUserInfo($params = [])
public function getUserInfo(array $params = []): array
{
$params = $params ? $params : input();
if (isset($params['access_token']) || (isset($params['state']) && $params['state'] == session('state') && isset($params['code']))) {
//获取access_token
$data = isset($params['code']) ? $this->getAccessToken($params['code']) : $params;
$access_token = isset($data['access_token']) ? $data['access_token'] : '';
$refresh_token = isset($data['refresh_token']) ? $data['refresh_token'] : '';
$expires_in = isset($data['expires_in']) ? $data['expires_in'] : 0;
$access_token = $data['access_token'] ?? '';
$refresh_token = $data['refresh_token'] ?? '';
$expires_in = $data['expires_in'] ?? 0;
if ($access_token) {
$uid = isset($data['uid']) ? $data['uid'] : '';
$uid = $data['uid'] ?? '';
//获取用户信息
$queryarr = [
"access_token" => $access_token,
@@ -91,17 +93,16 @@ class weibo
return [];
}
$userinfo = $userinfo ? $userinfo : [];
$userinfo['nickname'] = isset($userinfo['screen_name']) ? $userinfo['screen_name'] : '';
$userinfo['avatar'] = isset($userinfo['profile_image_url']) ? $userinfo['profile_image_url'] : '';
$userinfo['nickname'] = $userinfo['screen_name'] ?? '';
$userinfo['avatar'] = $userinfo['profile_image_url'] ?? '';
$userinfo['avatar'] = str_replace('http://','https://',$userinfo['avatar']);
$data = [
return [
'access_token' => $access_token,
'refresh_token' => $refresh_token,
'expires_in' => $expires_in,
'openid' => $uid,
'userinfo' => $userinfo
];
return $data;
}
}
return [];