From d0f564d42996595530e542730c17d9b954ad35d6 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 25 May 2021 19:10:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E5=AF=86=E7=A0=81=EF=BC=9B?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A1=A8=E5=8D=95UI=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8Dfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/sys/SysUserService.java | 51 +++++++++++-------- frontend/src/lang/en.js | 3 +- frontend/src/lang/tw.js | 3 +- frontend/src/lang/zh.js | 5 +- frontend/src/views/system/user/form.vue | 20 +++++++- frontend/src/views/system/user/index.vue | 2 +- frontend/src/views/system/user/personPwd.vue | 8 ++- .../src/views/system/user/privateForm.vue | 2 +- 8 files changed, 64 insertions(+), 30 deletions(-) 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 208d3290a0..46f0122243 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.util.List; import java.util.stream.Collectors; @@ -48,7 +49,7 @@ public class SysUserService { private ExtSysUserMapper extSysUserMapper; - public List query(BaseGridRequest request){ + public List query(BaseGridRequest request) { GridExample gridExample = request.convertExample(); List lists = extSysUserMapper.query(gridExample); lists.forEach(item -> { @@ -60,18 +61,18 @@ public class SysUserService { } @Transactional - public int save(SysUserCreateRequest request){ + public int save(SysUserCreateRequest request) { SysUser user = BeanUtils.copyBean(new SysUser(), request); long now = System.currentTimeMillis(); user.setCreateTime(now); user.setUpdateTime(now); user.setIsAdmin(false); - if (ObjectUtils.isEmpty(user.getPassword()) || StringUtils.equals(user.getPassword(), DEFAULT_PWD)){ + if (ObjectUtils.isEmpty(user.getPassword()) || StringUtils.equals(user.getPassword(), DEFAULT_PWD)) { user.setPassword(CodingUtil.md5(DEFAULT_PWD)); - }else{ + } else { user.setPassword(CodingUtil.md5(user.getPassword())); } - if(StringUtils.isEmpty(user.getLanguage())){ + if (StringUtils.isEmpty(user.getLanguage())) { user.setLanguage("zh_CN"); } int insert = sysUserMapper.insert(user); @@ -82,29 +83,33 @@ public class SysUserService { /** * 修改用户密码清楚缓存 + * * @param request * @return */ @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId") @Transactional - public int update(SysUserCreateRequest request){ + public int update(SysUserCreateRequest request) { + if (StringUtils.isEmpty(request.getPassword())) { + request.setPassword(null); + } SysUser user = BeanUtils.copyBean(new SysUser(), request); long now = System.currentTimeMillis(); user.setUpdateTime(now); deleteUserRoles(user.getUserId());//先删除用户角色关联 saveUserRoles(user.getUserId(), request.getRoleIds());//再插入角色关联 - return sysUserMapper.updateByPrimaryKey(user); - + return sysUserMapper.updateByPrimaryKeySelective(user); } /** * 用户修改个人信息 + * * @param request * @return */ @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId") @Transactional - public int updatePersonInfo(SysUserCreateRequest request){ + public int updatePersonInfo(SysUserCreateRequest request) { SysUser user = BeanUtils.copyBean(new SysUser(), request); long now = System.currentTimeMillis(); user.setUpdateTime(now); @@ -114,7 +119,7 @@ public class SysUserService { @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId") - public int updateStatus(SysUserStateRequest request){ + public int updateStatus(SysUserStateRequest request) { SysUser sysUser = new SysUser(); sysUser.setUserId(request.getUserId()); sysUser.setEnabled(request.getEnabled()); @@ -123,6 +128,7 @@ public class SysUserService { /** * 修改用户密码清楚缓存 + * * @param request * @return */ @@ -133,7 +139,7 @@ public class SysUserService { if (ObjectUtils.isEmpty(user)) { throw new RuntimeException("用户不存在"); } - if (!StringUtils.equals(CodingUtil.md5(request.getPassword()), user.getPassword())){ + if (!StringUtils.equals(CodingUtil.md5(request.getPassword()), user.getPassword())) { throw new RuntimeException("密码错误"); } SysUser sysUser = new SysUser(); @@ -143,7 +149,7 @@ public class SysUserService { } @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId") - public int adminUpdatePwd(SysUserPwdRequest request){ + public int adminUpdatePwd(SysUserPwdRequest request) { SysUser sysUser = new SysUser(); sysUser.setUserId(request.getUserId()); sysUser.setPassword(CodingUtil.md5(request.getNewPassword())); @@ -151,13 +157,13 @@ public class SysUserService { } - /** * 删除用户角色关联 + * * @param userId * @return */ - private int deleteUserRoles(Long userId){ + private int deleteUserRoles(Long userId) { SysUsersRolesExample example = new SysUsersRolesExample(); example.createCriteria().andUserIdEqualTo(userId); return sysUsersRolesMapper.deleteByExample(example); @@ -165,10 +171,11 @@ public class SysUserService { /** * 保存用户角色关联 + * * @param userId * @param roleIds */ - private void saveUserRoles(Long userId, List roleIds){ + private void saveUserRoles(Long userId, List roleIds) { roleIds.forEach(roleId -> { SysUsersRolesKey sysUsersRolesKey = new SysUsersRolesKey(); sysUsersRolesKey.setUserId(userId); @@ -179,33 +186,33 @@ public class SysUserService { @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #userId") @Transactional - public int delete(Long userId){ + public int delete(Long userId) { deleteUserRoles(userId); return sysUserMapper.deleteByPrimaryKey(userId); } - public SysUser findOne(SysUser user){ + public SysUser findOne(SysUser user) { if (ObjectUtils.isEmpty(user)) return null; - if (ObjectUtils.isNotEmpty(user.getUserId())){ + if (ObjectUtils.isNotEmpty(user.getUserId())) { return sysUserMapper.selectByPrimaryKey(user.getUserId()); } SysUserExample example = new SysUserExample(); SysUserExample.Criteria criteria = example.createCriteria(); - if (ObjectUtils.isNotEmpty(user.getUsername())){ + if (ObjectUtils.isNotEmpty(user.getUsername())) { criteria.andUsernameEqualTo(user.getUsername()); List sysUsers = sysUserMapper.selectByExample(example); - if (CollectionUtils.isNotEmpty(sysUsers))return sysUsers.get(0); + if (CollectionUtils.isNotEmpty(sysUsers)) return sysUsers.get(0); } return null; } - public List users(List userIds){ + public List users(List userIds) { return userIds.stream().map(sysUserMapper::selectByPrimaryKey).collect(Collectors.toList()); } @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #userId") - public void setLanguage(Long userId,String language) { + public void setLanguage(Long userId, String language) { SysUser sysUser = new SysUser(); sysUser.setUserId(userId); sysUser.setLanguage(language); diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index f3de74961e..c1244c2a53 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -100,7 +100,8 @@ export default { button: 'Button', man: 'Man', woman: 'Woman', - nick_name: 'Nick Name', + nick_name: 'Name', + confirmPassword: 'Confirm Password', upload: 'Upload', cover: 'Cover', not_cover: 'Not Cover', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index dc97f01857..1de1335bef 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -99,7 +99,8 @@ export default { gender: '性別', man: '男', woman: '女', - nick_name: '暱稱', + nick_name: '姓名', + confirmPassword: '確認密碼', upload: '上傳', cover: '覆蓋', not_cover: '不覆蓋', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index fc6d405ac1..65cdebf044 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -100,7 +100,8 @@ export default { gender: '性别', man: '男', woman: '女', - nick_name: '昵称', + nick_name: '姓名', + confirmPassword: '确认密码', upload: '上传', cover: '覆盖', not_cover: '不覆盖', @@ -402,7 +403,7 @@ export default { special_characters_are_not_supported: '不支持特殊字符', mobile_number_format_is_incorrect: '手机号码格式不正确', email_format_is_incorrect: '邮箱格式不正确', - password_format_is_incorrect: '有效密码：6-30位，英文大小写字母+数字+特殊字符（可选）', + password_format_is_incorrect: '有效密码：8-30位，英文大小写字母+数字+特殊字符（可选）', old_password: '旧密码', new_password: '新密码', repeat_password: '确认密码', diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue index 878d37f99b..3e5d098110 100644 --- a/frontend/src/views/system/user/form.vue +++ b/frontend/src/views/system/user/form.vue @@ -1,7 +1,7 @@