diff --git a/app/adminapi/controller/CateController.php b/app/adminapi/controller/CateController.php
new file mode 100644
index 000000000..9a65c557a
--- /dev/null
+++ b/app/adminapi/controller/CateController.php
@@ -0,0 +1,454 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 勾股工作室
+ * @license https://opensource.org/licenses/GPL-3.0
+ * @link https://www.gougucms.com
+ */
+
+declare (strict_types=1);
+
+namespace app\adminapi\controller;
+
+use app\admin\BaseController;
+use app\admin\validate\FlowTypeCheck;
+use app\admin\validate\ExpenseCateCheck;
+use app\admin\validate\CostCateCheck;
+use app\admin\validate\IndustryCheck;
+use app\admin\validate\ServicesCheck;
+use app\admin\validate\WorkCateCheck;
+use app\admin\validate\InvoiceSubjectCheck;
+use think\exception\ValidateException;
+use think\facade\Db;
+use think\facade\View;
+use function app\admin\controller\add_log;
+
+class CateController extends BaseAdminController
+{
+
+    //审批类型
+    public function flow_type()
+    {
+        $cate = Db::name('FlowType')->order('id asc')->select()->toArray();
+        $type = get_config('approve.type');
+        foreach ($cate as $key => &$value) {
+            foreach ($type as $k => $val) {
+                if ($value['type'] == $val['id']) {
+                    $value['type_name'] = $val['title'];
+                }
+            }
+            $value['department'] = '全公司';
+            if ($value['department_ids'] != '') {
+                $department = Db::name('Department')->whereIn('id', $value['department_ids'])->column('title');
+                $value['department'] = implode(',', $department);
+            }
+        }
+        return to_assign(0, '', $cate);
+    }
+
+    //审批类型添加
+    public function flow_type_add()
+    {
+        $param = get_params();
+        if (!empty($param['id']) && $param['id'] > 0) {
+            $data['update_time'] = time();
+            $res = Db::name('FlowType')->strict(false)->field(true)->update($param);
+            return to_assign();
+        } else {
+            $param['create_time'] = time();
+            $insertId = Db::name('FlowType')->strict(false)->field(true)->insertGetId($param);
+            return to_assign();
+        }
+    }
+
+    //审批类型设置
+    public function flow_type_check()
+    {
+        $param = get_params();
+        $res = Db::name('FlowType')->strict(false)->field('id,status')->update($param);
+        if ($res) {
+            return to_assign();
+        } else {
+            return to_assign(0, '操作失败');
+        }
+    }
+
+    //费用类别
+    public function cost_cate()
+    {
+        if (request()->isAjax()) {
+            $cate = Db::name('CostCate')->order('create_time asc')->select();
+            return to_assign(0, '', $cate);
+        } else {
+            return view();
+        }
+    }
+
+    //费用类别添加
+    public function cost_cate_add()
+    {
+        if (request()->isAjax()) {
+            $param = get_params();
+            if (!empty($param['id']) && $param['id'] > 0) {
+                try {
+                    validate(CostCateCheck::class)->scene('edit')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $data['update_time'] = time();
+                $res = Db::name('CostCate')->strict(false)->field(true)->update($param);
+                if ($res) {
+                    add_log('edit', $param['id'], $param);
+                }
+                return to_assign();
+            } else {
+                try {
+                    validate(CostCateCheck::class)->scene('add')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $param['create_time'] = time();
+                $insertId = Db::name('CostCate')->strict(false)->field(true)->insertGetId($param);
+                if ($insertId) {
+                    add_log('add', $insertId, $param);
+                }
+                return to_assign();
+            }
+        }
+    }
+
+    //费用类别设置
+    public function cost_cate_check()
+    {
+        $param = get_params();
+        $res = Db::name('CostCate')->strict(false)->field('id,status')->update($param);
+        if ($res) {
+            if ($param['status'] == 0) {
+                add_log('disable', $param['id'], $param);
+            } else if ($param['status'] == 1) {
+                add_log('recovery', $param['id'], $param);
+            }
+            return to_assign();
+        } else {
+            return to_assign(0, '操作失败');
+        }
+    }
+
+    //报销类别
+    public function expense_cate()
+    {
+        if (request()->isAjax()) {
+            $cate = Db::name('ExpenseCate')->order('create_time asc')->select();
+            return to_assign(0, '', $cate);
+        } else {
+            return view();
+        }
+    }
+
+    //报销类别添加
+    public function expense_cate_add()
+    {
+        if (request()->isAjax()) {
+            $param = get_params();
+            if (!empty($param['id']) && $param['id'] > 0) {
+                try {
+                    validate(ExpenseCateCheck::class)->scene('edit')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $data['update_time'] = time();
+                $res = Db::name('ExpenseCate')->strict(false)->field(true)->update($param);
+                if ($res) {
+                    add_log('edit', $param['id'], $param);
+                }
+                return to_assign();
+            } else {
+                try {
+                    validate(ExpenseCateCheck::class)->scene('add')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $param['create_time'] = time();
+                $insertId = Db::name('ExpenseCate')->strict(false)->field(true)->insertGetId($param);
+                if ($insertId) {
+                    add_log('add', $insertId, $param);
+                }
+                return to_assign();
+            }
+        }
+    }
+
+    //报销类别设置
+    public function expense_cate_check()
+    {
+        $param = get_params();
+        $res = Db::name('ExpenseCate')->strict(false)->field('id,status')->update($param);
+        if ($res) {
+            if ($param['status'] == 0) {
+                add_log('disable', $param['id'], $param);
+            } else if ($param['status'] == 1) {
+                add_log('recovery', $param['id'], $param);
+            }
+            return to_assign();
+        } else {
+            return to_assign(0, '操作失败');
+        }
+    }
+
+    //发票主体
+    public function subject()
+    {
+        if (request()->isAjax()) {
+            $subject = Db::name('InvoiceSubject')->order('create_time asc')->select();
+            return to_assign(0, '', $subject);
+        } else {
+            return view();
+        }
+    }
+
+    //发票主体新建编辑
+    public function subject_add()
+    {
+        if (request()->isAjax()) {
+            $param = get_params();
+            if (!empty($param['id']) && $param['id'] > 0) {
+                try {
+                    validate(InvoiceSubjectCheck::class)->scene('edit')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $param['update_time'] = time();
+                $res = Db::name('InvoiceSubject')->strict(false)->field('title,id,update_time')->update($param);
+                if ($res) {
+                    add_log('edit', $param['id'], $param);
+                }
+                return to_assign();
+            } else {
+                try {
+                    validate(InvoiceSubjectCheck::class)->scene('add')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $param['create_time'] = time();
+                $insertId = Db::name('InvoiceSubject')->strict(false)->field('title,id,create_time')->insertGetId($param);
+                if ($insertId) {
+                    add_log('add', $insertId, $param);
+                }
+                return to_assign();
+            }
+        }
+    }
+
+    //发票主体设置
+    public function subject_check()
+    {
+        $param = get_params();
+        $res = Db::name('InvoiceSubject')->strict(false)->field('id,status')->update($param);
+        if ($res) {
+            if ($param['status'] == 0) {
+                add_log('disable', $param['id'], $param);
+            } else if ($param['status'] == 1) {
+                add_log('recovery', $param['id'], $param);
+            }
+            return to_assign();
+        } else {
+            return to_assign(0, '操作失败');
+        }
+    }
+
+    //行业类型
+    public function industry_cate()
+    {
+        if (request()->isAjax()) {
+            $cate = Db::name('Industry')->order('create_time asc')->select();
+            return to_assign(0, '', $cate);
+        } else {
+            return view();
+        }
+    }
+
+    //行业类型添加
+    public function industry_cate_add()
+    {
+        if (request()->isAjax()) {
+            $param = get_params();
+            if (!empty($param['id']) && $param['id'] > 0) {
+                try {
+                    validate(IndustryCheck::class)->scene('edit')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $data['update_time'] = time();
+                $res = Db::name('Industry')->strict(false)->field(true)->update($param);
+                if ($res) {
+                    add_log('edit', $param['id'], $param);
+                }
+                return to_assign();
+            } else {
+                try {
+                    validate(IndustryCheck::class)->scene('add')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $param['create_time'] = time();
+                $insertId = Db::name('Industry')->strict(false)->field(true)->insertGetId($param);
+                if ($insertId) {
+                    add_log('add', $insertId, $param);
+                }
+                return to_assign();
+            }
+        }
+    }
+
+    //行业类型设置
+    public function industry_cate_check()
+    {
+        $param = get_params();
+        $res = Db::name('Industry')->strict(false)->field('id,status')->update($param);
+        if ($res) {
+            if ($param['status'] == 0) {
+                add_log('disable', $param['id'], $param);
+            } else if ($param['status'] == 1) {
+                add_log('recovery', $param['id'], $param);
+            }
+            return to_assign();
+        } else {
+            return to_assign(0, '操作失败');
+        }
+    }
+
+    //服务类型
+    public function services_cate()
+    {
+        if (request()->isAjax()) {
+            $cate = Db::name('Services')->order('create_time asc')->select();
+            return to_assign(0, '', $cate);
+        } else {
+            return view();
+        }
+    }
+
+    //服务类型添加
+    public function services_cate_add()
+    {
+        if (request()->isAjax()) {
+            $param = get_params();
+            if (!empty($param['id']) && $param['id'] > 0) {
+                try {
+                    validate(ServicesCheck::class)->scene('edit')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $data['update_time'] = time();
+                $res = Db::name('Services')->strict(false)->field(true)->update($param);
+                if ($res) {
+                    add_log('edit', $param['id'], $param);
+                }
+                return to_assign();
+            } else {
+                try {
+                    validate(ServicesCheck::class)->scene('add')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $param['create_time'] = time();
+                $insertId = Db::name('Services')->strict(false)->field(true)->insertGetId($param);
+                if ($insertId) {
+                    add_log('add', $insertId, $param);
+                }
+                return to_assign();
+            }
+        }
+    }
+
+    //服务类型设置
+    public function services_cate_check()
+    {
+        $param = get_params();
+        $res = Db::name('Services')->strict(false)->field('id,status')->update($param);
+        if ($res) {
+            if ($param['status'] == 0) {
+                add_log('disable', $param['id'], $param);
+            } else if ($param['status'] == 1) {
+                add_log('recovery', $param['id'], $param);
+            }
+            return to_assign();
+        } else {
+            return to_assign(0, '操作失败');
+        }
+    }
+
+
+    //工作类别
+    public function work_cate()
+    {
+        if (request()->isAjax()) {
+            $cate = Db::name('WorkCate')->order('create_time asc')->select();
+            return to_assign(0, '', $cate);
+        } else {
+            return view();
+        }
+    }
+
+    //工作类别添加
+    public function work_cate_add()
+    {
+        if (request()->isAjax()) {
+            $param = get_params();
+            if (!empty($param['id']) && $param['id'] > 0) {
+                try {
+                    validate(WorkCateCheck::class)->scene('edit')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $data['update_time'] = time();
+                $res = Db::name('WorkCate')->strict(false)->field(true)->update($param);
+                if ($res) {
+                    add_log('edit', $param['id'], $param);
+                }
+                return to_assign();
+            } else {
+                try {
+                    validate(WorkCateCheck::class)->scene('add')->check($param);
+                } catch (ValidateException $e) {
+                    // 验证失败 输出错误信息
+                    return to_assign(1, $e->getError());
+                }
+                $param['create_time'] = time();
+                $insertId = Db::name('WorkCate')->strict(false)->field(true)->insertGetId($param);
+                if ($insertId) {
+                    add_log('add', $insertId, $param);
+                }
+                return to_assign();
+            }
+        }
+    }
+
+    //工作类别设置
+    public function work_cate_check()
+    {
+        $param = get_params();
+        $res = Db::name('WorkCate')->strict(false)->field('id,status')->update($param);
+        if ($res) {
+            if ($param['status'] == 0) {
+                add_log('disable', $param['id'], $param);
+            } else if ($param['status'] == 1) {
+                add_log('recovery', $param['id'], $param);
+            }
+            return to_assign();
+        } else {
+            return to_assign(0, '操作失败');
+        }
+    }
+
+}
diff --git a/app/adminapi/controller/TaskController.php b/app/adminapi/controller/TaskController.php
new file mode 100644
index 000000000..ea7d447c3
--- /dev/null
+++ b/app/adminapi/controller/TaskController.php
@@ -0,0 +1,224 @@
+<?php
+
+namespace app\adminapi\controller;
+
+use think\facade\Db;
+use app\common\model\user\Task;
+
+
+class TaskController extends BaseAdminController
+{
+    private $url;
+
+    //获取任务列表
+    public function list()
+    {
+        $param = get_params();
+        $param['uid'] = $this->adminId;
+        $param['page'] = $param['page'] ?? 1;
+        $param['limit'] = $param['limit'] ?? 10;
+        $list = (new Task())->list($param);
+        return to_assign(200, 'success', $list);
+    }
+
+    //新建任务
+    public function add()
+    {
+        $param = get_params();
+
+        //markdown数据处理
+        if (isset($param['table-align'])) {
+            unset($param['table-align']);
+        }
+        if (isset($param['docContent_html_code'])) {
+            $param['content'] = $param['docContent_html_code'];
+            $param['md_content'] = $param['docContent_markdown_doc'];
+            unset($param['docContent_html_code']);
+            unset($param['docContent_markdown_doc']);
+        }
+        if (isset($param['ueditorcontent'])) {
+            $param['content'] = $param['ueditorcontent'];
+            $param['md_content'] = '';
+        }
+        if (isset($param['end_time'])) {
+            $param['end_time'] = strtotime(urldecode($param['end_time']));
+            $a = $param['end_time'];
+            $b = date('d', $a) - date('d');
+            $b = $b + 1;//验收时间加1
+            $date = Strtotime(date("Y-m-d", strtotime("+1 day", $a)));//验收当天时间戳
+            $c = $b * 1;//验收小时
+            if ($c > 9) {
+                $d = (string)round($c / 9, 1);//转换成几天
+                $times = explode('.', $d);
+                $date = Strtotime(date("Y-m-d", strtotime("+$times[0] day", $a)));//验收当天时间戳
+                if (!empty($times[1]) && $times[1] == 9) {
+                    $times = $times[0] + 1;
+                    $date = Strtotime(date("Y-m-d", strtotime("+$times day", $a)));//验收当天时间戳
+                    $check_time2 = $date + 32400;//早上9点
+                } else {
+                    $check_time2 = ($date + 32400) + (3600 * $times[0]);//准确时间
+
+                }
+            } else {
+                $check_time2 = ($date + 32400) + (3600 * $c);//准确时间
+            }
+            $times3 = Strtotime(date('Y-m-t', time())) + 64800;
+            if ($check_time2 > $times3) {
+                to_assign(1, '验收时间不能大于本月月底18点 跨月时间：' . date('Y-m-d H:i:s', $check_time2));
+            }
+            $param['check_time'] = $check_time2;
+            $param['end_time'] = $param['end_time'] + 86399;
+        }
+        if (isset($param['flow_status'])) {
+            if ($param['flow_status'] == 6) {
+                $param['over_time'] = time();
+            } else {
+                $param['over_time'] = 0;
+            }
+        }
+        if (!empty($param['id']) && $param['id'] > 0) {
+            $task = (new Task())->detail($param['id']);
+            $param['update_time'] = time();
+            $param['did'] = 0;
+            $res = Task::where('id', $param['id'])->strict(false)->field(true)->update($param);
+            if ($res) {
+                if (isset($param['name']) && $param['name'] == 'end_time') {
+                    $param['real_val'] = $param['end_time'];
+                }
+                unset($param['name'], $param['real_val']);
+            }
+            return to_assign(200, '发布成功');
+        } else {
+            $param['create_time'] = time();
+            $param['admin_id'] = $this->adminId;
+            $param['type'] = 1;
+            $param['cate'] = 1;
+            $param['plan_hours'] = 1;
+            $param['accept_overtime'] = time() + (86400 * 3);
+            $param['did'] = 0;
+            if (isset($param['flow_status']) && $param['assist_check_ids'] == "") {
+                $param['assist_check_ids'] = $param['admin_id'];
+            }
+            if ($param['end_time'] == Strtotime(date('Y-m-d'))) {
+                $param['end_time'] = $param['end_time'] + 64800;
+            }
+            $param['initial_end_time'] = $param['end_time'];
+            $sid = Task::strict(false)->field(true)->insertGetId($param);
+            return to_assign(200, '发布成功');
+        }
+    }
+
+//    任务详情
+    public function read($id)
+    {
+        $detail = (new Task())->detail($id);
+        if (empty($detail)) {
+            return to_assign(1, '任务不存在');
+        } else {
+            $role_uid = [$detail['admin_id'], $detail['director_uid']];
+            $role_edit = 'view';
+            if (in_array($this->adminId, $role_uid)) {
+                $role_edit = 'edit';
+            }
+            $file_array = Db::name('FileInterfix')
+                ->field('mf.id,mf.topic_id,mf.admin_id,f.name,a.name as admin_name')
+                ->alias('mf')
+                ->join('File f', 'mf.file_id = f.id', 'LEFT')
+                ->join('Admin a', 'mf.admin_id = a.id', 'LEFT')
+                ->order('mf.create_time desc')
+                ->where(array('mf.topic_id' => $id, 'mf.module' => 'task'))
+                ->select()->toArray();
+
+            $link_array = Db::name('LinkInterfix')
+                ->field('i.id,i.topic_id,i.admin_id,i.desc,i.url,a.name as admin_name')
+                ->alias('i')
+                ->join('Admin a', 'i.admin_id = a.id', 'LEFT')
+                ->order('i.create_time desc')
+                ->where(array('i.topic_id' => $id, 'i.module' => 'task', 'a.delete_time' => 0))
+                ->select()->toArray();
+            if ($detail['is_bug'] == 0) {
+                $detail['is_bug'] = '部门工作';
+            } elseif ($detail['is_bug'] == 1) {
+                $detail['is_bug'] = '部门协助';
+            } elseif ($detail['is_bug'] == 2) {
+                $detail['is_bug'] = '临时任务';
+            }
+            $return['bohui'] = [];
+            $return['count_bohui'] = [];
+            $return['detail'] = $detail;
+            $return['file_array'] = $file_array;
+            $return['link_array'] = $link_array;
+            $return['role_edit'] = $role_edit;
+            $return['url'] = $this->url;
+            $approve_id = Db::name('flow_task')->where('task_id', $id)->value('approve_id');
+            $return['flow_nodes'] = $this->get_flow_nodes($approve_id);
+            return to_assign(200, '获取成功', $return);
+        }
+    }
+
+    //获取审核流程节点
+    public function get_flow_nodes($id = 0, $type = 1)
+    {
+        $flows = Db::name('FlowStep')->where(['action_id' => $id, 'type' => $type, 'delete_time' => 0])->order('sort asc')->select()->toArray();
+        foreach ($flows as $key => &$val) {
+            $user_id_info = Db::name('Admin')->field('id,name,thumb')->where('id', 'in', $val['flow_uids'])->select()->toArray();
+            foreach ($user_id_info as $k => &$v) {
+                $v['check_time'] = 0;
+                $v['content'] = '';
+                $v['status'] = 0;
+                $check_array = Db::name('FlowRecord')->where(['check_user_id' => $v['id'], 'step_id' => $val['id']])->order('check_time desc')->select()->toArray();
+                if (!empty($check_array)) {
+                    $checked = $check_array[0];
+                    $v['check_time'] = date('Y-m-d :H:i', $checked['check_time']);
+                    $v['content'] = $checked['content'];
+                    $v['status'] = $checked['status'];
+                }
+            }
+
+            $check_list = Db::name('FlowRecord')
+                ->field('f.*,a.name,a.thumb')
+                ->alias('f')
+                ->join('Admin a', 'a.id = f.check_user_id', 'left')
+                ->where(['f.step_id' => $val['id']])->select()->toArray();
+            foreach ($check_list as $kk => &$vv) {
+                $vv['check_time_str'] = date('Y-m-d :H:i', $vv['check_time']);
+            }
+
+            $val['user_id_info'] = $user_id_info;
+            $val['check_list'] = $check_list;
+        }
+        return $flows;
+    }
+
+    //驳回($id:审批id)
+    public function bohui($id)
+    {
+        $find = Db::name('flow_task')->where('approve_id', $id)->find();
+        if ($find) {
+            $param['create_time'] = time();
+            $param['admin_id'] = $this->adminId;
+            $param['id'] = $find['task_id'];
+            $res = Task::where('id', $param['id'])->strict(false)->field(true)->update(['flow_status' => 2, 'over_time' => 0]);
+            $comm = $param;
+            unset($comm['id']);
+            if ($res) {
+                $log_data = array(
+                    'module' => 'task',
+                    'task_id' => $param['id'],
+                    'old_content' => 3,
+                    'new_content' => 2,
+                    'field' => 'flow_status',
+                    'action' => 'edit',
+                    'admin_id' => $this->adminId,
+                    'create_time' => time(),
+                );
+                Db::name('Log')->strict(false)->field(true)->insert($log_data);
+            }
+            return to_assign(200, '驳回成功');
+        } else {
+            return to_assign(200, '驳回失败');
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/adminapi/controller/UploadController.php b/app/adminapi/controller/UploadController.php
index 1bee7dd30..59a8f15ec 100755
--- a/app/adminapi/controller/UploadController.php
+++ b/app/adminapi/controller/UploadController.php
@@ -60,4 +60,21 @@ class UploadController extends BaseAdminController
         }
     }
 
+    /**
+     * @notes 上传文件
+     * @return Json
+     * @author 段誉
+     * @date 2021/12/29 16:27
+     */
+    public function file()
+    {
+        try {
+            $cid = $this->request->post('cid', 0);
+            $result = UploadService::file($cid);
+            return $this->success('上传成功', $result);
+        } catch (Exception $e) {
+            return $this->fail($e->getMessage());
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/common.php b/app/common.php
index c714b4634..b34ae15d3 100755
--- a/app/common.php
+++ b/app/common.php
@@ -297,3 +297,150 @@ function format_amount($float)
     }
     return $float;
 }
+
+/**
+ * 间隔时间段格式化
+ * @param int $time 时间戳
+ * @param string $format 格式 【d：显示到天 i显示到分钟 s显示到秒】
+ * @return string
+ */
+function countDays($a, $b = 0)
+{
+    if ($b == 0) {
+        $b = date("Y-m-d");
+    }
+    $date_1 = $a;
+    $date_2 = $b;
+    $d1 = strtotime($date_1);
+    $d2 = strtotime($date_2);
+    $days = round(($d2 - $d1) / 3600 / 24);
+    if ($days > 0) {
+        return $days;
+    } else {
+        return 0;
+    }
+}
+
+/**
+ * 间隔时间段格式化
+ * @param int $time 时间戳
+ * @param string $format 格式 【d：显示到天 i显示到分钟 s显示到秒】
+ * @return string
+ */
+function time_trans($time, $format = 'd')
+{
+    $now = time();
+    $diff = $now - $time;
+    if ($diff < 60) {
+        return $diff . '秒前';
+    } else if ($diff < 3600) {
+        return floor($diff / 60) . '分钟前';
+    } else if ($diff < 86400) {
+        return floor($diff / 3600) . '小时前';
+    }
+    $yes_start_time = strtotime(date('Y-m-d 00:00:00', strtotime('-1 days'))); //昨天开始时间
+    $yes_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-1 days'))); //昨天结束时间
+    $two_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-2 days'))); //2天前结束时间
+    $three_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-3 days'))); //3天前结束时间
+    $four_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-4 days'))); //4天前结束时间
+    $five_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-5 days'))); //5天前结束时间
+    $six_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-6 days'))); //6天前结束时间
+    $seven_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-7 days'))); //7天前结束时间
+
+    if ($time > $yes_start_time && $time < $yes_end_time) {
+        return '昨天';
+    }
+
+    if ($time > $yes_start_time && $time < $two_end_time) {
+        return '1天前';
+    }
+
+    if ($time > $yes_start_time && $time < $three_end_time) {
+        return '2天前';
+    }
+
+    if ($time > $yes_start_time && $time < $four_end_time) {
+        return '3天前';
+    }
+
+    if ($time > $yes_start_time && $time < $five_end_time) {
+        return '4天前';
+    }
+
+    if ($time > $yes_start_time && $time < $six_end_time) {
+        return '5天前';
+    }
+
+    if ($time > $yes_start_time && $time < $seven_end_time) {
+        return '6天前';
+    }
+
+    switch ($format) {
+        case 'd':
+            $show_time = date('Y-m-d', $time);
+            break;
+        case 'i':
+            $show_time = date('Y-m-d H:i', $time);
+            break;
+        case 's':
+            $show_time = date('Y-m-d H:i:s', $time);
+            break;
+    }
+    return $show_time;
+}
+
+//获取url参数
+function get_params($key = "")
+{
+    return \think\facade\Request::instance()->param($key);
+}
+
+/**
+ * 返回json数据，用于接口
+ * @param    integer    $code
+ * @param    string     $msg
+ * @param    array      $data
+ * @param    string     $url
+ * @param    integer    $httpCode
+ * @param    array      $header
+ * @param    array      $options
+ * @return   json
+ */
+function to_assign($code = 0, $msg = "操作成功", $data = [], $url = '', $httpCode = 200, $header = [], $options = [])
+{
+    $res = ['code' => $code];
+    $res['msg'] = $msg;
+    $res['url'] = $url;
+    if (is_object($data)) {
+        $data = $data->toArray();
+    }
+    $res['data'] = $data;
+    $response = \think\Response::create($res, "json", $httpCode, $header, $options);
+    throw new \think\exception\HttpResponseException($response);
+}
+
+function get_login_admin($key = "")
+{
+//    $admin = request()->
+    $session_admin = get_config('app.session_admin');
+    if (\think\facade\Session::has($session_admin)) {
+        $gougu_admin = \think\facade\Session::get($session_admin);
+        if (!empty($key)) {
+            if (isset($gougu_admin[$key])) {
+                return $gougu_admin[$key];
+            } else {
+                return '';
+            }
+        } else {
+            return $gougu_admin;
+        }
+    } else {
+        return '';
+    }
+}
+
+//读取文件配置
+function get_config($key)
+{
+    return \think\facade\Config::get($key);
+}
\ No newline at end of file
diff --git a/app/common/service/UploadService.php b/app/common/service/UploadService.php
index 32e2bf40b..23d0f8a8b 100755
--- a/app/common/service/UploadService.php
+++ b/app/common/service/UploadService.php
@@ -39,7 +39,7 @@ class UploadService
         try {
             $config = [
                 'default' => ConfigService::get('storage', 'default', 'local'),
-                'engine'  => ConfigService::get('storage') ?? ['local'=>[]],
+                'engine' => ConfigService::get('storage') ?? ['local' => []],
             ];
 
             // 2、执行文件上传
@@ -50,11 +50,11 @@ class UploadService
 
             // 校验上传文件后缀
             if (!in_array(strtolower($fileInfo['ext']), config('project.file_image'))) {
-                throw new Exception("上传图片不允许上传". $fileInfo['ext'] . "文件");
+                throw new Exception("上传图片不允许上传" . $fileInfo['ext'] . "文件");
             }
 
             // 上传文件
-            $saveDir = $saveDir . '/' .  date('Ymd');
+            $saveDir = $saveDir . '/' . date('Ymd');
             if (!$StorageDriver->upload($saveDir)) {
                 throw new Exception($StorageDriver->getError());
             }
@@ -62,29 +62,29 @@ class UploadService
             // 3、处理文件名称
             if (strlen($fileInfo['name']) > 128) {
                 $name = substr($fileInfo['name'], 0, 123);
-                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name'])-5, strlen($fileInfo['name']));
+                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name']) - 5, strlen($fileInfo['name']));
                 $fileInfo['name'] = $name . $nameEnd;
             }
 
             // 4、写入数据库中
             $file = File::create([
-                'cid'         => $cid,
-                'type'        => FileEnum::IMAGE_TYPE,
-                'name'        => $fileInfo['name'],
-                'uri'         => $saveDir . '/' . str_replace("\\","/", $fileName),
-                'source'      => $source,
-                'source_id'   => $sourceId,
+                'cid' => $cid,
+                'type' => FileEnum::IMAGE_TYPE,
+                'name' => $fileInfo['name'],
+                'uri' => $saveDir . '/' . str_replace("\\", "/", $fileName),
+                'source' => $source,
+                'source_id' => $sourceId,
                 'create_time' => time(),
             ]);
 
             // 5、返回结果
             return [
-                'id'   => $file['id'],
-                'cid'  => $file['cid'],
+                'id' => $file['id'],
+                'cid' => $file['cid'],
                 'type' => $file['type'],
                 'name' => $file['name'],
-                'uri'  => FileService::getFileUrl($file['uri']),
-                'url'  => $file['uri']
+                'uri' => FileService::getFileUrl($file['uri']),
+                'url' => $file['uri']
             ];
 
         } catch (Exception $e) {
@@ -108,7 +108,7 @@ class UploadService
         try {
             $config = [
                 'default' => ConfigService::get('storage', 'default', 'local'),
-                'engine'  => ConfigService::get('storage') ?? ['local'=>[]],
+                'engine' => ConfigService::get('storage') ?? ['local' => []],
             ];
 
             // 2、执行文件上传
@@ -119,11 +119,11 @@ class UploadService
 
             // 校验上传文件后缀
             if (!in_array(strtolower($fileInfo['ext']), config('project.file_video'))) {
-                throw new Exception("上传视频不允许上传". $fileInfo['ext'] . "文件");
+                throw new Exception("上传视频不允许上传" . $fileInfo['ext'] . "文件");
             }
 
             // 上传文件
-            $saveDir = $saveDir . '/' .  date('Ymd');
+            $saveDir = $saveDir . '/' . date('Ymd');
             if (!$StorageDriver->upload($saveDir)) {
                 throw new Exception($StorageDriver->getError());
             }
@@ -131,29 +131,97 @@ class UploadService
             // 3、处理文件名称
             if (strlen($fileInfo['name']) > 128) {
                 $name = substr($fileInfo['name'], 0, 123);
-                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name'])-5, strlen($fileInfo['name']));
+                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name']) - 5, strlen($fileInfo['name']));
                 $fileInfo['name'] = $name . $nameEnd;
             }
 
             // 4、写入数据库中
             $file = File::create([
-                'cid'         => $cid,
-                'type'        => FileEnum::VIDEO_TYPE,
-                'name'        => $fileInfo['name'],
-                'uri'         => $saveDir . '/' . str_replace("\\","/", $fileName),
-                'source'      => $source,
-                'source_id'   => $sourceId,
+                'cid' => $cid,
+                'type' => FileEnum::VIDEO_TYPE,
+                'name' => $fileInfo['name'],
+                'uri' => $saveDir . '/' . str_replace("\\", "/", $fileName),
+                'source' => $source,
+                'source_id' => $sourceId,
                 'create_time' => time(),
             ]);
 
             // 5、返回结果
             return [
-                'id'   => $file['id'],
-                'cid'  => $file['cid'],
+                'id' => $file['id'],
+                'cid' => $file['cid'],
                 'type' => $file['type'],
                 'name' => $file['name'],
-                'uri'  => FileService::getFileUrl($file['uri']),
-                'url'  => $file['uri']
+                'uri' => FileService::getFileUrl($file['uri']),
+                'url' => $file['uri']
+            ];
+
+        } catch (Exception $e) {
+            throw new Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * @notes 上传文件
+     * @param $cid
+     * @param int $user_id
+     * @param string $saveDir
+     * @return array
+     * @throws Exception
+     * @author 段誉
+     * @date 2021/12/29 16:30
+     */
+    public static function file($cid, int $sourceId = 0, int $source = FileEnum::SOURCE_ADMIN, string $saveDir = 'uploads/files')
+    {
+        try {
+            $config = [
+                'default' => ConfigService::get('storage', 'default', 'local'),
+                'engine' => ConfigService::get('storage') ?? ['local' => []],
+            ];
+
+            // 2、执行文件上传
+            $StorageDriver = new StorageDriver($config);
+            $StorageDriver->setUploadFile('file');
+            $fileName = $StorageDriver->getFileName();
+            $fileInfo = $StorageDriver->getFileInfo();
+
+            // 校验上传文件后缀
+            if (!in_array(strtolower($fileInfo['ext']), config('project.file_file'))) {
+                throw new Exception("上传文件不允许上传" . $fileInfo['ext'] . "文件");
+            }
+
+            // 上传文件
+            $saveDir = $saveDir . '/' . date('Ymd');
+            if (!$StorageDriver->upload($saveDir)) {
+                throw new Exception($StorageDriver->getError());
+            }
+
+            // 3、处理文件名称
+            if (strlen($fileInfo['name']) > 128) {
+                $name = substr($fileInfo['name'], 0, 123);
+                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name']) - 5, strlen($fileInfo['name']));
+                $fileInfo['name'] = $name . $nameEnd;
+            }
+
+            // 4、写入数据库中
+            $file = File::create([
+                'cid' => $cid,
+                'type' => FileEnum::FILE_TYPE,
+                'name' => $fileInfo['name'],
+                'uri' => $saveDir . '/' . str_replace("\\", "/", $fileName),
+                'source' => $source,
+                'source_id' => $sourceId,
+                'create_time' => time(),
+            ]);
+
+            // 5、返回结果
+            return [
+                'id' => $file['id'],
+                'cid' => $file['cid'],
+                'type' => $file['type'],
+                'name' => $file['name'],
+                'uri' => FileService::getFileUrl($file['uri']),
+                'url' => $file['uri']
             ];
 
         } catch (Exception $e) {
diff --git a/app/common/service/storage/engine/Server.php b/app/common/service/storage/engine/Server.php
index 07bf0d517..27276e21c 100755
--- a/app/common/service/storage/engine/Server.php
+++ b/app/common/service/storage/engine/Server.php
@@ -42,7 +42,7 @@ abstract class Server
         }
 
         // 校验上传文件后缀
-        $limit = array_merge(config('project.file_image'), config('project.file_video'));
+        $limit = array_merge(config('project.file_image'), config('project.file_video'), config('project.file_file'));
         if (!in_array(strtolower($this->file->extension()), $limit)) {
             throw new Exception('不允许上传' . $this->file->extension() . '后缀文件');
         }
diff --git a/config/project.php b/config/project.php
index 3ba585da1..4c5cb0957 100755
--- a/config/project.php
+++ b/config/project.php
@@ -74,6 +74,11 @@ return [
         'wmv', 'avi', 'mpg', 'mpeg', '3gp', 'mov', 'mp4', 'flv', 'f4v', 'rmvb', 'mkv'
     ],
 
+    // 文件上传限制 (文件)
+    'file_file' => [
+        'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf', 'txt'
+    ],
+
     // 登录设置
     'login' => [
         // 登录方式：1-账号密码登录；2-手机短信验证码登录