From 7d2840703c6c38f5a83413633f48c60cbc21053e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 21 Jun 2023 17:48:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=97=B6=E6=98=8E=E6=96=87=E4=BC=A0=E8=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/commons/license/DefaultLicenseService.java | 7 ++----- .../java/io/dataease/controller/sys/SysUserController.java | 1 - .../main/java/io/dataease/service/sys/SysUserService.java | 4 +++- frontend/src/views/system/user/PasswordUpdateForm.vue | 7 ++++--- frontend/src/views/system/user/index.vue | 3 ++- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java index bc54c5968f..9ca99f9136 100644 --- a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java +++ b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java @@ -57,18 +57,17 @@ public class DefaultLicenseService { } } - private static int runtimeExecCommand(StringBuilder result, List command) throws Exception { + private static void runtimeExecCommand(StringBuilder result, List command) throws Exception { Process proc = Runtime.getRuntime().exec(command.stream().collect(Collectors.joining(" "))); BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream(), "utf-8")); String line = null; while ((line = reader.readLine()) != null) { result.append(line).append("\n"); } - return proc.waitFor(); } - private static int execCommand(StringBuilder result, List command) throws Exception { + private static void execCommand(StringBuilder result, List command) throws Exception { ProcessBuilder builder = new ProcessBuilder(); builder.command(command); Process process = builder.start(); @@ -77,9 +76,7 @@ public class DefaultLicenseService { while ((line = bufferedReader.readLine()) != null) { result.append(line).append("\n"); } - int exitCode = process.waitFor(); command.clear(); - return exitCode; } public F2CLicenseResponse validateLicense() { diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java index 0280705821..38e335dcdd 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -154,7 +154,6 @@ public class SysUserController { @ApiOperation("更新当前用户密码") @PostMapping("/updatePwd") public void updatePwd(@RequestBody SysUserPwdRequest request) { - sysUserService.updatePwd(request); } diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java index a29e38c3cd..bd97baded8 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -383,6 +383,8 @@ public class SysUserService { */ @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId") public int updatePwd(SysUserPwdRequest request) { + request.setPassword(new String(java.util.Base64.getDecoder().decode(request.getPassword()))); + request.setNewPassword(new String(java.util.Base64.getDecoder().decode(request.getNewPassword()))); CurrentUserDto user = AuthUtils.getUser(); if (ObjectUtils.isEmpty(user)) { @@ -407,7 +409,7 @@ public class SysUserService { public int adminUpdatePwd(SysUserPwdRequest request) { SysUser sysUser = new SysUser(); sysUser.setUserId(request.getUserId()); - sysUser.setPassword(CodingUtil.md5(request.getNewPassword())); + sysUser.setPassword(CodingUtil.md5(new String(java.util.Base64.getDecoder().decode(request.getNewPassword())))); return sysUserMapper.updateByPrimaryKeySelective(sysUser); } diff --git a/frontend/src/views/system/user/PasswordUpdateForm.vue b/frontend/src/views/system/user/PasswordUpdateForm.vue index 4962649982..0803def693 100644 --- a/frontend/src/views/system/user/PasswordUpdateForm.vue +++ b/frontend/src/views/system/user/PasswordUpdateForm.vue @@ -27,6 +27,7 @@ \ No newline at end of file + diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 1c18336c32..7afbb41c7e 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -334,6 +334,7 @@ import DeLayoutContent from '@/components/business/DeLayoutContent' import { addOrder, formatOrders } from '@/utils/index' import { pluginLoaded, defaultPwd } from '@/api/user' import bus from '@/utils/bus' +import { Base64 } from 'js-base64' /* import { ldapStatus, pluginLoaded } from '@/api/user' */ import { userLists, @@ -510,7 +511,7 @@ export default { checkedCount > 0 && checkedCount < this.columnNames.length }, resetPwd(userId) { - editPassword({ userId, newPassword: this.defaultPWD }) + editPassword({ userId, newPassword: Base64.encode(this.defaultPWD) }) .then((res) => { this.$success(this.$t('commons.modify_success')) this.initSearch()