From b4d2dbd68ed39bcf58c8afe50d7f5c06f14c237c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 27 二月 2023 09:51:55 +0800
Subject: [PATCH] bug修改
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index d313121..2e3e399 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -98,7 +98,6 @@
@Transactional(rollbackFor = Exception.class)
public UmsAdmin register(UmsAdminParam umsAdminParam) {
UmsAdmin umsAdmin = new UmsAdmin();
- //TODO mac,ip,鑱屽姟锛岀敤鎴风被鍨�
BeanUtils.copyProperties(umsAdminParam, umsAdmin);
umsAdmin.setCreateTime(new Date());
umsAdmin.setStatus(1);
@@ -112,6 +111,13 @@
}
//灏嗗瘑鐮佽繘琛屽姞瀵嗘搷浣�
String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());
+
+ if ( !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
+ Asserts.fail("瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝锛堝ぇ鍐欐垨鑰呭皬鍐欙級鍜屽繀椤诲寘鍚暟瀛楋紝涓嶈兘鍖呭惈绌烘牸");
+ }
+ if(umsAdmin.getUsername().equals(umsAdmin.getPassword())){
+ Asserts.fail("瀵嗙爜涓嶈兘鍜岀櫥褰曞悕瀹屽叏涓�鑷�");
+ }
umsAdmin.setPassword(encodePassword);
baseMapper.insert(umsAdmin);
@@ -137,7 +143,7 @@
}
umsRoleMenuRelations
.stream()
- .map(item->item.getMenuId())
+ .map(item -> item.getMenuId())
.collect(Collectors.toList())
.stream()
.distinct()
@@ -182,7 +188,7 @@
token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
// updateLoginTimeByUsername(username);
- insertLoginLog(username);
+ //insertLoginLog(username);
} catch (AuthenticationException e) {
LOGGER.warn("鐧诲綍寮傚父:{}", e.getMessage());
}
@@ -297,16 +303,20 @@
return umsMenuList;
}
umsMenuList = umsMenuMapper.getMenuList(adminId);
- getCacheService().setResourceList(adminId, umsMenuList);
+ getCacheService().setResourceList(adminId, umsMenuList);
return umsMenuList;
}
@Override
public int updatePassword(UpdateAdminPasswordParam param) {
- if (StrUtil.isEmpty(param.getUsername())
- || StrUtil.isEmpty(param.getOldPassword())
- || StrUtil.isEmpty(param.getNewPassword())) {
+ if (StrUtil.isNotEmpty(param.getUsername())
+ && StrUtil.isNotEmpty(param.getOldPassword())
+ && StrUtil.isNotEmpty(param.getNewPassword())
+ && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
return -1;
+ }
+ if(param.getUsername().equals(param.getNewPassword())){
+ return -4;
}
QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(UmsAdmin::getUsername, param.getUsername());
@@ -359,16 +369,16 @@
queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
}*/
UmsAdmin umsAdmin = new UmsAdmin();
- if (pageUserVO.getUserType()!=null) {
- umsAdmin.setUserType(pageUserVO.getUserType());
+ if (pageUserVO.getUserType() != null) {
+ umsAdmin.setUserType(pageUserVO.getUserType());
}
- if (pageUserVO.getKeyword()!=null&&!("".equals(pageUserVO.getKeyword()))) {
- umsAdmin.setKeyword(pageUserVO.getKeyword());
+ if (pageUserVO.getKeyword() != null && !("".equals(pageUserVO.getKeyword()))) {
+ umsAdmin.setKeyword(pageUserVO.getKeyword());
}
- if (pageUserVO.getJobTitle()!=null&&!("".equals(pageUserVO.getJobTitle()))) {
+ if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) {
umsAdmin.setJobTitle(pageUserVO.getJobTitle());
}
- Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,umsAdmin);
+ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin);
return page1;
}
--
Gitblit v1.8.0