xuemingqiang/jinbooks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设置默认账套

Browse Source
This commit is contained in:
jinbooks_dev
2025-06-17 10:21:47 +08:00
parent c12579aa70
commit 89b954320f
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -49,8 +49,8 @@ release_frontend.bat
**/out/*
jinbooks-web-fronted/package-lock.json
jinbooks-web-fronted/yarn.lock
jinbooks-ui/package-lock.json
jinbooks-ui/yarn.lock
package-lock.json
/jinbooks/.gradle
jinbooks/.gradle/*

2
jinbooks-ui/src/utils/Auth.ts
View File

@ -4,7 +4,7 @@ const TokenKey: any = 'Admin-Token'
const RefreshTokenKey: any = 'refresh_token'
const TokenInfoKey: any = '_token'
const UserInfoKey: any = 'user'
const SetsKey: any = 'booksSet'
const SetsKey: any = 'books'
export function getToken(): any {
return Cookies.get(TokenKey)

2
jinbooks/jinbooks-commons/jinbooks-authn-provider/src/main/java/com/jinbooks/authn/provider/AbstractAuthenticationProvider.java
View File

@ -28,6 +28,8 @@ import com.jinbooks.ip2location.IpLocationParser;
import com.jinbooks.ip2location.Region;
import com.jinbooks.password.onetimepwd.AbstractOtpAuthn;
import com.jinbooks.password.onetimepwd.MailOtpAuthnService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.authentication.BadCredentialsException;

19
jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/LoginServiceImpl.java
View File

@ -26,6 +26,7 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.joda.time.Duration;
@ -41,6 +42,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jinbooks.constants.ConstsStatus;
import com.jinbooks.entity.ChangePassword;
import com.jinbooks.entity.access.SessionList;
import com.jinbooks.entity.book.vo.BookVo;
import com.jinbooks.entity.config.ConfigLoginPolicy;
import com.jinbooks.entity.history.HistoryLogin;
import com.jinbooks.entity.idm.UserInfo;
@ -48,6 +50,7 @@ import com.jinbooks.entity.permissions.Resources;
import com.jinbooks.persistence.mapper.LoginMapper;
import com.jinbooks.persistence.service.AuthzResourceService;
import com.jinbooks.persistence.service.AuthzService;
import com.jinbooks.persistence.service.BookService;
import com.jinbooks.persistence.service.ConfigLoginPolicyService;
import com.jinbooks.persistence.service.FileStorageService;
import com.jinbooks.persistence.service.HistoryLoginService;
@ -86,6 +89,9 @@ public class LoginServiceImpl extends ServiceImpl<LoginMapper,UserInfo> impleme
@Autowired
AuthzResourceService authzResourceService;
@Autowired
BookService bookService;
public LoginMapper getMapper() {
return loginMapper;
}
@ -102,7 +108,18 @@ public class LoginServiceImpl extends ServiceImpl<LoginMapper,UserInfo> impleme
@Override
public UserInfo findByUsername(String loginName) {
return this.getMapper().findByUsername(loginName);
UserInfo userInfo = this.getMapper().findByUsername(loginName);
if(StringUtils.isBlank(userInfo.getBookId())) {
//未设置默认账号情况，读取有权限的账套的第一个
List<BookVo> books = bookService.listBooks(userInfo.getId());
if(CollectionUtils.isNotEmpty(books)) {
userInfo.setBookId(books.get(0).getId());
userInfoService.switchBook(userInfo);
}else {
userInfo.setBookId(userInfo.getId());
}
}
return userInfo;
}
@Override