LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复+代码调整+日志优化

Browse Source
This commit is contained in:
MaxKey
2024-09-29 07:10:13 +08:00
parent 65bc8c01b9
commit 8fe411648d
55 changed files with 724 additions and 5990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/LoginRepository.java
View File

@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.constants.ConstsRoles;
import org.dromara.maxkey.constants.ConstsStatus;
@@ -88,7 +88,7 @@ public class LoginRepository {
listUserInfo = findByUsernameOrMobileOrEmail(username,password);
}
_logger.debug("load UserInfo : {}" , listUserInfo);
return (ObjectUtils.isNotEmpty(listUserInfo))? listUserInfo.get(0) : null;
return (CollectionUtils.isNotEmpty(listUserInfo) ? listUserInfo.get(0) : null);
}
public List<UserInfo> findByUsername(String username, String password) {

20
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/PasswordPolicyValidator.java
View File

@@ -217,13 +217,13 @@ public class PasswordPolicyValidator {
*/
public void lockUser(UserInfo userInfo) {
try {
if (userInfo != null && StringUtils.isNotEmpty(userInfo.getId())) {
if(userInfo.getIsLocked() == ConstsStatus.ACTIVE) {
jdbcTemplate.update(LOCK_USER_UPDATE_STATEMENT,
new Object[] { ConstsStatus.LOCK, new Date(), userInfo.getId() },
new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstsStatus.LOCK);
}
if (userInfo != null
&& StringUtils.isNotEmpty(userInfo.getId())
&& userInfo.getIsLocked() == ConstsStatus.ACTIVE) {
jdbcTemplate.update(LOCK_USER_UPDATE_STATEMENT,
new Object[] { ConstsStatus.LOCK, new Date(), userInfo.getId() },
new int[] { Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR });
userInfo.setIsLocked(ConstsStatus.LOCK);
}
} catch (Exception e) {
_logger.error("lockUser Exception",e);
@@ -297,10 +297,8 @@ public class PasswordPolicyValidator {
}
public void resetBadPasswordCount(UserInfo userInfo) {
if (userInfo != null && StringUtils.isNotEmpty(userInfo.getId())) {
if(userInfo.getBadPasswordCount()>0) {
setBadPasswordCount(userInfo.getId(),0);
}
if (userInfo != null && StringUtils.isNotEmpty(userInfo.getId()) && userInfo.getBadPasswordCount()>0) {
setBadPasswordCount(userInfo.getId(),0);
}
}

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java
View File

@@ -40,6 +40,6 @@ public class InstitutionsService extends JpaService<Institutions>{
public Institutions findByDomain(String domain) {
return getMapper().findByDomain(domain);
};
}
}

13
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java
View File

@@ -244,7 +244,7 @@ public class UserInfoService extends JpaService<UserInfo> {
if(StringUtils.isNotBlank(changePassword.getPassword())) {
String password = passwordEncoder.encode(changePassword.getPassword());
changePassword.setDecipherable(PasswordReciprocal.getInstance().encode(changePassword.getPassword()));
_logger.debug("decipherable : "+changePassword.getDecipherable());
_logger.debug("decipherable : {}",changePassword.getDecipherable());
changePassword.setPassword(password);
changePassword.setPasswordLastSetTime(new Date());
@@ -303,10 +303,10 @@ public class UserInfoService extends JpaService<UserInfo> {
*/
public boolean changePassword(ChangePassword changePassword,boolean passwordPolicy) {
try {
_logger.debug("decipherable old : " + changePassword.getDecipherable());
_logger.debug("decipherable new : " + PasswordReciprocal.getInstance().encode(changePassword.getDecipherable()));
_logger.debug("decipherable old : {}" , changePassword.getDecipherable());
_logger.debug("decipherable new : {}" , PasswordReciprocal.getInstance().encode(changePassword.getDecipherable()));
if (passwordPolicy && passwordPolicyValidator.validator(changePassword) == false) {
if (passwordPolicy && !passwordPolicyValidator.validator(changePassword)) {
return false;
}
@@ -333,10 +333,7 @@ public class UserInfoService extends JpaService<UserInfo> {
if(changePassworded !=null && StringUtils.isNotBlank(changePassworded.getPassword())) {
UserInfo loadUserInfo = findByUsername(changePassworded.getUsername());
ChangePassword changePassword = new ChangePassword(loadUserInfo);
provisionService.send(
ProvisionTopic.PASSWORD_TOPIC,
changePassword,
ProvisionAct.PASSWORD);
provisionService.send(ProvisionTopic.PASSWORD_TOPIC, changePassword, ProvisionAct.PASSWORD);
}
}