You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2022/12/02 08:36:05 UTC
[incubator-streampark] branch change-password created (now b42ecc4a5)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a change to branch change-password
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
at b42ecc4a5 [Bug] update password bug fixed
This branch includes the following new commits:
new b42ecc4a5 [Bug] update password bug fixed
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-streampark] 01/01: [Bug] update password bug fixed
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch change-password
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit b42ecc4a5051fd8884c6c38ff5eb797d989a33bd
Author: benjobs <be...@apache.org>
AuthorDate: Fri Dec 2 16:35:40 2022 +0800
[Bug] update password bug fixed
---
.../console/system/controller/UserController.java | 6 ++----
.../apache/streampark/console/system/entity/User.java | 2 ++
.../console/system/service/UserService.java | 7 +++----
.../console/system/service/impl/UserServiceImpl.java | 18 ++++++++++++++----
.../streampark-console-webapp/src/api/system/user.ts | 3 ++-
.../header/components/user-dropdown/PasswordModal.vue | 19 +++++++++++++++----
.../src/locales/lang/en/sys.ts | 7 +++++--
.../src/locales/lang/zh-CN/sys.ts | 4 ++++
8 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index c7c003a19..5a96d38e7 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -137,11 +137,9 @@ public class UserController {
}
@PutMapping("password")
- public RestResponse updatePassword(
- @NotBlank(message = "{required}") String username,
- @NotBlank(message = "{required}") String password)
+ public RestResponse updatePassword(User user)
throws Exception {
- userService.updatePassword(username, password);
+ userService.updatePassword(user);
return RestResponse.success();
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
index 6578b0c3d..b2a18757c 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java
@@ -85,6 +85,8 @@ public class User implements Serializable {
private String avatar;
+ private transient String oldPassword;
+
private transient String sortField;
private transient String sortOrder;
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
index 360381752..b5cdfc4d7 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/UserService.java
@@ -94,11 +94,10 @@ public interface UserService extends IService<User> {
/**
* update password
- *
- * @param username user
- * @param password password
+ * @param user
+ * @throws Exception
*/
- void updatePassword(String username, String password) throws Exception;
+ void updatePassword(User user) throws Exception;
/**
* reset password
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
index 22b423777..f67d79588 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/service/impl/UserServiceImpl.java
@@ -35,6 +35,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@@ -137,14 +138,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
@Override
@Transactional(rollbackFor = Exception.class)
- public void updatePassword(String username, String password) {
- User user = new User();
+ public void updatePassword(User userParam) {
+ User user = getById(userParam.getUserId());
+ if (user == null) {
+ throw new ApiAlertException("update password failed, user is null");
+ }
+
+ String saltPassword = ShaHashUtils.encrypt(user.getSalt(), userParam.getOldPassword());
+ if (!StringUtils.equals(user.getPassword(), saltPassword)) {
+ throw new ApiAlertException("update password failed, old password error");
+ }
+
String salt = ShaHashUtils.getRandomSalt();
- password = ShaHashUtils.encrypt(salt, password);
+ String password = ShaHashUtils.encrypt(salt, userParam.getPassword());
user.setSalt(salt);
user.setPassword(password);
LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<User>()
- .eq(User::getUsername, username);
+ .eq(User::getUserId, user.getUserId());
this.baseMapper.update(user, queryWrapper);
}
diff --git a/streampark-console/streampark-console-webapp/src/api/system/user.ts b/streampark-console/streampark-console-webapp/src/api/system/user.ts
index 48af5ab90..2d6e3bc6a 100644
--- a/streampark-console/streampark-console-webapp/src/api/system/user.ts
+++ b/streampark-console/streampark-console-webapp/src/api/system/user.ts
@@ -146,7 +146,8 @@ export function fetchUserTypes() {
* @param {String} password password
*/
export function fetchUserPasswordUpdate(data: {
- username: string;
+ userId: string | number;
+ oldPassword: string;
password: string;
}): Promise<boolean> {
return defHttp.put({
diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/user-dropdown/PasswordModal.vue b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/user-dropdown/PasswordModal.vue
index ea3a8dd9c..4187464d9 100644
--- a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/user-dropdown/PasswordModal.vue
+++ b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/user-dropdown/PasswordModal.vue
@@ -45,13 +45,23 @@
component: 'Input',
render: () => h(Alert, { type: 'info', message: userStore.getUserInfo?.username }),
},
+ {
+ field: 'oldPassword',
+ label: t('sys.login.oldPassword'),
+ component: 'InputPassword',
+ itemProps: { hasFeedback: true },
+ rules: [
+ { required: true, message: t('sys.login.oldPasswordPlaceholder'), trigger: 'blur' },
+ { min: 8, message: t('system.user.form.passwordHelp'), trigger: 'blur' },
+ ],
+ },
{
field: 'password',
- label: t('sys.login.password'),
+ label: t('sys.login.newPassword'),
component: 'InputPassword',
itemProps: { hasFeedback: true },
rules: [
- { required: true, message: t('sys.login.passwordPlaceholder'), trigger: 'blur' },
+ { required: true, message: t('sys.login.newPasswordPlaceholder'), trigger: 'blur' },
{ min: 8, message: t('system.user.form.passwordHelp'), trigger: 'blur' },
],
},
@@ -84,7 +94,8 @@
changeOkLoading(true);
const formValue = await validate();
await fetchUserPasswordUpdate({
- username: userStore.getUserInfo?.username,
+ userId: userStore.getUserInfo?.userId,
+ oldPassword: formValue.oldPassword,
password: formValue.password,
});
@@ -92,7 +103,7 @@
iconType: 'success',
title: t('sys.modifyPassword.title'),
content: t('sys.modifyPassword.success'),
- okText: t('sys.logoutNow'),
+ okText: t('sys.modifyPassword.logout'),
okType: 'danger',
onOk: () => {
userStore.logout(true);
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts
index cb67ebd96..b3c9fce90 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/sys.ts
@@ -115,15 +115,18 @@ export default {
// placeholder
accountPlaceholder: 'Please input username',
passwordPlaceholder: 'Please input password',
+ oldPasswordPlaceholder: 'Please input old password',
+ newPasswordPlaceholder: 'Please input new password',
confirmPasswordPlaceholder: 'Please input confirm password',
smsPlaceholder: 'Please input sms code',
mobilePlaceholder: 'Please input mobile',
policyPlaceholder: 'Register after checking',
diffPwd: 'The two passwords are inconsistent',
-
userName: 'Username',
password: 'Password',
- confirmPassword: 'Confirm Password',
+ oldPassword: 'Old password',
+ newPassword: 'New password',
+ confirmPassword: 'Confirm password',
email: 'Email',
smsCode: 'SMS code',
mobile: 'Mobile',
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts
index 84cc5c79a..f59735142 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/sys.ts
@@ -108,6 +108,8 @@ export default {
// placeholder
accountPlaceholder: '请输入账号',
passwordPlaceholder: '请输入密码',
+ oldPasswordPlaceholder: '请输入当前密码',
+ newPasswordPlaceholder: '请输入新密码',
confirmPasswordPlaceholder: '请输入确认密码',
smsPlaceholder: '请输入验证码',
mobilePlaceholder: '请输入手机号码',
@@ -116,6 +118,8 @@ export default {
userName: '账号',
password: '密码',
+ oldPassword: '当前密码',
+ newPassword: '新密码',
confirmPassword: '确认密码',
email: '邮箱',
smsCode: '短信验证码',