FIX [ISSUE #12093] fix reset password success but no message (#12502)

zhouchunhai · web-flow · commit f4efcf302cc6 · 2024-08-22T13:56:45.000+08:00
* FIX [ISSUE #12093] fix reset password success but no message * [ISSUE #12093] fix reset password success but no message * [ISSUE #12093] fix reset password success but no message * [ISSUE #12093] fix reset password success but no message
diff --git a/console-ui/src/layouts/Header.js b/console-ui/src/layouts/Header.js
@@ -18,7 +18,7 @@ import React from 'react';
 import { withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { ConfigProvider, Dropdown, Menu } from '@alifd/next';
+import { ConfigProvider, Dropdown, Menu, Message } from '@alifd/next';
 import siteConfig from '../config';
 import { changeLanguage } from '@/reducers/locale';
 import PasswordReset from '../pages/AuthorityControl/UserManagement/PasswordReset';
@@ -143,6 +143,9 @@ class Header extends React.Component {
           username={passwordResetUser}
           onOk={user =>
             passwordReset(user).then(res => {
+              if (res.code === 200) {
+                Message.success(locale.PasswordReset.resetSuccessfully);
+              }
               return res;
             })
           }
diff --git a/console-ui/src/locales/en-US.js b/console-ui/src/locales/en-US.js
@@ -622,6 +622,7 @@ const I18N_CONF = {
     passwordError: 'Password cannot be empty!',
     rePasswordError: 'Repeat Password cannot be empty!',
     rePasswordError2: 'Passwords are inconsistent!',
+    resetSuccessfully: 'modify password ok!',
   },
   RolesManagement: {
     roleManagement: 'Role management',
diff --git a/console-ui/src/locales/zh-CN.js b/console-ui/src/locales/zh-CN.js
@@ -617,6 +617,7 @@ const I18N_CONF = {
     rePasswordPlaceholder: '请输入确认密码',
     rePasswordError: '确认密码不能为空!',
     rePasswordError2: '两次输入密码不一致!',
+    resetSuccessfully: '修改密码成功!',
   },
   RolesManagement: {
     roleManagement: '角色管理',
diff --git a/console-ui/src/reducers/authority.js b/console-ui/src/reducers/authority.js
@@ -79,7 +79,7 @@ const deleteUser = username =>
  * @param {*} param0
  */
 const passwordReset = ([username, newPassword]) =>
-  request.put('v1/auth/users', { username, newPassword }).then(res => successMsg(res));
+  request.put('v1/auth/users', { username, newPassword });
 
 /**
  * 角色列表
diff --git a/console/src/main/resources/static/index.html b/console/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?a7f2f10835d488271566" rel="stylesheet"></head>
+<link href="./css/main.css?2f892a0d5010c7b0e94b" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?a7f2f10835d488271566"></script></body>
+<script type="text/javascript" src="./js/main.js?2f892a0d5010c7b0e94b"></script></body>
 
 </html>
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js
