|
@@ -8,6 +8,7 @@ use App\Model\User;
|
|
|
use App\Model\UserInfo;
|
|
|
use App\Model\UserLogin;
|
|
|
use App\Model\Wechat;
|
|
|
+use App\Tools\PublicData;
|
|
|
use App\Tools\Result;
|
|
|
use Hyperf\DbConnection\Db;
|
|
|
use Hyperf\RpcServer\Annotation\RpcService;
|
|
@@ -155,8 +156,7 @@ class UserService implements UserServiceInterface
|
|
|
*/
|
|
|
public function getUserInfo(int $id): array
|
|
|
{
|
|
|
- $userInfo = Db::table('user')
|
|
|
- ->leftJoin('user_info', 'user.id', '=', 'user_info.user_id')
|
|
|
+ $userInfo = User::leftJoin('user_info', 'user.id', '=', 'user_info.user_id')
|
|
|
->leftJoin('role_user', 'role_user.user_id', '=', 'user.id')
|
|
|
->select('user.*',
|
|
|
'user_info.id as user_info_id',
|
|
@@ -195,7 +195,8 @@ class UserService implements UserServiceInterface
|
|
|
if (empty($userInfo)) {
|
|
|
return Result::error("找不到用户", 0, []);
|
|
|
}
|
|
|
-
|
|
|
+ $userInfo = $userInfo->toArray();
|
|
|
+ $userInfo['avatar'] = PublicData::getImageUrl($userInfo['avatar']);
|
|
|
return Result::success($userInfo);
|
|
|
}
|
|
|
|
|
@@ -551,7 +552,7 @@ class UserService implements UserServiceInterface
|
|
|
$updateData['nickname'] = $data['nickname'];
|
|
|
}
|
|
|
if (!empty($data['avatar'])) {
|
|
|
- $updateData['avatar'] = $data['avatar'];
|
|
|
+ $updateData['avatar'] = PublicData::saveImageUrl($data['avatar']);
|
|
|
}
|
|
|
$result = User::where($where1)->update($updateData);
|
|
|
|