diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java b/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java index 43ef8377..f1198958 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java @@ -29,12 +29,12 @@ public class LoginUser implements UserDetails, CredentialsContainer { */ private static final long serialVersionUID = 1399973719726626183L; private String password; - private final String username; - private final boolean accountNonExpired; - private final boolean accountNonLocked; - private final boolean credentialsNonExpired; + private String username; + private boolean accountNonExpired; + private boolean accountNonLocked; + private boolean credentialsNonExpired; private Set authorities; - private final boolean enabled; + private boolean enabled; private String userId; private String userName; @@ -57,6 +57,10 @@ public class LoginUser implements UserDetails, CredentialsContainer { */ private Object expandData; + public LoginUser() { + + } + public LoginUser(String username, String password) { this(username, password, true, true, true, true); } @@ -74,11 +78,35 @@ public class LoginUser implements UserDetails, CredentialsContainer { } } + public void setUsername(String username) { + this.username = username; + } + + public void setAccountNonExpired(boolean accountNonExpired) { + this.accountNonExpired = accountNonExpired; + } + + public void setAccountNonLocked(boolean accountNonLocked) { + this.accountNonLocked = accountNonLocked; + } + + public void setCredentialsNonExpired(boolean credentialsNonExpired) { + this.credentialsNonExpired = credentialsNonExpired; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public void setAuthorities(Set authorities) { // this.authorities = Collections.unmodifiableSet(sortAuthorities(authorities)); this.authorities = sortAuthorities(authorities); } + public void setPassword(String password) { + this.password = password; + } + public Collection getAuthorities() { return this.authorities; } diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/bos/RoleGrantedAuthorityBO.java b/basic-pojo/src/main/java/ink/wgink/pojo/bos/RoleGrantedAuthorityBO.java index efe5bb4b..fbdac090 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/bos/RoleGrantedAuthorityBO.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/bos/RoleGrantedAuthorityBO.java @@ -23,6 +23,9 @@ public class RoleGrantedAuthorityBO implements GrantedAuthority { private List updates; private List queries; + public RoleGrantedAuthorityBO() { + } + public RoleGrantedAuthorityBO(String roleId) { this.roleId = roleId; } @@ -130,4 +133,6 @@ public class RoleGrantedAuthorityBO implements GrantedAuthority { public void setQueries(List queries) { this.queries = queries; } + + } diff --git a/login-base/src/main/java/ink/wgink/login/base/service/user/UserLoginService.java b/login-base/src/main/java/ink/wgink/login/base/service/user/UserLoginService.java index a05996e0..e44968af 100644 --- a/login-base/src/main/java/ink/wgink/login/base/service/user/UserLoginService.java +++ b/login-base/src/main/java/ink/wgink/login/base/service/user/UserLoginService.java @@ -30,6 +30,7 @@ import ink.wgink.service.user.service.IUserService; import ink.wgink.util.UUIDUtil; import ink.wgink.util.date.DateUtil; import ink.wgink.util.request.RequestUtil; +import ink.wgink.util.thread.CachedThreadPoolUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -176,12 +177,14 @@ public class UserLoginService { * @param userId */ public void updateUserLoginInfo(String userId, String userName, String loginType) { - LOG.debug("更新登录信息"); String address = RequestUtil.getRequestIp(); String currentTime = DateUtil.getTime(); - updateLoginInfo(userId, address, currentTime); - LOG.debug("新增登录日志"); - saveLoginLogger(userId, userName, loginType, address, currentTime); + CachedThreadPoolUtil.execute(() -> { + LOG.debug("更新登录信息"); + updateLoginInfo(userId, address, currentTime); + LOG.debug("新增登录日志"); + saveLoginLogger(userId, userName, loginType, address, currentTime); + }); } /** diff --git a/mongo-login/src/main/java/ink/wgink/mongo/login/service/impl/MongoLoginUserServiceImpl.java b/mongo-login/src/main/java/ink/wgink/mongo/login/service/impl/MongoLoginUserServiceImpl.java index f4ab2c1d..574ce441 100644 --- a/mongo-login/src/main/java/ink/wgink/mongo/login/service/impl/MongoLoginUserServiceImpl.java +++ b/mongo-login/src/main/java/ink/wgink/mongo/login/service/impl/MongoLoginUserServiceImpl.java @@ -84,7 +84,7 @@ public class MongoLoginUserServiceImpl extends DefaultBaseService implements IMo @Override public LoginUser getByUsername(String username) { - return mongoTemplate.findOne(new Query().addCriteria(Criteria.where("userUsername").is(username)), LoginUser.class, COLLECTION_NAME); + return mongoTemplate.findOne(new Query().addCriteria(Criteria.where("username").is(username)), LoginUser.class, COLLECTION_NAME); } }