diff --git a/src/main/java/com/pro/bus/mapper/mapper.java b/src/main/java/com/pro/bus/mapper/mapper.java
deleted file mode 100644
index df9001f409171a13b37ef9a9edef3a9042cbd1ed..0000000000000000000000000000000000000000
--- a/src/main/java/com/pro/bus/mapper/mapper.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.pro.bus.mapper;
-
-public class mapper {
-}
diff --git a/src/main/java/com/pro/bus/service/service.java b/src/main/java/com/pro/bus/service/service.java
deleted file mode 100644
index 0a4a31caec6d77560373fc0b105ffc67fd0d40dc..0000000000000000000000000000000000000000
--- a/src/main/java/com/pro/bus/service/service.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.pro.bus.service;
-
-public class service {
-}
diff --git a/src/main/web/WEB-INF/views/sys/home.jsp b/src/main/web/WEB-INF/views/sys/home.jsp
index 8eeb08a40ea168831bccb5f68d9dfe747285a262..fe2cae45aedb67450e7cb535d697e2d8b469fecc 100644
--- a/src/main/web/WEB-INF/views/sys/home.jsp
+++ b/src/main/web/WEB-INF/views/sys/home.jsp
@@ -24,6 +24,41 @@
     </style>
 </head>
 <body class="layui-layout-body">
+<!-- 修改密码窗口内容 -->
+<div style="padding: 15px; display: none;" id="dom-win-user-upwd">
+
+    <form class="layui-form" lay-filter="form-user-upwd">
+        <input type="hidden" value="${sessionScope.user.u_id}" name="u_id" />
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">输入原密码:</label>
+            <div class="layui-input-block">
+                <input type="password" name="u_old_pwd" id="u_old__pwd" required lay-verify="required"
+                       placeholder="请输入原密码" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">输入新密码:</label>
+            <div class="layui-input-block">
+                <input type="password" name="u_pwd" id="u_new_pwd" required lay-verify="required"
+                       placeholder="请输入原密码" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">确认新密码:</label>
+            <div class="layui-input-block">
+                <input type="password" name="u_cfm_pwd" id="u_cfm_pwd" required lay-verify="required"
+                       placeholder="请输入原密码" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="bn-user-do-upwd">提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+</div>
 <div class="layui-layout layui-layout-admin">
     <div class="layui-header">
         <div class="layui-logo">生产过程云管理系统</div>
@@ -34,6 +69,9 @@
                     <img src="http://t.cn/RCzsdCq" class="layui-nav-img">
                     ${sessionScope.user.u_name}
                 </a>
+                <dl class="layui-nav-child">
+                    <dd><a href="javascript:;">修改密码</a></dd>
+                </dl>
             </li>
             <li class="layui-nav-item"><a href="/logout">退了</a></li>
         </ul>
@@ -68,12 +106,95 @@
     </div>
 </div>
 <script src="../../../static/layui-2.3.0/layui.js" charset="utf-8"></script>
+<script src="../../../static/js/jquery-3.3.1.min.js"></script>
+<script src="../../../static/js/sweetalert-2.1.0.min.js"></script>
 <script>
     //JavaScript代码区域
     layui.use('element', function(){
         var element = layui.element;
 
     });
+
+    //JavaScript代码区域
+    layui.use(['element', 'table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var element = layui.element;
+        var layerIdx;
+        $('a:contains(修改密码)').click(function () {
+            form.val("form-user-upwd", {//form-cus-add是表单的lay-filter值
+                "u_old_pwd": "",
+                "u_pwd": "",
+                "u_cfm_pwd": ""
+            });
+
+
+            //form.val("form-cus-add", {}) ;
+            layerIdx = layer.open({
+                type: 1,
+                title: '修改密码',
+                area: ['800px', '540px'],
+                content: $('#dom-win-user-upwd'),
+                zIndex: 1000 //将层次降低，以使sweetalert能够在layer之上
+            });
+
+        });//修改密码窗口结束
+        //监听修改密码表单提交
+        form.on('submit(bn-user-do-upwd)', function (data) {
+            // console.log(JSON.stringify(data.field));
+            var u_old__pwd = $("#u_old__pwd").val().trim();
+            var u_new_pwd = $("#u_new_pwd").val().trim();
+            var u_cfm_pwd = $("#u_cfm_pwd").val().trim();
+            var reg=/^[0-9a-zA-Z]{6,15}$/;//6到15位字母或数字
+            var index = layer.load();
+            if(u_old__pwd!='${sessionScope.user.u_pwd}'){
+                layer.msg("原密码不正确",{icon : 5});
+                layer.close(index);
+            }else if(!reg.test(u_new_pwd)){
+                layer.msg("新密码格式不正确，必须为6到15位字母或数字",{icon : 5});
+                layer.close(index);
+            }else if(u_new_pwd!=u_cfm_pwd){
+                layer.msg("两次密码输入不一致",{icon : 5});
+                layer.close(index);
+            }else{
+                $.ajax({
+                    url: 'updateUserPwd',
+                    data: JSON.stringify(data.field),
+                    method: 'put',
+                    contentType: 'application/json;charset=UTF-8',
+                    dataType: 'json'
+                }).done(function (result) {
+                    if (result.success) {
+                        layer.closeAll();
+                        swal({
+                            text: result.message,
+                            icon: "success",
+                            buttons: false,
+                            timer: 1500
+                        });
+                    } else {
+                        layer.close(index);
+                        swal({
+                            title: result.message,
+                            icon: "error",
+                            button: "确定"
+                        });
+                    }
+                }).fail(function (xhr) {
+                    layer.close(index);
+                    swal({
+                        title: xhr.status,
+                        text: '请于管理员联系。',
+                        icon: "error",
+                        button: "确定"
+                    });
+                });
+            }
+            return false;
+        });//监听修改密码表单结束
+
+    });//layui use 结束
 </script>
 </body>
 </html>
