From c959ea4964eb804a6cf0ad59e81edc81e8b6f325 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Thu, 19 Dec 2024 14:41:23 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DashboardLayout/HeaderUser.tsx | 62 +++++++++++--------
 src/components/crud/_.js                      |  7 ++-
 src/service/apiurl.js                         |  6 +-
 src/utils/request.js                          | 12 ++++
 4 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/src/components/DashboardLayout/HeaderUser.tsx b/src/components/DashboardLayout/HeaderUser.tsx
index 3be8a430b..4baa019bf 100644
--- a/src/components/DashboardLayout/HeaderUser.tsx
+++ b/src/components/DashboardLayout/HeaderUser.tsx
@@ -9,7 +9,7 @@ import {divIcon} from "leaflet";
 import { httppost2 } from '../../utils/request';
 import apiurl from '../../service/apiurl';
 import CryptoJS from 'crypto-js';
-
+import { createCrudService } from '../../components/crud/_';
 const { SubMenu } = Menu;
 
 const HeaderUser: React.FC<{
@@ -38,26 +38,36 @@ const HeaderUser: React.FC<{
     }
   
 
-  const onFinish = async(val:any)=>{
-    if(val.newSecretKey!==val.secondSecretKey){
-      message.error('确认密码错误')
-      return
-    }
-    const params = {
-      oldSecretKey:encryptData(val.oldSecretKey),
-      newSecretKey:encryptData(val.newSecretKey),
-      secondSecretKey:encryptData(val.secondSecretKey),
-      userId: localStorage.getItem('userId')
-    }
-    const res = await httppost2(apiurl.setPassword,params)
-    if(res.code===200){
-      message.success('修改成功')
-      setTimeout(() => {
-        logout()
-      }, 1500);
-    }else{
-      message.error(res.description)
-    }
+  const onFinish = async (val: any) => {
+    const path = `${apiurl.systemM.userM.updatePassword}?oldPassword=${val.oldPassword}&newPassword=${val.newPassword}`;
+    createCrudService(path).userEdit().then((result) => {
+      if (result?.code === 200) {
+        message.success('修改成功，即将重新登录')
+        setOpen(false)
+        setTimeout(() => {
+          logout()
+        }, 1500);
+      }
+    })
+    // if(val.newSecretKey!==val.secondSecretKey){
+    //   message.error('确认密码错误')
+    //   return
+    // }
+    // const params = {
+    //   oldSecretKey:encryptData(val.oldSecretKey),
+    //   newSecretKey:encryptData(val.newSecretKey),
+    //   secondSecretKey:encryptData(val.secondSecretKey),
+    //   userId: localStorage.getItem('userId')
+    // }
+    // const res = await httppost2(apiurl.setPassword,params)
+    // if(res.code===200){
+    //   message.success('修改成功')
+    //   setTimeout(() => {
+    //     logout()
+    //   }, 1500);
+    // }else{
+    //   message.error(res.description)
+    // }
   }
   
 
@@ -90,7 +100,7 @@ const HeaderUser: React.FC<{
           </div>:null
       }
 
-      <Modal title="修改密码" open={open} onOk={()=>setOpen(false)} onCancel={()=>setOpen(false)} footer={null}>
+      <Modal destroyOnClose title="修改密码" open={open} onOk={()=>setOpen(false)} onCancel={()=>setOpen(false)} footer={null}>
         <Form
           name="basic"
           labelCol={{span: 5}}
@@ -101,23 +111,23 @@ const HeaderUser: React.FC<{
         >
           <Form.Item
             label="原密码"
-            name="oldSecretKey"
+            name="oldPassword"
             rules={[{required: true}]}>
             <Input.Password />
           </Form.Item>
           <Form.Item
             label="新密码"
-            name="newSecretKey"
+            name="newPassword"
             rules={[{required: true}]}>
             <Input.Password />
           </Form.Item>
 
-          <Form.Item
+          {/* <Form.Item
             label="确认密码"
             name="secondSecretKey"
             rules={[{required: true}]}>
             <Input.Password />
-          </Form.Item>
+          </Form.Item> */}
 
           <Form.Item
             wrapperCol={{
diff --git a/src/components/crud/_.js b/src/components/crud/_.js
index 1cf029846..58940927e 100644
--- a/src/components/crud/_.js
+++ b/src/components/crud/_.js
@@ -1,4 +1,4 @@
-import {httppost2, download, httpPostFile, httpget, httpget2,httpget6} from "../../utils/request";
+import {httppost2, download, httpPostFile, httpget, httpget2,httpget6,xyt_httpput} from "../../utils/request";
 import apiurl from "../../service/apiurl";
 import {config} from "../../config";
 
@@ -156,6 +156,10 @@ export function createCrudService(urlSet) {
     const resData = await httppost2(urlSet, params) || {};
     return resData;
   }
+  const userEdit = async (params) => {
+    const resData = await xyt_httpput(urlSet, params) || {};
+    return resData;
+  }
 
   const edit1 = async (params) => {
     const resData = await httppost2(urlSet, params) || {};
@@ -246,6 +250,7 @@ export function createCrudService(urlSet) {
     todo: todo,
     save: save,
     edit: edit,
+    userEdit,
     edit1: edit1,
     del: del,
     insert:insert,
diff --git a/src/service/apiurl.js b/src/service/apiurl.js
index f2c793bc1..fe8045cd8 100644
--- a/src/service/apiurl.js
+++ b/src/service/apiurl.js
@@ -8,7 +8,11 @@ const service_fxdd = '/gunshiApp/tsg'
 const service_xyt = '/gunshiApp/tsg'//登陆先用小玉潭
 const service_shzh = '/shzh'
 const apiurl = {
-
+  systemM: {
+    userM: {
+      updatePassword:service_xyt + '/system/user/profile/updatePwd'
+    }
+  },
   krline: {
     list: service_fxdd + "/stZvarlB/list",
     save: service_fxdd + "/stZvarlB/insert",
diff --git a/src/utils/request.js b/src/utils/request.js
index 3c6ea73f3..630a783fd 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -53,7 +53,19 @@ async function send(url, options) {
 
     return {};
 }
+export function xyt_httpput(url, data = {}) {
+    const options = {
+        method: 'PUT',
+        headers: {
+            'Content-Type': 'application/json',
+            'adcd': localStorage.getItem('ADCD6'),
+            "authorization":"Bearer" + ' ' + localStorage.getItem('access_token')
+        },
+        body: JSON.stringify(data),
+    };
 
+    return send(url, options);
+}
 export function httpget(url, data = {}) {
     const params = [];
     for (const k in data) {