mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复钉钉登录异常问题

Browse Source 
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson 2019-06-25 23:00:03 +08:00
parent b145cc9336
commit a669a8a670
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/common/Model/Member.php
View File

@ -136,8 +136,8 @@ class Member extends CommonModel
public static function dingtalkLogin($userInfo) public static function dingtalkLogin($userInfo)
{ {
$currentMember = getCurrentMember(); $currentMember = getCurrentMember();
$where = ['code' => $currentMember['code']];
if ($currentMember) { if ($currentMember) {
$where = ['code' => $currentMember['code']];
$currentMember = self::where($where)->find(); $currentMember = self::where($where)->find();
} }
$unionid = $userInfo['unionid']; $unionid = $userInfo['unionid'];
@ -157,7 +157,7 @@ class Member extends CommonModel
$member = self::createMember($memberData); $member = self::createMember($memberData);
} else { } else {
//已登录且未绑定，则绑定 //已登录且未绑定，则绑定
if (!$currentMember['dingtalk_unionid']) { if (!$currentMember['dingtalk_unionid'] || !$currentMember['dingtalk_userid']) {
self::update($memberData, $where); self::update($memberData, $where);
$member = self::where($where)->find(); $member = self::where($where)->find();
} }
@ -166,6 +166,9 @@ class Member extends CommonModel
if ($currentMember && $member['dingtalk_unionid'] != $currentMember['dingtalk_unionid']) { if ($currentMember && $member['dingtalk_unionid'] != $currentMember['dingtalk_unionid']) {
return error('1', '您想要绑定的第三方帐号已经被绑定给其他帐号，请先用该第三方帐号登录后，解绑释放它，再切回当前帐号发起绑定'); return error('1', '您想要绑定的第三方帐号已经被绑定给其他帐号，请先用该第三方帐号登录后，解绑释放它，再切回当前帐号发起绑定');
} }
if (!$member['dingtalk_userid']) {
self::update($memberData, ['code' => $member['code']]);
}
} }
self::login($member); self::login($member);
return $member; return $member;

23
application/index/controller/Oauth.php
View File

@ -25,6 +25,27 @@ class Oauth extends BasicApi
public function index() public function index()
{ {
$app = new Application(config('dingtalk.'));
$msg = [
'msgtype' => "oa",
'oa' => [
'message_url' => 'http://dingtalk.com',
'head' => ['bgcolor' => 'FFBBBBBB', 'title' => '消息通知'],
'body' => ['title' => '888', 'content' => '666'],
]
];
$params = [
'agent_id'=> '271863764',
'userid_list' => 'manager9168',
'msg'=> json_encode($msg)
];
$res = $app->conversation->sendCorporationMessage($params);
echo json_encode($res);die;
$userId = $app->user->getUseridByUnionid('3CnKFHEE7mX1hayPIHvpCwiEiE');
// echo json_encode($userId);die;
$userId = $userId['userid'];
$user = $app->user->get($userId, $lang = null);
echo json_encode($user);die;
} }
/** /**
@ -74,7 +95,7 @@ class Oauth extends BasicApi
'unionid' => $user['unionid'], 'unionid' => $user['unionid'],
'openid' => $user['openId'], 'openid' => $user['openId'],
'userId' => $user['userid'], 'userId' => $user['userid'],
'name' => $user['name'], 'nick' => $user['name'],
'avatar' => $user['avatar'], 'avatar' => $user['avatar'],
'mobile' => $user['mobile'], 'mobile' => $user['mobile'],
'email' => $user['email'], 'email' => $user['email'],