基础功能、图片上传
This commit is contained in:
@@ -18,7 +18,29 @@ class AdminService extends BaseService
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
$this->selectField = [ 'id', 'phone', 'nick_name', 'avatar', 'email', 'balance', 'is_sys_notifications', 'is_collection_notifications', 'is_marketing_notifications', 'qr_code', 'role_id', 'ip', 'ip_table', 'status', 'last_reset_password_at', 'created_at', 'updated_at', 'deleted_at', ];
|
||||
$this->selectField = [
|
||||
'id',
|
||||
'open_id',
|
||||
'avatar',
|
||||
'nick_name',
|
||||
'password',
|
||||
'phone',
|
||||
'email',
|
||||
'code',
|
||||
'role_id',
|
||||
'province_id',
|
||||
'city_id',
|
||||
'reg_ip',
|
||||
'last_login_time',
|
||||
'ip',
|
||||
'ip_table',
|
||||
'operation_password',
|
||||
'desc',
|
||||
'status',
|
||||
'created_at',
|
||||
'updated_at',
|
||||
'deleted_at',
|
||||
];
|
||||
$this->model = AdminModel::class;
|
||||
$this->queryField = [
|
||||
'phone' => 'like',
|
||||
@@ -45,7 +67,6 @@ class AdminService extends BaseService
|
||||
foreach ($result['items'] as &$v) {
|
||||
$v['ip_table'] = json_decode($v['ip_table'], true);
|
||||
$v['status_text'] = UserStatusEnum::from($v['status'])->description();
|
||||
$v['last_reset_password_at'] = format_time($v['last_reset_password_at']);
|
||||
}
|
||||
|
||||
return $result;
|
||||
@@ -189,7 +210,7 @@ class AdminService extends BaseService
|
||||
{
|
||||
if ($this->roleId !== 1) {
|
||||
// 从redis获取菜单列表
|
||||
$redis = RedisService::getInstance()->init(config('xk.redis.menu_key'))->get($this->roleId);
|
||||
$redis = RedisService::getInstance()->init(config('nl.redis.menu_key'))->get($this->roleId);
|
||||
// $redis = null;
|
||||
if (!empty($redis)) {
|
||||
return json_decode($redis, true);
|
||||
@@ -232,7 +253,7 @@ class AdminService extends BaseService
|
||||
return $a['meta']['order'] - $b['meta']['order'];
|
||||
});
|
||||
// 缓存菜单列表到redis
|
||||
RedisService::getInstance()->init(config('xk.redis.menu_key'))->set($this->roleId, json_encode($result), 3600);
|
||||
RedisService::getInstance()->init(config('nl.redis.menu_key'))->set($this->roleId, json_encode($result), 3600);
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user