mirrors/buildadmin
1
0
Fork 0
mirror of https://gitee.com/wonderful-code/buildadmin synced 2024-11-21 22:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix:修复用户默认的头像URL可能被入库的问题

Browse Source
This commit is contained in:
妙码生花 2023-08-31 13:50:19 +08:00
parent 96a3f0964c
commit 1c36f210d3
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/model/Admin.php
View File

@ -5,7 +5,6 @@ namespace app\admin\model;
use ba\Random;
use think\Model;
use think\facade\Db;
use think\facade\Config;
/**
* Admin模型
@ -50,7 +49,12 @@ class Admin extends Model
public function getAvatarAttr($value): string
{
return full_url($value, true, Config::get('buildadmin.default_avatar'));
return full_url($value, true, config('buildadmin.default_avatar'));
}
public function setAvatarAttr($value): string
{
return $value == full_url($value, true, config('buildadmin.default_avatar')) ? '' : $value;
}
public function getLastLoginTimeAttr($value): string

7
app/admin/model/User.php
View File

@ -15,7 +15,12 @@ class User extends Model
public function getAvatarAttr($value): string
{
return htmlspecialchars_decode($value);
return full_url($value, true, config('buildadmin.default_avatar'));
}
public function setAvatarAttr($value): string
{
return $value == full_url($value, true, config('buildadmin.default_avatar')) ? '' : $value;
}
public function getMoneyAttr($value): string

12
app/api/controller/Account.php
View File

@ -58,15 +58,17 @@ class Account extends Frontend
$data = $this->request->only(['id', 'avatar', 'username', 'nickname', 'gender', 'birthday', 'motto']);
if (!isset($data['birthday'])) $data['birthday'] = null;
// 避免默认头像入库
if (isset($data['avatar']) && $data['avatar'] == full_url('', true, config('buildadmin.default_avatar'))) unset($data['avatar']);
try {
$validate = new AccountValidate();
$validate->scene('edit')->check($data);
} catch (Throwable $e) {
$this->error($e->getMessage());
}
$model = $this->auth->getUser();
$model->startTrans();
try {
$validate = new AccountValidate();
$validate->scene('edit')->check($data);
$model->where('id', $this->auth->id)->update($data);
$model->save($data);
$model->commit();
} catch (Throwable $e) {
$model->rollback();

8
app/common/model/User.php
View File

@ -4,7 +4,6 @@ namespace app\common\model;
use ba\Random;
use think\Model;
use think\facade\Config;
/**
* 会员公共模型
@ -23,7 +22,12 @@ class User extends Model
public function getAvatarAttr($value): string
{
return full_url(htmlspecialchars_decode($value), true, Config::get('buildadmin.default_avatar'));
return full_url($value, true, config('buildadmin.default_avatar'));
}
public function setAvatarAttr($value): string
{
return $value == full_url($value, true, config('buildadmin.default_avatar')) ? '' : $value;
}
public function resetPassword($uid, $newPassword): int|User