From 4bf7bf638a38f27a913493e1588d5253565214bc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 10:09:23 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/home/index.jsx | 10 +++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/ResetPwdParam.java | 17 ++++++++
zy-asrs-flow/config/routes.ts | 8 ++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 11 ++++-
zy-asrs-flow/src/pages/User/Login/index.jsx | 4 +
zy-asrs-flow/src/pages/account/setting/components/security.jsx | 35 +++++++++++++++++
6 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-flow/config/routes.ts b/zy-asrs-flow/config/routes.ts
index 914e4f3..87c8a1b 100644
--- a/zy-asrs-flow/config/routes.ts
+++ b/zy-asrs-flow/config/routes.ts
@@ -13,7 +13,7 @@
export default [
{
path: '/',
- redirect: '/system/user',
+ redirect: '/home',
},
{
path: '/user',
@@ -27,10 +27,10 @@
],
},
{
- path: '/welcome',
- name: 'welcome',
+ path: '/home',
+ name: 'home',
icon: 'smile',
- component: './Welcome',
+ component: './home',
},
{
path: '*',
diff --git a/zy-asrs-flow/src/pages/User/Login/index.jsx b/zy-asrs-flow/src/pages/User/Login/index.jsx
index de71cd0..7a5c937 100644
--- a/zy-asrs-flow/src/pages/User/Login/index.jsx
+++ b/zy-asrs-flow/src/pages/User/Login/index.jsx
@@ -44,6 +44,7 @@
const [form] = Form.useForm();
const [loginType, setLoginType] = useState('account');
const [status, setStatus] = useState(200);
+ const [errDesc, setErrDesc] = useState('');
const [rememberMe, setRememberMe] = useState(() => {
const storedValue = localStorage.getItem('rememberMe');
return storedValue !== null ? JSON.parse(storedValue) : true;
@@ -128,6 +129,7 @@
return;
}
setStatus(r.code);
+ setErrDesc(r.msg);
} catch (error) {
console.log(error);
message.error(intl.formatMessage({
@@ -228,7 +230,7 @@
)}
{status !== 200 && loginType === 'account' && (
<LoginMessage
- content={'璐︽埛鎴栧瘑鐮侀敊璇�'}
+ content={errDesc}
/>
)}
{loginType === 'phone' && (
diff --git a/zy-asrs-flow/src/pages/account/setting/components/security.jsx b/zy-asrs-flow/src/pages/account/setting/components/security.jsx
index 0794cb0..c26f51c 100644
--- a/zy-asrs-flow/src/pages/account/setting/components/security.jsx
+++ b/zy-asrs-flow/src/pages/account/setting/components/security.jsx
@@ -7,13 +7,32 @@
import { useModel } from '@umijs/max';
import Http from '@/utils/http';
+const resetPwd = async (val) => {
+ const hide = message.loading('姝ｅ湪鏇存柊');
+ try {
+ const resp = await Http.doPost('api/user/update', val);
+ if (resp.code === 200) {
+ message.success('鏇存柊鎴愬姛');
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
+ return false;
+ } finally {
+ hide();
+ }
+};
+
const SecurityView = () => {
const [form] = Form.useForm();
const { initialState } = useModel('@@initialState');
const { currentUser } = initialState || {};
const handleFinish = (values) => {
- console.log(values);
+ resetPwd({...values, userId: currentUser.id});
}
return (
@@ -50,6 +69,14 @@
required: true,
message: '璇疯緭鍏ユ柊瀵嗙爜!',
},
+ {
+ validator(_, value) {
+ if (value.length >= 4 && value.length <= 16) {
+ return Promise.resolve();
+ }
+ return Promise.reject(new Error('鏂板瘑鐮佸繀椤绘槸4鍒�16涓瓧绗�!'));
+ },
+ },
]}
/>
<ProFormText.Password
@@ -61,6 +88,12 @@
required: true,
message: '璇峰啀娆¤緭鍏ユ柊瀵嗙爜!',
},
+ {
+ validator(_, value) {
+ if (form.getFieldValue('newPwd') === value) return Promise.resolve();
+ return Promise.reject(new Error('涓ゆ杈撳叆鐨勫瘑鐮佷笉鐩哥!'));
+ }
+ }
]}
/>
</ProForm>
diff --git a/zy-asrs-flow/src/pages/home/index.jsx b/zy-asrs-flow/src/pages/home/index.jsx
new file mode 100644
index 0000000..e4a0ad0
--- /dev/null
+++ b/zy-asrs-flow/src/pages/home/index.jsx
@@ -0,0 +1,10 @@
+
+const Home = () => {
+ return (
+ <>
+ <h1>Home</h1>
+ </>
+ )
+}
+
+export default Home;
\ No newline at end of file
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index 83f6c38..a0393b0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -9,6 +9,7 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.system.controller.param.ResetPwdParam;
import com.zy.asrs.wcs.system.entity.User;
import com.zy.asrs.wcs.system.entity.UserRole;
import com.zy.asrs.wcs.system.service.UserRoleService;
@@ -186,9 +187,13 @@
@PreAuthorize("hasAuthority('system:user:update')")
@OperationLog("閲嶇疆瀵嗙爜")
@PostMapping("/user/reset/pwd")
- public R resetPwd(@RequestBody User user) {
- if (!Cools.isEmpty(user.getPassword())) {
- user.setPassword(userService.encodePassword(user.getPassword()));
+ public R resetPwd(@RequestBody ResetPwdParam param) {
+ User user = userService.getById(param.getId());
+ if (!Cools.isEmpty(param.getOldPwd())) {
+
+ }
+ if (!Cools.isEmpty(param.getPassword())) {
+ user.setPassword(userService.encodePassword(param.getPassword()));
}
user.setUpdateBy(getLoginUserId());
user.setUpdateTime(new Date());
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/ResetPwdParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/ResetPwdParam.java
new file mode 100644
index 0000000..37bb65f
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/param/ResetPwdParam.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.wcs.system.controller.param;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2/28/2024
+ */
+@Data
+public class ResetPwdParam {
+
+ private Long id;
+
+ private String oldPwd;
+
+ private String password;
+
+}
--
Gitblit v1.9.1