diff --git a/src/main/java/com/laker/admin/module/flow/SnakerflowFacetsController.java b/src/main/java/com/laker/admin/module/flow/SnakerflowFacetsController.java
index 800e8ad..4cad461 100644
--- a/src/main/java/com/laker/admin/module/flow/SnakerflowFacetsController.java
+++ b/src/main/java/com/laker/admin/module/flow/SnakerflowFacetsController.java
@@ -149,11 +149,11 @@ public class SnakerflowFacetsController {
      */
     @GetMapping("/task/todoList")
     @ApiOperation(value = "根据当前用户查询待办任务列表", tags = "流程引擎-任务")
-    public Response userTaskTodoList() {
+    public PageResponse userTaskTodoList() {
         Page<WorkItem> page = new Page<>(30);
         snakerEngineFacets.getEngine().query().getWorkItems(page,
                 new QueryFilter().setOperator(StpUtil.getLoginIdAsString()));
-        return Response.ok(page);
+        return PageResponse.ok(page.getResult(), page.getTotalCount());
     }
 
     /**
@@ -161,11 +161,11 @@ public class SnakerflowFacetsController {
      */
     @GetMapping("/task/doneList")
     @ApiOperation(value = "根据当前用户查询已办任务列表", tags = "流程引擎-任务")
-    public Response userTaskdoneList() {
+    public PageResponse userTaskdoneList() {
         Page<WorkItem> page = new Page<>(30);
         snakerEngineFacets.getEngine().query().getHistoryWorkItems(page,
                 new QueryFilter().setOperator(StpUtil.getLoginIdAsString()));
-        return Response.ok(page);
+        return PageResponse.ok(page.getResult(), page.getTotalCount());
     }
 
     @GetMapping("/task/actor/add")
@@ -236,7 +236,7 @@ public class SnakerflowFacetsController {
         return Response.ok();
     }
 
-    @RequestMapping(value = "/task/approval", method = RequestMethod.POST)
+    @RequestMapping(value = "/task/approval", method = RequestMethod.GET)
     @ApiOperation(value = "【审批任务】同意", tags = "流程引擎-任务")
     public Response doApproval(String taskId, String reason) {
         snakerEngineFacets.execute(taskId, StpUtil.getLoginIdAsString(), null);
@@ -265,6 +265,9 @@ public class SnakerflowFacetsController {
     }
 
 
+    /**
+     *   ------------------ 流程
+     */
     /**
      * 流程实例管理
      */
@@ -280,4 +283,26 @@ public class SnakerflowFacetsController {
 
         return PageResponse.ok(JSONUtil.parse(page.getResult()), page.getTotalCount());
     }
+
+
+    /**
+     * @param name
+     * @param version
+     * @param args
+     * @return
+     */
+    @ApiOperation("模拟 相关参数和 流程")
+    @PostMapping("/startAndExecute")
+    public Response startAndExecute(String name, Integer version, @RequestBody Map args) {
+        args.put("user1", StpUtil.getLoginIdAsString());
+        args.put("user2", "yang");
+        args.put("user3", "zhang");
+        Object day = args.get("day");
+        if (day != null) {
+            args.put("day", Integer.valueOf((String) day));
+        }
+
+        snakerEngineFacets.startAndExecute(name, version, StpUtil.getLoginIdAsString(), args);
+        return Response.ok();
+    }
 }
diff --git a/web/admin/component/snaker/snaker.designer.js b/web/admin/component/snaker/snaker.designer.js
index 73ee01b..43a4672 100644
--- a/web/admin/component/snaker/snaker.designer.js
+++ b/web/admin/component/snaker/snaker.designer.js
@@ -248,12 +248,12 @@
             if (!designer.config.editable) {
                 designer.util.tip(_rect, _o.props['name'].value);
             } else {
-                var returnValue = window.showModalDialog(designer.config.ctxPath + '/config/form?lookup=1', window, 'dialogWidth:1000px;dialogHeight:600px');
-                if (returnValue) {
-                    var formPath = "/config/form/use/" + returnValue;
-                    _o.props.form.value = formPath;
-                    document.getElementById("pform").innerHTML = '<input style="width:98%;" value="' + formPath + '"/>';
-                }
+                // var returnValue = window.showModalDialog(designer.config.ctxPath + '/config/form?lookup=1', window, 'dialogWidth:1000px;dialogHeight:600px');
+                // if (returnValue) {
+                //     var formPath = "/config/form/use/" + returnValue;
+                //     _o.props.form.value = formPath;
+                //     document.getElementById("pform").innerHTML = '<input style="width:98%;" value="' + formPath + '"/>';
+                // }
             }
         });
         _rect.click(function () {
@@ -262,14 +262,14 @@
             }
         });
         _rect.dblclick(function () {
-            if (designer.config.editable) {
-                var returnValue = window.showModalDialog(designer.config.ctxPath + '/config/form?lookup=1', window, 'dialogWidth:1000px;dialogHeight:600px');
-                if (returnValue) {
-                    var formPath = "/config/form/use/" + returnValue;
-                    _o.props.form.value = formPath;
-                    document.getElementById("pform").innerHTML = '<input style="width:98%;" value="' + formPath + '"/>';
-                }
-            }
+            // if (designer.config.editable) {
+            //     var returnValue = window.showModalDialog(designer.config.ctxPath + '/config/form?lookup=1', window, 'dialogWidth:1000px;dialogHeight:600px');
+            //     if (returnValue) {
+            //         var formPath = "/config/form/use/" + returnValue;
+            //         _o.props.form.value = formPath;
+            //         document.getElementById("pform").innerHTML = '<input style="width:98%;" value="' + formPath + '"/>';
+            //     }
+            // }
         });
         _img.drag(function (dx, dy) {
             dragMove(dx, dy);
diff --git a/web/admin/component/snaker/snaker.model.js b/web/admin/component/snaker/snaker.model.js
index 2e13e28..d975c94 100644
--- a/web/admin/component/snaker/snaker.model.js
+++ b/web/admin/component/snaker/snaker.model.js
@@ -112,13 +112,20 @@
                         return new snakerflow.editors.inputEditor();
                     }
                 },
-                assignee: {name: 'assignee', value: ''},
-                assigneeDisplay: {
-                    name: 'assigneeDisplay', label: '参与者', value: '', editor: function () {
-                        // return new snakerflow.editors.assigneeEditor('/dialogs/selectDialog.jsp?type=orgUserTree');
+                // assignee: {name: 'assignee', value: ''},
+                assignee: {
+                    name: 'assignee', label: '参与者', value: '', editor: function () {
                         return new snakerflow.editors.inputEditor();
                     }
-                },
+                }
+                // ,
+                // assigneeDisplay: {
+                //     name: 'assigneeDisplay', label: '参与者', value: '', editor: function () {
+                //         // return new snakerflow.editors.assigneeEditor('/dialogs/selectDialog.jsp?type=orgUserTree');
+                //         return new snakerflow.editors.inputEditor();
+                //     }
+                // }
+                ,
                 assignmentHandler: {
                     name: 'assignmentHandler', label: '参与者处理类', value: '', editor: function () {
                         return new snakerflow.editors.inputEditor();
diff --git a/web/admin/index.html b/web/admin/index.html
index 26f71b3..66d8371 100644
--- a/web/admin/index.html
+++ b/web/admin/index.html
@@ -93,17 +93,12 @@
         if (JSON.stringify(user) == "{}") {
             location.href = "login.html";
         }
-        admin.setAvatar("admin/images/avatar.jpg", "laker");
 
-        admin.setConfigType("yml");
-        admin.setConfigPath("config/pear.config.yml");
-        console.log(admin.readConfig());
-        let readConfig = admin.readConfig();
-        const menuUrl = EasyAdminContext.url + "/sys/menu/tree";
         $.ajax({
-            url: menuUrl,
+            url: EasyAdminContext.url+"/api/v1/tokenInfo",
             dataType: 'json',
-            success: function () {
+            success: function (data) {
+                admin.setAvatar("admin/images/avatar.jpg", data.data.loginId);
             },
             error: function () {
                 // 用于验证前端信息 对应到不对的会话情况
@@ -112,6 +107,15 @@
                 location.href = "login.html";
             }
         });
+
+
+
+        admin.setConfigType("yml");
+        admin.setConfigPath("config/pear.config.yml");
+        console.log(admin.readConfig());
+        let readConfig = admin.readConfig();
+        const menuUrl = EasyAdminContext.url + "/sys/menu/tree";
+
         readConfig.menu.data = menuUrl;
         admin.render(readConfig);
 
diff --git a/web/admin/view/flow/process/leave.html b/web/admin/view/flow/process/leave.html
new file mode 100644
index 0000000..3f454a6
--- /dev/null
+++ b/web/admin/view/flow/process/leave.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="../../../component/pear/css/pear.css"/>
+</head>
+<body>
+<form class="layui-form" action="">
+    <div class="mainBox">
+        <div class="main-container">
+            <div class="main-container">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">请假天数</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="day" lay-verify="number" autocomplete="off" placeholder="请输入请假天数"
+                               class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">请求理由</label>
+                    <div class="layui-input-block">
+                        <input type="text" name="leaveReason" lay-verify="title" autocomplete="off" placeholder="请输入请假理由"
+                               class="layui-textarea">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="bottom">
+        <div class="button-container">
+            <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="user-save">
+                <i class="layui-icon layui-icon-ok"></i>
+                提交
+            </button>
+            <button type="reset" class="pear-btn pear-btn-sm">
+                <i class="layui-icon layui-icon-refresh"></i>
+                重置
+            </button>
+        </div>
+    </div>
+</form>
+<script src="../../../component/layui/layui.js"></script>
+<script src="../../../component/pear/pear.js"></script>
+<script>
+    layui.use(['form', 'jquery'], function () {
+        let form = layui.form;
+        let $ = layui.jquery;
+
+        form.on('submit(user-save)', function (data) {
+            $.ajax({
+                url: EasyAdminContext.url + '/flow/startAndExecute?name=leave&version=2',
+                data: JSON.stringify(data.field),
+                dataType: 'json',
+                contentType: 'application/json',
+                type: 'post',
+                success: function (result) {
+                    if (result.success) {
+                        layer.msg(result.msg,
+                            {
+                                icon: 1,
+                                time: 1000,
+                                area: ['100px', '80px'],
+                                content: "新增成功"
+                            }
+                            , function () {
+                            });
+                    } else {
+                        layer.msg(result.msg,
+                            {icon: 2, time: 1000, area: ['100px', '80px']}
+                        );
+                    }
+                }
+            })
+            return false;
+        });
+    })
+</script>
+<script>
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/admin/view/flow/taskList.html b/web/admin/view/flow/taskList.html
new file mode 100644
index 0000000..30ae23a
--- /dev/null
+++ b/web/admin/view/flow/taskList.html
@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>任务列表</title>
+    <link rel="stylesheet" href="../../component/pear/css/pear.css"/>
+</head>
+<body class="pear-container">
+<div class="layui-card">
+    <div class="layui-card-body">
+        <div class="layui-tab layui-tab-card" lay-filter="test">
+            <ul class="layui-tab-title">
+                <li class="layui-this">待办任务</li>
+                <li>已办任务</li>
+            </ul>
+            <div class="layui-tab-content">
+                <div class="layui-tab-item layui-show">
+                    <table style="margin-top: 10px;" id="todo-list-table" lay-filter="user-table-todo"></table>
+                </div>
+                <div class="layui-tab-item">
+                    <table style="margin-top: 10px;" id="done-list-table" lay-filter="user-table-done"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+
+<script type="text/html" id="lct-bar">
+    <button class="pear-btn pear-btn-primary pear-btn-sm" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>
+    </button>
+    <!--    <button class="pear-btn pear-btn-danger pear-btn-sm" lay-event="remove"><i class="layui-icon layui-icon-delete"></i>-->
+    <!--    </button>-->
+</script>
+
+<script type="text/html" id="todo-bar">
+    <button class="pear-btn pear-btn-sm pear-btn-success" lay-event="agree"><i class="layui-icon layui-icon-ok"></i>
+    </button>
+    <button class="pear-btn pear-btn-sm pear-btn-danger" lay-event="refuse"><i class="layui-icon layui-icon-help"></i>
+    </button>
+</script>
+
+<script src="../../component/layui/layui.js"></script>
+<script src="../../component/pear/pear.js"></script>
+<script>
+    layui.use(['table', 'form', 'jquery', 'element', 'popup'], function () {
+        let table = layui.table;
+        let form = layui.form;
+        let $ = layui.jquery;
+        let element = layui.element;
+        var popup = layui.popup;
+        let todoCols = [
+            [
+                {title: '流程名称', field: 'processName', align: 'center'},
+                {title: '流程实例创建者', field: 'creator', align: 'center'},
+                {title: '流程实例创建时间', field: 'orderCreateTime', align: 'center'},
+                {title: '流程实例编号', field: 'orderNo', align: 'center'},
+                {title: '任务名称', field: 'taskName', align: 'center'},
+                {title: '任务创建时间', field: 'taskCreateTime', align: 'center'},
+                {title: '处理', toolbar: '#todo-bar', align: 'center', width: 150}
+            ]
+        ]
+
+        let doneCols = [
+            [
+                {title: '流程名称', field: 'processName', align: 'center'},
+                {title: '流程实例创建者', field: 'creator', align: 'center'},
+                {title: '流程实例创建时间', field: 'orderCreateTime', align: 'center'},
+                {title: '流程实例编号', field: 'orderNo', align: 'center'},
+                {title: '任务名称', field: 'taskName', align: 'center'},
+                {title: '任务创建时间', field: 'taskCreateTime', align: 'center'},
+                {title: '处理', toolbar: '#lct-bar', align: 'center', width: 150}
+            ]
+        ]
+
+        table.render({
+            elem: '#todo-list-table',
+            url: EasyAdminContext.url + '/flow/task/todoList',
+            page: true,
+            cols: todoCols,
+            skin: 'line',
+            toolbar: false
+        });
+
+        table.render({
+            elem: '#done-list-table',
+            url: EasyAdminContext.url + '/flow/task/doneList',
+            page: true,
+            cols: doneCols,
+            skin: 'line',
+            toolbar: false
+        });
+
+        table.on('tool(user-table-done)', function (obj) {
+            if (obj.event === 'remove') {
+                window.remove(obj);
+            } else if (obj.event === 'edit') {
+                window.edit(obj);
+            }
+        });
+
+        table.on('tool(user-table-todo)', function (obj) {
+            if (obj.event === 'agree') {
+                window.agree(obj);
+            } else if (obj.event === 'refuse') {
+                window.refuse(obj);
+            }
+        });
+
+        //监听Tab切换，以改变地址hash值
+        element.on('tab(test)', function (data) {
+            if (data.index == 0) {
+                table.reload('todo-list-table')
+            }
+
+            if (data.index == 1) {
+                table.reload('done-list-table')
+            }
+        });
+
+        window.edit = function (obj) {
+            var data = obj.data;
+            layer.open({
+                type: 2,
+                title: '查看流程图',
+                shade: 0.1,
+                area: ['980px', '500px'],
+                content: ['../flow/diagram.html?orderId=' + data.orderId + "&processId=" + data.processId, 'no']
+            });
+        }
+        form.on('submit(dict-type-query)', function (data) {
+            table.reload('dict-type-table', {where: data.field})
+            return false;
+        });
+
+        window.agree = function (obj) {
+            $.ajax({
+                url: EasyAdminContext.url + "/flow/task/approval?taskId=" + obj.data['id'],
+                dataType: 'json',
+                type: 'get',
+                success: function () {
+                    table.reload('todo-list-table')
+                }
+            })
+        }
+
+        window.refuse = function (obj) {
+            $.ajax({
+                url: EasyAdminContext.url + "/flow/task/reject?taskId=" + obj.data['id'],
+                dataType: 'json',
+                type: 'get',
+                success: function () {
+                    table.reload('todo-list-table')
+                }
+            })
+        }
+
+        window.error = function (obj) {
+            layer.open({
+                type: 1,
+                title: '异常信息',
+                shade: 0,
+                area: ['450px', '350px'],
+                content: '<div class="pear-container"><div class="layui-card"><div class="layui-card-body">' + obj.data['error'] + '</div></div></div>'
+            });
+        }
+    })
+</script>
+</html>
\ No newline at end of file