diff --git a/len-sys/src/main/resources/ftl/system/user/userList.ftl b/len-sys/src/main/resources/ftl/system/user/userList.ftl
index c45c0f022f15366f078cdbccc4ca7fa793de245e..870460cc6d89814800dcfcb21bcc5150d6d3ff7c 100644
--- a/len-sys/src/main/resources/ftl/system/user/userList.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/userList.ftl
@@ -1,112 +1,70 @@
-<#--<#include "/system/base/head.ftl">-->
+<#include "/system/base/head.ftl">
 
 <#--搜索-->
-<div class="len-head">
-    <div class="lenos-search" style="background-color: #F8F8F8">
-        <div class="search-select">
-            <@lenInclude path="/system/base/queryBox.ftl" name="用户名" id="uname" ></@lenInclude>
-            <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-            <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-            <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-            <span id="userFilter" style="display: none">
-                <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-                <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-                <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-                <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-                <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-                <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-                <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-            </span>
-
-        </div>
-
-        <#--收起 展开 begin-->
-        <@lenInclude path="/system/base/zoom.ftl" hiddenId="userFilter"></@lenInclude>
-        <#--收起 展开 end-->
-
+<div class="lenos-search">
+    <div class="search-select">
+        <@lenInclude path="/system/base/queryBox.ftl" name="用户名" id="uname" ></@lenInclude>
+        <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
     </div>
+    <#include "/system/base/searth.ftl">
+</div>
 
-    <#--按钮-->
-    <div class="layui-col-md12 len-button"
-         style="height: auto;background-color: #f8f8f8;padding: 8px 8px;display: flex">
-        <div class="layui-btn-group len-user" style="width: 100%;flex-wrap: wrap">
-            <@lenInclude path="/system/base/btn.ftl" hasPermission="user:select"
-            type="add" name="新增" icon="&#xe608;"></@lenInclude>
-            <@lenInclude path="/system/base/btn.ftl" hasPermission="user:select"
-            type="update" name="编辑" icon="&#xe642;"></@lenInclude>
-            <@lenInclude path="/system/base/btn.ftl" hasPermission="user:del"
-            type="detail" name="查看" icon="&#xe605;"></@lenInclude>
-            <@lenInclude path="/system/base/btn.ftl" hasPrmission="user:repass"
-            type="changePwd" name="修改密码" icon="&#xe605;"></@lenInclude>
-
-            <#include "/system/base/searth.ftl">
-        </div>
-
+<#--按钮-->
+<div class="layui-col-md12 len-button">
+    <div class="layui-btn-group  user-bar">
+        <@lenInclude path="/system/base/btn.ftl" hasPermission="user:select"
+        type="add" name="新建" icon="&#xe608;"></@lenInclude>
+        <@lenInclude path="/system/base/btn.ftl" hasPermission="user:select"
+        type="update" name="编辑" icon="&#xe642;"></@lenInclude>
+        <@lenInclude path="/system/base/btn.ftl" hasPermission="user:del"
+        type="detail" name="查看" icon="&#xe605;"></@lenInclude>
+        <@lenInclude path="/system/base/btn.ftl" hasPermission="user:repass"
+        type="changePwd" name="修改密码" icon="&#xe605;"></@lenInclude>
     </div>
 </div>
 
+<#--表格-->
+<table id="userList" width="100%" lay-filter="user"></table>
 
-<#--<div id="myGrid" style="width: 100%;height: 500px;" class="ag-theme-alpine"></div>-->
-<div id="myGrid" style="width: 100%;height: 500px;" class="ag-theme-balham"></div>
-
-<script>
-    //定义表格列
-    var columnDefs = [
-        { headerName: '姓名', field: 'name','pinned': 'left' },
-        { headerName: '性别', field: 'sex' },
-        { headerName: '年龄', field: 'age' },
-    ];
-
-
-    //与列对应的数据; 属性名对应上面的field
-    var data = [
-        { name: 'itxst.com', sex: '男', age: '100', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市古墩路1号' },
-        { name: '李四', sex: '女', age: '5', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '女', age: '20', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市古墩路31号' },
-        { name: '王五', sex: '女', age: '26', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市古墩路111号' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' },
-        { name: '王五', sex: '男', age: '35', 'jg': '中国', 'sf': '浙江', 'dz': '杭州市文一西路' }
-    ];
-
-    //将列和数据赋给gridOptions
-    var gridOptions = {
-        columnDefs: columnDefs,
-        // rowData: data,
-        onGridReady: function () {
-            //表格创建完成后执行的事件
-            gridOptions.api.sizeColumnsToFit();//调整表格大小自适应
-        },
-        defaultColDef: {
-            editable: false,//单元表格是否可编辑
-            enableRowGroup: true,
-            enablePivot: true,
-            enableValue: true,
-            sortable: true, //开启排序
-            resizable: true,//是否可以调整列大小，就是拖动改变列大小
-            filter: true  //开启刷选
-        },
-        pagination: true,  //开启分页（前端分页）
-        paginationAutoPageSize: true, //根据网页高度自动分页（前端分页）
-
-    };
-    //在dom加载完成后 初始化agGrid完成
-    var eGridDiv = document.querySelector('#myGrid');
-    new agGrid.Grid(eGridDiv, gridOptions);
-    gridOptions.api.setRowData(data);
+<#--toobar-->
+<script type="text/html" id="bar">
+    <@lenInclude  path="/system/base/bar.ftl" hasPermission="user:select"   name="查看" event="detail"/>
+    <@lenInclude  path="/system/base/bar.ftl" hasPermission="user:update"  name="编辑" event="edit"/>
+    <@lenInclude  path="/system/base/bar.ftl" hasPermission="user:del" name="删除" event="del"/>
+</script>
+<script type="text/html" id="switchTpl">
+    <input type="checkbox" name="sex" lay-skin="switch" lay-text="女|男" lay-filter="sexDemo">
 </script>
 
 
 <script>
     layui.use('table', function () {
+        table = layui.table;
+        //方法级渲染
+        table.render({
+            id: 'userList',
+            elem: '#userList'
+            , url: 'user/showUserList'
+            , parseData: function (res) {
+                return {
+                    "code": res.code,
+                    "msg": res.msg,
+                    "count": res.count,
+                    "data": res.data
+                };
+            }
+            , cols: [[
+                {checkbox: true, fixed: true, width: '5%'}
+                , {field: 'username', title: '用户名', width: '10%', sort: true,}
+                , {field: 'age', title: '年龄', width: '17%', sort: true}
+                , {field: 'realName', title: '真实姓名', width: '20%'}
+                , {field: 'email', title: '邮箱', width: '13%'}
+                , {field: 'right', title: '操作', width: '20%', toolbar: "#bar"}
+            ]]
+            , page: true,
+            height: 'full-100'
+        });
+
         var $ = layui.$, active = {
             data: function () {
                 return table.checkStatus('userList').data;
@@ -149,12 +107,42 @@
             changePwd: function () {
                 var data = active.data();
                 Len.onlyOne(data.length) ? Len.popup('/user/goRePass?id=' + data[0].id, '修改密码', 500, 350) : false;
+
             }
         };
 
-        Len.btnBind($('.len-user .layui-btn'), active);
-        Len.keydown(active);
-
+        /*监听表格复选框选择*/
+        table.on('checkbox(user)', function (obj) {
+        });
+
+        /*监听工具条*/
+        table.on('tool(user)', function (obj) {
+            var data = obj.data;
+            switch (obj.event) {
+                case "detail":
+                    Len.detail('/user/updateUser?id=' + data.id, '编辑用户',);
+                    break;
+                case "edit":
+                    Len.update('/user/updateUser?id=' + data.id);
+                    break;
+                case "del":
+                    layer.confirm('确定删除用户[<label style="color: #00AA91;">' + data.username + '</label>]?', {
+                        btn: ['逻辑删除', '物理删除']
+                    }, function () {
+                        Len.ajaxPost('del', {id: data.id, realDel: false}, function () {
+                            Len.success("删除成功");
+                            layui.table.reload('userList');
+                        }, data.username);
+                    }, function () {
+                        Len.ajaxPost('del', {id: data.id, realDel: true}, function () {
+                            Len.success("删除成功");
+                            layui.table.reload('userList');
+                        }, data.username);
+                    });
+            }
+        });
+        Len.btnBind($('.user-bar .layui-btn'),active);
+        Len.keydown($('.user-bar .layui-btn'),active);
     });
 </script>
 
diff --git a/len-web/src/main/resources/application-mysql-dev.yml b/len-web/src/main/resources/application-mysql-dev.yml
index 5ff6dbf83b76236cbfefd550c9a7ff90204b07b0..50dc08f5409327051e54756e10fee1e9eb70880e 100644
--- a/len-web/src/main/resources/application-mysql-dev.yml
+++ b/len-web/src/main/resources/application-mysql-dev.yml
@@ -11,7 +11,7 @@ spring:
         username: root
         password: 123456
         # 推荐使用HikariCP数据源
-        type: com.zaxxer.hikari.HikariDataSource
+        type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.jdbc.Driver
         sqlScriptEncoding: UTF-8
         hikari:
diff --git a/pom.xml b/pom.xml
index 89664d441a214f7493be186b22abbb9e9cc5307b..adadda6adfbc51f62ee0edacad02fe739279bfb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,11 +132,11 @@
 
 
 
-    <!--<dependency>
+    <dependency>
       <groupId>com.alibaba</groupId>
       <artifactId>druid</artifactId>
       <version>1.1.10</version>
-    </dependency>-->
+    </dependency>
 
     <!--mybatis spring整合包-->
    <!-- <dependency>