From 619a8c8d980152f3c135e409d58d4d58b623f6c8 Mon Sep 17 00:00:00 2001
From: Jimmy <Linf92@qq.com>
Date: Sun, 14 Nov 2021 23:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserInfo/Dto/ChangePassWordDto.cs         |  12 ++
 .../UserInfo/UserInfoAppService.cs            |  19 +++
 Pages/api/init.json                           |   6 +-
 Pages/page/user-password.html                 | 161 +++++++++++++-----
 4 files changed, 153 insertions(+), 45 deletions(-)
 create mode 100644 Code/src/MineTec.ProManager.Application/UserInfo/Dto/ChangePassWordDto.cs
diff --git a/Code/src/MineTec.ProManager.Application/UserInfo/Dto/ChangePassWordDto.cs b/Code/src/MineTec.ProManager.Application/UserInfo/Dto/ChangePassWordDto.cs
new file mode 100644
index 0000000..ed8684e
--- /dev/null
+++ b/Code/src/MineTec.ProManager.Application/UserInfo/Dto/ChangePassWordDto.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MineTec.ProManager.UserInfo.Dto
+{
+    public class ChangePassWordDto
+    {
+        public Guid id { get; set; } //账号id
+        public string new_password { get; set; } //新密码
+    }
+}
diff --git a/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs b/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs
index 082a74a..cc50025 100644
--- a/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs
+++ b/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs
@@ -89,5 +89,24 @@ namespace MineTec.ProManager.UserInfo
 
             return result;
         }
+
+        public OutputBase ChangePassWord(ChangePassWordDto input)
+        {
+            var result = new OutputBase();
+            try
+            {
+                var query = _UserRepository.GetAll().FirstOrDefault(a => a.Id == input.id);
+
+                query.PassWord = input.new_password;
+                result.code = 1;//1成功0失败
+            }
+            catch (Exception ex)
+            {
+                result.code = 0;
+                result.msg = ex.Message;
+            }
+
+            return result;
+        }
     }
 }
\ No newline at end of file
diff --git a/Pages/api/init.json b/Pages/api/init.json
index a921ec4..0dda825 100644
--- a/Pages/api/init.json
+++ b/Pages/api/init.json
@@ -10,13 +10,13 @@
   },
   "menuInfo": [
     {
-      "title": "图号管理",
+      "title": "项目管理",
       "icon": "fa fa-folder",
       "href": "",
       "target": "_self",
       "child": [
         {
-          "title": "特征码管理",
+          "title": "编码管理",
           "href": "",
           "icon": "fa fa-folder-open",
           "target": "_self",
@@ -42,7 +42,7 @@
           ]
         },
         {
-          "title": "图样管理",
+          "title": "图样及文件管理",
           "href": "",
           "icon": "fa fa-folder-open",
           "target": "_self",
diff --git a/Pages/page/user-password.html b/Pages/page/user-password.html
index 6ffcbc3..c0a5e42 100644
--- a/Pages/page/user-password.html
+++ b/Pages/page/user-password.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>修改密码</title>
@@ -9,63 +10,139 @@
     <link rel="stylesheet" href="../lib/layui-v2.5.5/css/layui.css" media="all">
     <link rel="stylesheet" href="../css/public.css" media="all">
     <style>
-        .layui-form-item .layui-input-company {width: auto;padding-right: 10px;line-height: 38px;}
+        .layui-form-item .layui-input-company {
+            width: auto;
+            padding-right: 10px;
+            line-height: 38px;
+        }
     </style>
 </head>
+
 <body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
+    <div class="layuimini-container">
+        <div class="layuimini-main">
 
-        <div class="layui-form layuimini-form">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">旧的密码</label>
-                <div class="layui-input-block">
-                    <input type="password" name="old_password" lay-verify="required" lay-reqtext="旧的密码不能为空" placeholder="请输入旧的密码"  value="" class="layui-input">
-                    <tip>填写自己账号的旧的密码。</tip>
+            <div class="layui-form layuimini-form">
+                <div class="layui-form-item">
+                    <label class="layui-form-label required">旧密码</label>
+                    <div class="layui-input-block">
+                        <input type="password" name="old_password" lay-verify="required" lay-reqtext="旧的密码不能为空"
+                            placeholder="请输入旧的密码" value="" class="layui-input">
+                        <tip>填写自己账号的旧的密码。</tip>
+                    </div>
                 </div>
-            </div>
 
-            <div class="layui-form-item">
-                <label class="layui-form-label required">新的密码</label>
-                <div class="layui-input-block">
-                    <input type="password" name="new_password" lay-verify="required" lay-reqtext="新的密码不能为空" placeholder="请输入新的密码"  value="" class="layui-input">
+                <div class="layui-form-item">
+                    <label class="layui-form-label required">新密码</label>
+                    <div class="layui-input-block">
+                        <input type="password" name="new_password" lay-verify="required" lay-reqtext="新的密码不能为空"
+                            placeholder="请输入新的密码" value="" class="layui-input">
+                    </div>
                 </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label required">新的密码</label>
-                <div class="layui-input-block">
-                    <input type="password" name="again_password" lay-verify="required" lay-reqtext="新的密码不能为空" placeholder="请输入新的密码"  value="" class="layui-input">
+                <div class="layui-form-item">
+                    <label class="layui-form-label required">确认新密码</label>
+                    <div class="layui-input-block">
+                        <input type="password" name="again_password" lay-verify="required" lay-reqtext="新的密码不能为空"
+                            placeholder="请输入新的密码" value="" class="layui-input">
+                    </div>
                 </div>
-            </div>
 
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+                <div class="layui-form-item">
+                    <div class="layui-input-block">
+                        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-<script src="../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
-<script src="../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
-<script>
-    layui.use(['form','miniTab'], function () {
-        var form = layui.form,
-            layer = layui.layer,
-            miniTab = layui.miniTab;
+    <script src="../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
+    <script src="../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
+    <script src="../js/md5/md5.js" charset="utf-8"></script>
+    <script src="../../js/PublicParameters/PublicParameters.js" charset="utf-8"></script>
+    <script>
+        layui.use(['form', 'miniTab'], function () {
+            var $ = layui.jquery,
+                form = layui.form,
+                layer = layui.layer,
+                miniTab = layui.miniTab;
 
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            var index = layer.alert(JSON.stringify(data.field), {
-                title: '最终的提交信息'
-            }, function () {
-                layer.close(index);
-                miniTab.deleteCurrentByIframe();
+            //监听提交
+            form.on('submit(saveBtn)', function (data) {
+                var old_password = data.field.old_password;
+                var new_password = data.field.new_password;
+                var again_password = data.field.again_password;
+
+                if (again_password != new_password) {
+                    return layer.msg('确认新密码与输入的新密码不一致，请检查!');
+                }
+
+                var CurrUserInfo = layui.sessionData('CurrUserInfo');
+                var CurrUserID = CurrUserInfo.data.userid;
+
+                //获取用户数据
+                $.ajax({
+                    url: apiUrl + "/api/services/app/UserInfo/Get", //请求的url地址
+                    dataType: "json", //返回格式为json
+                    //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
+                    data: { id: CurrUserID }, //参数值
+                    type: "GET", //请求方式
+                    success: function (req) {
+                        //请求成功时处理
+                        var data = req.result;
+                        var currpassword = data.passWord;
+                        var old_passwordToMD5 = b64_md5(old_password);
+                        if (old_passwordToMD5 != currpassword) {
+                            return layer.msg('输入的旧密码与当前账号的密码不一致，请检查!');
+                        }
+
+                        var new_passwordToMD5 = b64_md5(new_password);
+                        $.ajax({
+                            url: apiUrl + "/api/services/app/UserInfo/ChangePassWord", //请求的url地址
+                            dataType: "json", //返回格式为json
+                            //async: false,//请求是否异步，默认为异步，这也是ajax重要特性
+                            contentType: 'application/json',
+                            data: JSON.stringify({
+                                id: CurrUserID,
+                                new_password: new_passwordToMD5,
+                            }), //参数值
+                            type: "POST", //请求方式
+                            success: function (req) {
+                                //请求成功时处理
+                                layer.open({
+                                    type: 1
+                                    , offset: 'auto' //具体配置参考：offset参数项
+                                    , content: '<div style="padding: 20px 80px;">密码修改成功，请重新登录！</div>'
+                                    , btn: '确认'
+                                    , btnAlign: 'c' //按钮居中
+                                    , shade: 0 //不显示遮罩
+                                    , yes: function () {
+                                        layer.closeAll();
+                                        layui.sessionData('UserInfo', null);
+                                        layui.sessionData('CurrUserInfo', null);
+                                        window.parent.location = 'login.html';
+                                    }
+                                });
+                            },
+                            error: function () {
+                                /*错误信息处理*/
+                                layer.alert("密码修改失败，请重试！");
+                                return false;
+                            },
+                        });
+
+
+                    },
+                    error: function () {
+                        /*错误信息处理*/
+                        layer.msg("获取用户信息失败，请重试！");
+                        return false;
+                    },
+                });
+                return false;
             });
-            return false;
-        });
 
-    });
-</script>
+        });
+    </script>
 </body>
+
 </html>
\ No newline at end of file
