blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-05-22 06:49:15 +08:00
Code Issues Projects Releases Wiki Activity

修改公众号授权

Browse Source
This commit is contained in:
Anyon 2020-09-14 12:28:50 +08:00
parent c48f7f8fb6
commit cfee872aec
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/data/controller/api/Wxapp.php
View File

@ -50,9 +50,9 @@ class Wxapp extends Controller
public function session()
{
$input = $this->_vali(['code.require' => '登录凭证code不能为空！']);
[$openid, $unionid, $sessionKey] = $this->_exchangeSessionKey($input['code']);
[$map, $data] = [['openid1' => $openid], ['openid1' => $openid, 'session_key' => $sessionKey]];
if (!empty($unionid)) [$map, $data] = [['unionid' => $unionid], array_merge(['unionid' => $unionid], $data)];
[$openid, $unionid, $sessionKey] = $this->_getSessionKey($input['code']);
$map = empty($unionid) ? ['openid1' => $openid] : ['unionid' => $unionid];
$data = array_merge($map, ['openid1' => $openid, 'session_key' => $sessionKey]);
$this->success('授权换取成功！', UserService::instance()->save($map, $data, true));
}
@ -71,7 +71,7 @@ class Wxapp extends Controller
]);
if (empty($input['session_key'])) {
if (empty($input['code'])) $this->error('登录凭证code不能为空！');
[, , $input['session_key']] = $this->_exchangeSessionKey($input['code']);
[, , $input['session_key']] = $this->_getSessionKey($input['code']);
}
$result = Crypt::instance($this->config)->decode($input['iv'], $input['session_key'], $input['encrypted']);
if (is_array($result) && isset($result['openId']) && isset($result['avatarUrl']) && isset($result['nickName'])) {
@ -96,7 +96,7 @@ class Wxapp extends Controller
* @param string $code 换取授权CODE
* @return array [openid, sessionkey]
*/
private function _exchangeSessionKey($code)
private function _getSessionKey($code)
{
try {
$cache = $this->app->cache->get($code, []);
@ -131,7 +131,7 @@ class Wxapp extends Controller
'path.require' => '跳转路径不能为空!',
]);
$result = Qrcode::instance($this->config)->createMiniPath($data['path'], $data['size']);
if (isset($data['type']) && $data['type'] === 'base64') {
if ($data['type'] === 'base64') {
$this->success('生成小程序码成功！', [
'base64' => 'data:image/png;base64,' . base64_encode($result),
]);

2
app/data/service/UserService.php
View File

@ -56,7 +56,7 @@ class UserService extends Service
{
$user = $this->app->db->name($this->table)->where($map)->where(['deleted' => 0])->find() ?: [];
unset($data['id'], $data['token'], $data['tokenv'], $data['status'], $data['deleted'], $data['create_at']);
if (empty($data) || (empty($data['phone']) && empty($data['openid']) && empty($data['unionid']))) {
if (empty($data) || (empty($data['phone'] . $data['openid1'] . $data['openid2'] . $data['unionid']))) {
unset($user['deleted'], $user['password']);
return $user;
} elseif (empty($user['id'])) {