From 2fe3e8100dcca05e22e2204cea324951afe088b2 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 9 Mar 2021 15:38:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/SysUserController.java | 7 +++++- .../dataease/service/sys/SysUserService.java | 7 ++++++ .../resources/db/migration/V8__system.sql | 2 ++ frontend/src/api/system/user.js | 2 +- frontend/src/lang/zh.js | 24 +++++++++++++++++++ frontend/src/permission.js | 2 +- frontend/src/views/system/user/index.vue | 15 ++++++------ 7 files changed, 49 insertions(+), 10 deletions(-) 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 4750140d4c..bdaeb7ed1a 100644 --- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -57,10 +57,15 @@ public class SysUserController { sysUserService.updateStatus(request); } - @ApiOperation("更新用户密码") + @ApiOperation("用户更新密码") @PostMapping("/updatePwd") public void updatePwd(@RequestBody SysUserPwdRequest request){ sysUserService.updatePwd(request); } + @ApiOperation("管理员更新密码") + @PostMapping("/adminUpdatePwd") + public void adminUpdatePwd(@RequestBody SysUserPwdRequest request){ + sysUserService.adminUpdatePwd(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 ba7f4d3fd4..70fce60ae4 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -111,6 +111,13 @@ public class SysUserService { return sysUserMapper.updateByPrimaryKeySelective(sysUser); } + public int adminUpdatePwd(SysUserPwdRequest request){ + SysUser sysUser = new SysUser(); + sysUser.setUserId(request.getUserId()); + sysUser.setPassword(CodingUtil.md5(request.getNewPassword())); + return sysUserMapper.updateByPrimaryKeySelective(sysUser); + } + /** diff --git a/backend/src/main/resources/db/migration/V8__system.sql b/backend/src/main/resources/db/migration/V8__system.sql index 435655cadd..cf284d82cd 100644 --- a/backend/src/main/resources/db/migration/V8__system.sql +++ b/backend/src/main/resources/db/migration/V8__system.sql @@ -86,6 +86,7 @@ INSERT INTO `sys_menu` VALUES (24, 11, 0, 2, '创建连接', NULL, NULL, 999, NU INSERT INTO `sys_menu` VALUES (25, 11, 0, 2, '删除连接', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'datasource:del', NULL, NULL, 1614931205899, 1614931205899); INSERT INTO `sys_menu` VALUES (26, 11, 0, 2, '编辑连接', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'datasource:edit', NULL, NULL, 1614931234105, 1614931234105); INSERT INTO `sys_menu` VALUES (27, 11, 0, 2, '校验连接', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'datasource:validate', NULL, NULL, 1614931268578, 1614931268578); +INSERT INTO `sys_menu` VALUES (28, 2, 0, 2, '修改密码', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'user:editPwd', NULL, NULL, 1615275128262, 1615275128262); COMMIT; DROP TABLE IF EXISTS `sys_role`; @@ -151,6 +152,7 @@ INSERT INTO `sys_roles_menus` VALUES (24, 3); INSERT INTO `sys_roles_menus` VALUES (25, 3); INSERT INTO `sys_roles_menus` VALUES (26, 3); INSERT INTO `sys_roles_menus` VALUES (27, 3); +INSERT INTO `sys_roles_menus` VALUES (28, 3); INSERT INTO `sys_roles_menus` VALUES (1, 4); INSERT INTO `sys_roles_menus` VALUES (2, 4); INSERT INTO `sys_roles_menus` VALUES (3, 4); diff --git a/frontend/src/api/system/user.js b/frontend/src/api/system/user.js index 248b7ddaa5..228fc1152f 100644 --- a/frontend/src/api/system/user.js +++ b/frontend/src/api/system/user.js @@ -4,7 +4,7 @@ const pathMap = { deletePath: '/api/user/delete/', createPath: '/api/user/create', updatePath: '/api/user/update', - editPasswordPath: '/api/user/updatePwd', + editPasswordPath: '/api/user/adminUpdatePwd', editStatusPath: '/api/user/updateStatus' } export function userLists(page, size, data) { diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index b069f30257..7c598c6df1 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -390,6 +390,30 @@ export default { invalid: '无效', expired: '已过期' }, + member: { + create: '添加成员', + modify: '修改成员', + delete_confirm: '这个用户确定要删除吗?', + please_choose_member: '请选择成员', + search_by_name: '根据名称搜索', + modify_personal_info: '修改个人信息', + edit_password: '修改密码', + edit_information: '编辑信息', + input_name: '请输入名称', + input_email: '请输入邮箱', + special_characters_are_not_supported: '不支持特殊字符', + mobile_number_format_is_incorrect: '手机号码格式不正确', + email_format_is_incorrect: '邮箱格式不正确', + password_format_is_incorrect: '有效密码：8-30位，英文大小写字母+数字+特殊字符（可选）', + old_password: '旧密码', + new_password: '新密码', + repeat_password: '确认密码', + inconsistent_passwords: '两次输入的密码不一致', + remove_member: '确定要移除该成员吗', + org_remove_member: '将该用户从组织中移除，将同时移除该组织下所有工作空间的权限，确定要移除该成员吗？', + input_id_or_email: '请输入用户 ID, 或者 用户邮箱', + no_such_user: '无此用户信息, 请输入正确的用户 ID 或者 用户邮箱！' + }, user: { create: '创建用户', modify: '修改用户', diff --git a/frontend/src/permission.js b/frontend/src/permission.js index b99ea5fa91..6fd47f7856 100644 --- a/frontend/src/permission.js +++ b/frontend/src/permission.js @@ -44,7 +44,7 @@ router.beforeEach(async(to, from, next) => { }) } else if (store.getters.loadMenus) { // 修改成false，防止死循环 - store.dispatch('updateLoadMenus') + store.dispatch('user/updateLoadMenus') loadMenus(next, to) } else { next() diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 6023b889e9..fa2b29878c 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -42,7 +42,7 @@