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

InstitutionsService 优化和整合

Browse Source
This commit is contained in:
shimingxy
2024-12-13 09:30:14 +08:00
parent 535ad3a638
commit 6f9d0eddac
8 changed files with 63 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java
View File

@@ -21,7 +21,7 @@ import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.entity.Institutions;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.persistence.repository.InstitutionsRepository;
import org.dromara.maxkey.persistence.service.InstitutionsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +42,7 @@ public class InstitutionEndpoint {
public static final String HEADER_HOSTNAME = "hostname";
@Autowired
InstitutionsRepository institutionsRepository;
InstitutionsService institutionsService;
@Autowired
ApplicationConfig applicationConfig;
@@ -72,14 +72,8 @@ public class InstitutionEndpoint {
_logger.trace("domain split {}",host);
}
Institutions inst = institutionsRepository.get(host);
if(inst != null) {
_logger.debug("inst {}",inst);
return new Message<>(inst);
}else {
Institutions defaultInst = institutionsRepository.get("1");
_logger.debug("default inst {}",inst);
return new Message<>(defaultInst);
}
Institutions inst = institutionsService.get(host);
_logger.debug("inst {}",inst);
return new Message<>(inst);
}
}

2
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java
View File

@@ -23,6 +23,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
public interface InstitutionsMapper extends IJpaMapper<Institutions> {
@Select("select * from mxk_institutions where domain = #{value} and status = " + ConstsStatus.ACTIVE)
@Select("select * from mxk_institutions where (id = #{value} or domain = #{value} or consoledomain = #{value} ) and status = " + ConstsStatus.ACTIVE)
public Institutions findByDomain(String domain);
}

104
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/repository/InstitutionsRepository.java
View File

@@ -1,104 +0,0 @@
/*
* Copyright [2022] [MaxKey of copyright http://www.maxkey.top]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.maxkey.persistence.repository;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.ObjectUtils;
import org.dromara.maxkey.entity.Institutions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
public class InstitutionsRepository {
static final Logger _logger = LoggerFactory.getLogger(InstitutionsRepository.class);
private static final String SELECT_STATEMENT =
"select * from mxk_institutions where id = ? or domain = ? or consoledomain = ?" ;
private static final String DEFAULT_INSTID = "1";
protected static final Cache<String, Institutions> institutionsStore =
Caffeine.newBuilder()
.expireAfterWrite(60, TimeUnit.MINUTES)
.build();
//id domain mapping
protected static final ConcurrentHashMap<String,String> mapper = new ConcurrentHashMap<>();
protected JdbcTemplate jdbcTemplate;
public InstitutionsRepository(JdbcTemplate jdbcTemplate) {
this.jdbcTemplate = jdbcTemplate;
}
public Institutions get(String instIdOrDomain) {
_logger.trace(" instId {}" , instIdOrDomain);
Institutions inst = getByInstIdOrDomain(instIdOrDomain);
if(inst == null) {//use default inst
inst = getByInstIdOrDomain(DEFAULT_INSTID);
institutionsStore.put(instIdOrDomain, inst);
}
return inst;
}
private Institutions getByInstIdOrDomain(String instIdOrDomain) {
_logger.trace(" instId {}" , instIdOrDomain);
Institutions inst = institutionsStore.getIfPresent(mapper.get(instIdOrDomain)==null ? DEFAULT_INSTID : mapper.get(instIdOrDomain) );
if(inst == null) {
List<Institutions> institutions =
jdbcTemplate.query(SELECT_STATEMENT,new InstitutionsRowMapper(),instIdOrDomain,instIdOrDomain,instIdOrDomain);
if (ObjectUtils.isNotEmpty(institutions)) {
inst = institutions.get(0);
}
if(inst != null ) {
institutionsStore.put(inst.getDomain(), inst);
institutionsStore.put(inst.getConsoleDomain(), inst);
mapper.put(inst.getId(), inst.getDomain());
}
}
return inst;
}
public class InstitutionsRowMapper implements RowMapper<Institutions> {
@Override
public Institutions mapRow(ResultSet rs, int rowNum) throws SQLException {
Institutions institution = new Institutions();
institution.setId(rs.getString("id"));
institution.setName(rs.getString("name"));
institution.setFullName(rs.getString("fullname"));
institution.setLogo(rs.getString("logo"));
institution.setDomain(rs.getString("domain"));
institution.setFrontTitle(rs.getString("fronttitle"));
institution.setConsoleDomain(rs.getString("consoledomain"));
institution.setConsoleTitle(rs.getString("consoletitle"));
institution.setDefaultUri(rs.getString("defaultUri"));
return institution;
}
}
}

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

@@ -24,4 +24,6 @@ public interface InstitutionsService extends IJpaService<Institutions>{
public Institutions findByDomain(String domain) ;
public Institutions get(String instIdOrDomain) ;
}

46
maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/InstitutionsServiceImpl.java
View File

@@ -17,18 +17,64 @@
package org.dromara.maxkey.persistence.service.impl;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.dromara.maxkey.entity.Institutions;
import org.dromara.maxkey.persistence.mapper.InstitutionsMapper;
import org.dromara.maxkey.persistence.service.InstitutionsService;
import org.dromara.mybatis.jpa.service.impl.JpaServiceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Repository;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
@Repository
public class InstitutionsServiceImpl extends JpaServiceImpl<InstitutionsMapper,Institutions> implements InstitutionsService{
static final Logger _logger = LoggerFactory.getLogger(InstitutionsServiceImpl.class);
private static final String DEFAULT_INSTID = "1";
protected static final Cache<String, Institutions> institutionsStore =
Caffeine.newBuilder()
.expireAfterWrite(60, TimeUnit.MINUTES)
.build();
//id domain mapping
protected static final ConcurrentHashMap<String,String> mapper = new ConcurrentHashMap<>();
public Institutions findByDomain(String domain) {
return getMapper().findByDomain(domain);
}
public Institutions get(String instIdOrDomain) {
_logger.trace(" instId {}" , instIdOrDomain);
Institutions inst = getByDomain(instIdOrDomain);
if(inst == null) {//use default inst
inst = getByDomain(DEFAULT_INSTID);
institutionsStore.put(instIdOrDomain, inst);
}
return inst;
}
private Institutions getByDomain(String instIdOrDomain) {
_logger.trace(" instId {}" , instIdOrDomain);
Institutions inst = institutionsStore.getIfPresent(mapper.get(instIdOrDomain)==null ? DEFAULT_INSTID : mapper.get(instIdOrDomain) );
if(inst == null) {
Institutions institution = findByDomain(instIdOrDomain);
if(institution != null ) {
inst = institution;
institutionsStore.put(inst.getDomain(), inst);
institutionsStore.put(inst.getConsoleDomain(), inst);
mapper.put(inst.getId(), inst.getDomain());
}
}
return inst;
}
}

6
maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java
View File

@@ -34,7 +34,6 @@ import org.dromara.maxkey.persistence.cache.InMemoryMomentaryService;
import org.dromara.maxkey.persistence.cache.MomentaryService;
import org.dromara.maxkey.persistence.cache.RedisMomentaryService;
import org.dromara.maxkey.persistence.redis.RedisConnectionFactory;
import org.dromara.maxkey.persistence.repository.InstitutionsRepository;
import org.dromara.maxkey.util.IdGenerator;
import org.dromara.maxkey.util.SnowFlakeId;
import org.dromara.maxkey.web.WebContext;
@@ -67,11 +66,6 @@ public class ApplicationAutoConfiguration {
return new DataSourceTransactionManager(dataSource);
}
@Bean
InstitutionsRepository institutionsRepository(JdbcTemplate jdbcTemplate) {
return new InstitutionsRepository(jdbcTemplate);
}
/**
* Authentication Password Encoder .
* @return

8
maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.persistence.repository.InstitutionsRepository;
import org.dromara.maxkey.persistence.service.InstitutionsService;
import org.dromara.maxkey.web.WebInstRequestFilter;
import org.dromara.maxkey.web.WebXssRequestFilter;
import org.slf4j.Logger;
@@ -299,11 +299,11 @@ public class MvcAutoConfiguration implements WebMvcConfigurer {
@Bean
FilterRegistrationBean<Filter> webInstRequestFilter(
InstitutionsRepository institutionsRepository,
ApplicationConfig applicationConfig) {
InstitutionsService institutionsService,
ApplicationConfig applicationConfig) {
_logger.debug("WebInstRequestFilter init for /* ");
FilterRegistrationBean<Filter> registrationBean =
new FilterRegistrationBean<>(new WebInstRequestFilter(institutionsRepository,applicationConfig));
new FilterRegistrationBean<>(new WebInstRequestFilter(institutionsService,applicationConfig));
registrationBean.addUrlPatterns("/*");
registrationBean.setName("webInstRequestFilter");
registrationBean.setOrder(4);

10
maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java
View File

@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.entity.Institutions;
import org.dromara.maxkey.persistence.repository.InstitutionsRepository;
import org.dromara.maxkey.persistence.service.InstitutionsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.filter.GenericFilterBean;
@@ -43,7 +43,7 @@ public class WebInstRequestFilter extends GenericFilterBean {
public static final String HEADER_ORIGIN = "Origin";
InstitutionsRepository institutionsRepository;
InstitutionsService institutionsService;
ApplicationConfig applicationConfig;
@@ -70,7 +70,7 @@ public class WebInstRequestFilter extends GenericFilterBean {
_logger.trace("domain split {}",host);
}
_logger.trace("host {}",host);
Institutions institution = institutionsRepository.get(host);
Institutions institution = institutionsService.get(host);
_logger.trace("{}" ,institution);
request.getSession().setAttribute(WebConstants.CURRENT_INST, institution);
@@ -83,9 +83,9 @@ public class WebInstRequestFilter extends GenericFilterBean {
chain.doFilter(servletRequest, servletResponse);
}
public WebInstRequestFilter(InstitutionsRepository institutionsRepository,ApplicationConfig applicationConfig) {
public WebInstRequestFilter(InstitutionsService institutionsService,ApplicationConfig applicationConfig) {
super();
this.institutionsRepository = institutionsRepository;
this.institutionsService = institutionsService;
this.applicationConfig = applicationConfig;
}