mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 21:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

PSR规范调整

Browse Source
This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
library/org/oauth/driver/github.php
View File

@@ -10,9 +10,11 @@
// +----------------------------------------------------------------------
namespace think\oauth\driver;
use think\oauth\Driver;
class Github extends Driver{
class Github extends Driver
{
/**
* 获取requestCode的api接口
* @var string
@@ -38,7 +40,8 @@ class Github extends Driver{
* @param string $method HTTP请求方法 默认为GET
* @return json
*/
public function call($api, $param = '', $method = 'GET'){
public function call($api, $param = '', $method = 'GET')
{
/* Github 调用公共参数 */
$params = [];
$header = array("Authorization: bearer {$this->token['access_token']}");
@@ -51,39 +54,45 @@ class Github extends Driver{
* 解析access_token方法请求后的返回值
* @param string $result 获取access_token的方法的返回值
*/
protected function parseToken($result){
protected function parseToken($result)
{
parse_str($result, $data);
if($data['access_token'] && $data['token_type']){
if ($data['access_token'] && $data['token_type']) {
$data['openid'] = $this->getOpenId();
return $data;
} else
} else {
throw new \Exception("获取 Github ACCESS_TOKEN出错：未知错误");
}
}
/**
* 获取当前授权应用的openid
* @return string
*/
public function getOpenId(){
if(!empty($this->token['openid']))
public function getOpenId()
{
if (!empty($this->token['openid'])) {
return $this->token['openid'];
}
$data = $this->call('user');
return !empty($data['id'])?$data['id']:null;
return !empty($data['id']) ? $data['id'] : null;
}
/**
* 获取当前登录的用户信息
* @return array
*/
public function getOauthInfo(){
$data = $this->call('user');
public function getOauthInfo()
{
$data = $this->call('user');
if(empty($data['code'])){
$userInfo['type'] = 'GITHUB';
$userInfo['name'] = $data['login'];
$userInfo['nick'] = $data['name'];
$userInfo['avatar'] = $data['avatar_url'];
if (empty($data['code'])) {
$userInfo['type'] = 'GITHUB';
$userInfo['name'] = $data['login'];
$userInfo['nick'] = $data['name'];
$userInfo['avatar'] = $data['avatar_url'];
return $userInfo;
} else {
E("获取Github用户信息失败：{$data}");