This commit is contained in:
2026-01-13 15:51:39 +08:00
parent c465ddd696
commit 006e6bfcc1
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -89,7 +89,7 @@ class UserController extends BaseController
$ossservice = new OssService(); $ossservice = new OssService();
$data['user']['avatar_pull'] = $data['user']['avatar']; $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']); $data['user']['avatar_pull'] = $ossservice->generatePrivateUrl($data['user']['avatar']);
} }
return $data; return $data;
+2 -1
View File
@@ -222,7 +222,8 @@ class AuthLogic
User::firstOrCreate(['union_id'=>$userInfo['data']['union_id']],[ User::firstOrCreate(['union_id'=>$userInfo['data']['union_id']],[
'union_id'=>$userInfo['data']['union_id'], 'union_id'=>$userInfo['data']['union_id'],
'name'=>$userInfo['data']['name'], 'name'=>$userInfo['data']['name'],
'app_id'=>$data['app_id'] 'app_id'=>$data['app_id'],
'avatar'=>$userInfo['avatar_url']
]); ]);
return $userInfo['data'] + $data; return $userInfo['data'] + $data;
} }