diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php index 99c1fd7..cdaa385 100644 --- a/app/common/controller/UserController.php +++ b/app/common/controller/UserController.php @@ -89,7 +89,7 @@ class UserController extends BaseController $ossservice = new OssService(); $data['user']['avatar_pull'] = $data['user']['avatar']; - if(!str_contains($data['user']['avatar'], 'http') && !empty($data['user']['avatar'])){ + if(!str_contains($data['user']['avatar'], 'http') && !str_contains($data['user']['avatar'], 'www.') && !empty($data['user']['avatar'])){ $data['user']['avatar_pull'] = $ossservice->generatePrivateUrl($data['user']['avatar']); } return $data; diff --git a/app/common/logic/AuthLogic.php b/app/common/logic/AuthLogic.php index c6bab0e..da75795 100644 --- a/app/common/logic/AuthLogic.php +++ b/app/common/logic/AuthLogic.php @@ -222,7 +222,8 @@ class AuthLogic User::firstOrCreate(['union_id'=>$userInfo['data']['union_id']],[ 'union_id'=>$userInfo['data']['union_id'], 'name'=>$userInfo['data']['name'], - 'app_id'=>$data['app_id'] + 'app_id'=>$data['app_id'], + 'avatar'=>$userInfo['avatar_url'] ]); return $userInfo['data'] + $data; }