同步admin与library模型

app/admin/controller/Auth.php

@@ -16,10 +16,10 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemAuth;
-use app\admin\model\SystemNode;
 use think\admin\Controller;
 use think\admin\helper\QueryHelper;
+use think\admin\model\SystemAuth;
+use think\admin\model\SystemNode;
 use think\admin\service\AdminService;
 
 /**
@@ -49,9 +49,6 @@ class Auth extends Controller
     /**
      * 添加系统权限
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function add()
     {
@@ -61,9 +58,6 @@ class Auth extends Controller
     /**
      * 编辑系统权限
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function edit()
     {
@@ -73,7 +67,6 @@ class Auth extends Controller
     /**
      * 修改权限状态
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function state()
     {
@@ -86,7 +79,6 @@ class Auth extends Controller
     /**
      * 删除系统权限
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function remove()
     {
@@ -97,9 +89,6 @@ class Auth extends Controller
      * 权限配置节点
      * @auth true
      * @throws \ReflectionException
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function apply()
     {

app/admin/controller/Base.php

@@ -16,9 +16,9 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemBase;
 use think\admin\Controller;
 use think\admin\helper\QueryHelper;
+use think\admin\model\SystemBase;
 
 /**
  * 数据字典管理
@@ -50,9 +50,6 @@ class Base extends Controller
     /**
      * 添加数据字典
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function add()
     {
@@ -62,9 +59,6 @@ class Base extends Controller
     /**
      * 编辑数据字典
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function edit()
     {
@@ -96,7 +90,6 @@ class Base extends Controller
     /**
      * 修改数据状态
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function state()
     {
@@ -106,7 +99,6 @@ class Base extends Controller
     /**
      * 删除数据记录
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function remove()
     {

app/admin/controller/Index.php

@@ -16,8 +16,8 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemUser;
 use think\admin\Controller;
+use think\admin\model\SystemUser;
 use think\admin\service\AdminService;
 use think\admin\service\MenuService;
 

app/admin/controller/Login.php

@@ -16,9 +16,9 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemUser;
 use think\admin\Controller;
 use think\admin\extend\CodeExtend;
+use think\admin\model\SystemUser;
 use think\admin\service\AdminService;
 use think\admin\service\CaptchaService;
 use think\admin\service\SystemService;

app/admin/controller/Menu.php

@@ -16,9 +16,9 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemMenu;
 use think\admin\Controller;
 use think\admin\extend\DataExtend;
+use think\admin\model\SystemMenu;
 use think\admin\service\AdminService;
 use think\admin\service\MenuService;
 use think\admin\service\NodeService;
@@ -75,9 +75,6 @@ class Menu extends Controller
     /**
      * 添加系统菜单
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function add()
     {
@@ -88,9 +85,6 @@ class Menu extends Controller
     /**
      * 编辑系统菜单
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function edit()
     {
@@ -134,7 +128,6 @@ class Menu extends Controller
     /**
      * 修改菜单状态
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function state()
     {
@@ -148,7 +141,6 @@ class Menu extends Controller
     /**
      * 删除系统菜单
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function remove()
     {

app/admin/controller/Oplog.php

@@ -16,9 +16,11 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemOplog;
+use Exception;
+use Ip2Region;
 use think\admin\Controller;
 use think\admin\helper\QueryHelper;
+use think\admin\model\SystemOplog;
 use think\exception\HttpResponseException;
 
 /**
@@ -56,7 +58,7 @@ class Oplog extends Controller
      */
     protected function _index_page_filter(array &$data)
     {
-        $region = new \Ip2Region();
+        $region = new Ip2Region();
         foreach ($data as &$vo) {
             $isp = $region->btreeSearch($vo['geoip']);
             $vo['geoisp'] = str_replace(['内网IP', '0', '|'], '', $isp['region'] ?? '') ?: '-';
@@ -75,7 +77,7 @@ class Oplog extends Controller
             $this->success('日志清理成功！');
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error("日志清理失败，{$exception->getMessage()}");
         }
     }
@@ -83,7 +85,6 @@ class Oplog extends Controller
     /**
      * 删除系统日志
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function remove()
     {

app/admin/controller/Queue.php

@@ -16,9 +16,10 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemQueue;
+use Exception;
 use think\admin\Controller;
 use think\admin\helper\QueryHelper;
+use think\admin\model\SystemQueue;
 use think\admin\service\AdminService;
 use think\admin\service\ProcessService;
 use think\admin\service\QueueService;
@@ -80,7 +81,7 @@ class Queue extends Controller
             $this->success('任务重置成功！', $queue->code);
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error($exception->getMessage());
         }
     }
@@ -97,7 +98,6 @@ class Queue extends Controller
     /**
      * 删除系统任务
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function remove()
     {

app/admin/controller/User.php

@@ -16,11 +16,11 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\SystemAuth;
-use app\admin\model\SystemBase;
-use app\admin\model\SystemUser;
 use think\admin\Controller;
 use think\admin\helper\QueryHelper;
+use think\admin\model\SystemAuth;
+use think\admin\model\SystemBase;
+use think\admin\model\SystemUser;
 use think\admin\service\AdminService;
 use think\model\Relation;
 
@@ -70,9 +70,6 @@ class User extends Controller
     /**
      * 添加系统用户
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function add()
     {
@@ -82,9 +79,6 @@ class User extends Controller
     /**
      * 编辑系统用户
      * @auth true
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
      */
     public function edit()
     {
@@ -103,7 +97,7 @@ class User extends Controller
         $this->_applyFormToken();
         if ($this->request->isGet()) {
             $this->verify = false;
-            $this->_form(SystemUser::class, 'pass');
+            SystemUser::mForm('pass');
         } else {
             $data = $this->_vali([
                 'id.require'                  => '用户ID不能为空！',
@@ -161,7 +155,6 @@ class User extends Controller
     /**
      * 修改用户状态
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function state()
     {
@@ -175,7 +168,6 @@ class User extends Controller
     /**
      * 删除系统用户
      * @auth true
-     * @throws \think\db\exception\DbException
      */
     public function remove()
     {

app/admin/controller/api/Queue.php

@@ -16,6 +16,7 @@
 
 namespace app\admin\controller\api;
 
+use Exception;
 use think\admin\Controller;
 use think\admin\service\AdminService;
 use think\admin\service\QueueService;
@@ -61,7 +62,7 @@ class Queue extends Controller
             }
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error($exception->getMessage());
         }
     }
@@ -84,7 +85,7 @@ class Queue extends Controller
             }
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error($exception->getMessage());
         }
     }
@@ -102,7 +103,7 @@ class Queue extends Controller
             } else {
                 echo '<span class="color-red">' . $message . '</span>';
             }
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             echo '<span class="color-red">' . $exception->getMessage() . '</span>';
         } else {
             echo '<span class="color-red">只有超级管理员才能操作！</span>';

app/admin/controller/api/Runtime.php

@@ -16,8 +16,9 @@
 
 namespace app\admin\controller\api;
 
-use app\admin\model\SystemConfig;
+use Exception;
 use think\admin\Controller;
+use think\admin\model\SystemConfig;
 use think\admin\service\AdminService;
 use think\admin\service\SystemService;
 use think\exception\HttpResponseException;
@@ -43,7 +44,7 @@ class Runtime extends Controller
             $this->success('网站缓存加速成功！', 'javascript:location.reload()');
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error($exception->getMessage());
         } else {
             $this->error('只有超级管理员才能操作！');
@@ -63,7 +64,7 @@ class Runtime extends Controller
             $this->success('清空缓存日志成功！', 'javascript:location.reload()');
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error($exception->getMessage());
         } else {
             $this->error('只有超级管理员才能操作！');
@@ -111,7 +112,7 @@ class Runtime extends Controller
             $this->success('清理系统配置成功！', 'javascript:location.reload()');
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error($exception->getMessage());
         } else {
             $this->error('只有超级管理员才能操作！');

app/admin/controller/api/Upload.php

@@ -16,6 +16,7 @@
 
 namespace app\admin\controller\api;
 
+use Exception;
 use think\admin\Controller;
 use think\admin\Storage;
 use think\admin\storage\AliossStorage;
@@ -152,7 +153,7 @@ class Upload extends Controller
             }
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error($exception->getMessage());
         }
     }
@@ -198,7 +199,7 @@ class Upload extends Controller
             }
         } catch (HttpResponseException $exception) {
             throw $exception;
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->error(lang($exception->getMessage()));
         }
     }

app/admin/model/SystemAuth.php

@@ -1,73 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\admin\model;
-
-use think\admin\Model;
-
-/**
- * 用户权限模型
- * Class SystemAuth
- * @package app\admin\model
- */
-class SystemAuth extends Model
-{
-    /**
-     * 日志名称
-     * @var string
-     */
-    protected $oplogName = '系统权限';
-
-    /**
-     * 日志类型
-     * @var string
-     */
-    protected $oplogType = '系统权限管理';
-
-    /**
-     * 获取权限数据
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function items(): array
-    {
-        return $this->where(['status' => 1])->order('sort desc,id desc')->select()->toArray();
-    }
-
-    /**
-     * 删除权限事件
-     * @param string $ids
-     */
-    public function onAdminDelete(string $ids)
-    {
-        if (count($aids = str2arr($ids ?? '')) > 0) {
-            SystemNode::mk()->whereIn('auth', $aids)->delete();
-        }
-        sysoplog($this->oplogType, "删除{$this->oplogName}[{$ids}]及授权配置");
-    }
-
-    /**
-     * 格式化创建时间
-     * @param string $value
-     * @return string
-     */
-    public function getCreateAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-}

app/admin/model/SystemBase.php

@@ -1,77 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\admin\model;
-
-use think\admin\Model;
-
-/**
- * 数据字典模型
- * Class SystemBase
- * @package app\admin\model
- */
-class SystemBase extends Model
-{
-    /**
-     * 日志名称
-     * @var string
-     */
-    protected $oplogName = '数据字典';
-
-    /**
-     * 日志类型
-     * @var string
-     */
-    protected $oplogType = '数据字典管理';
-
-    /**
-     * 获取指定数据列表
-     * @param string $type 数据类型
-     * @param array $data 外围数据
-     * @param string $field 外链字段
-     * @param string $bind 绑定字段
-     * @return array
-     */
-    public function items(string $type, array &$data = [], string $field = 'base_code', string $bind = 'base_info'): array
-    {
-        $map = ['type' => $type, 'status' => 1, 'deleted' => 0];
-        $bases = $this->where($map)->order('sort desc,id asc')->column('code,name,content', 'code');
-        if (count($data) > 0) foreach ($data as &$vo) $vo[$bind] = $bases[$vo[$field]] ?? [];
-        return $bases;
-    }
-
-    /**
-     * 获取所有数据类型
-     * @param boolean $simple
-     * @return array
-     */
-    public function types(bool $simple = false): array
-    {
-        $types = $this->where(['deleted' => 0])->distinct(true)->column('type');
-        if (empty($types) && empty($simple)) $types = ['身份权限'];
-        return $types;
-    }
-
-    /**
-     * 格式化创建时间
-     * @param string $value
-     * @return string
-     */
-    public function getCreateAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-}

app/admin/model/SystemConfig.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace app\admin\model;
-
-use think\admin\Model;
-
-/**
- * 系统配置模型
- * Class SystemConfig
- * @package app\admin\model
- */
-class SystemConfig extends Model
-{
-
-}

app/admin/model/SystemMenu.php

@@ -1,49 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\admin\model;
-
-use think\admin\Model;
-
-/**
- * 系统菜单模型
- * Class SystemMenu
- * @package app\admin\model
- */
-class SystemMenu extends Model
-{
-    /**
-     * 日志名称
-     * @var string
-     */
-    protected $oplogName = '系统菜单';
-
-    /**
-     * 日志类型
-     * @var string
-     */
-    protected $oplogType = '系统菜单管理';
-
-    /**
-     * 格式化创建时间
-     * @param string $value
-     * @return string
-     */
-    public function getCreateAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-}

app/admin/model/SystemNode.php

@@ -1,43 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\admin\model;
-
-use think\admin\Model;
-
-/**
- * 授权节点模型
- * Class SystemNode
- * @package app\admin\model
- */
-class SystemNode extends Model
-{
-    /**
-     * 绑定模型名称
-     * @var string
-     */
-    protected $name = 'SystemAuthNode';
-
-    /**
-     * 格式化创建时间
-     * @param string $value
-     * @return string
-     */
-    public function getCreateAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-}

app/admin/model/SystemOplog.php

@@ -1,37 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\admin\model;
-
-use think\admin\Model;
-
-/**
- * 系统日志模型
- * Class SystemOplog
- * @package app\admin\model
- */
-class SystemOplog extends Model
-{
-    /**
-     * 格式化创建时间
-     * @param string $value
-     * @return string
-     */
-    public function getCreateAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-}

app/admin/model/SystemQueue.php

@@ -1,72 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\admin\model;
-
-use think\admin\Model;
-
-/**
- * 系统任务模型
- * Class SystemQueue
- * @package app\admin\model
- */
-class SystemQueue extends Model
-{
-    /**
-     * 格式化计划时间
-     * @param float $value
-     * @return string
-     */
-    public function getExecTimeAttr(float $value): string
-    {
-        return format_datetime($value);
-    }
-
-    /**
-     * 执行开始时间处理
-     * @param mixed $value
-     * @return string
-     */
-    public function getEnterTimeAttr($value): string
-    {
-        return floatval($value) > 0 ? format_datetime($value) : '';
-    }
-
-    /**
-     * 执行结束时间处理
-     * @param mixed $value
-     * @param array $data
-     * @return string
-     */
-    public function getOuterTimeAttr($value, array $data): string
-    {
-        if ($value > 0 && $value > $data['enter_time']) {
-            return sprintf(" %.4f 秒", $data['outer_time'] - $data['enter_time']);
-        } else {
-            return ' - ';
-        }
-    }
-
-    /**
-     * 格式化创建时间
-     * @param string $value
-     * @return string
-     */
-    public function getCreateAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-}

app/admin/model/SystemUser.php

@@ -1,92 +0,0 @@
-<?php
-
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://thinkadmin.top
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// | 免费声明 ( https://thinkadmin.top/disclaimer )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
-// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
-// +----------------------------------------------------------------------
-
-namespace app\admin\model;
-
-use think\admin\Model;
-use think\model\relation\HasOne;
-
-/**
- * 系统用户模型
- * Class SystemUser
- * @package app\admin\model
- */
-class SystemUser extends Model
-{
-    /**
-     * 日志名称
-     * @var string
-     */
-    protected $oplogName = '系统用户';
-
-    /**
-     * 日志类型
-     * @var string
-     */
-    protected $oplogType = '系统用户管理';
-
-    /**
-     * 获取用户数据
-     * @param array $map 数据查询规则
-     * @param array $data 用户数据集合
-     * @param string $field 原外连字段
-     * @param string $target 关联目标字段
-     * @param string $fields 关联数据字段
-     * @return array
-     */
-    public function items(array $map, array &$data = [], string $field = 'uuid', string $target = 'user_info', string $fields = 'username,nickname,headimg,status,is_deleted'): array
-    {
-        $query = $this->where($map)->order('sort desc,id desc');
-        if (count($data) > 0) {
-            $users = $query->whereIn('id', array_unique(array_column($data, $field)))->column($fields, 'id');
-            foreach ($data as &$vo) $vo[$target] = $users[$vo[$field]] ?? [];
-            return $users;
-        } else {
-            return $query->column($fields, 'id');
-        }
-    }
-
-    /**
-     * 关联身份权限
-     * @return HasOne
-     */
-    public function userinfo(): HasOne
-    {
-        return $this->hasOne(SystemBase::class, 'code', 'usertype')->where([
-            'type' => '身份权限', 'status' => 1, 'deleted' => 0,
-        ]);
-    }
-
-    /**
-     * 格式化登录时间
-     * @param string $value
-     * @return string
-     */
-    public function getLoginAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-
-    /**
-     * 格式化创建时间
-     * @param string $value
-     * @return string
-     */
-    public function getCreateAtAttr(string $value): string
-    {
-        return format_datetime($value);
-    }
-}

app/data/controller/user/Balance.php

@@ -2,7 +2,7 @@
 
 namespace app\data\controller\user;
 
-use app\admin\model\SystemUser;
+use think\admin\model\SystemUser;
 use app\data\model\DataUser;
 use app\data\model\DataUserBalance;
 use app\data\service\UserAdminService;