lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-05-22 17:07:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(基础模块): 避免重复注入bean

Browse Source
This commit is contained in:
zhouhao
2024-11-11 15:35:40 +08:00
parent a30cabe589
commit 48b653977e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/AutoDDLProcessor.java
View File

@@ -87,7 +87,7 @@ public class AutoDDLProcessor implements InitializingBean {
.commit()
.reactive()
.subscribeOn(Schedulers.boundedElastic()),
8)
8,8)
.doOnError((err) -> log.error(err.getMessage(), err))
.then()
.block(Duration.ofMinutes(5));

15
hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/configuration/EasyormRepositoryRegistrar.java
View File

@@ -35,6 +35,7 @@ import java.io.IOException;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -125,7 +126,7 @@ public class EasyormRepositoryRegistrar implements ImportBeanDefinitionRegistrar
Class<Annotation>[] anno = (Class[]) attr.get("annotation");
Set<EntityInfo> entityInfos = new HashSet<>();
Set<EntityInfo> entityInfos = ConcurrentHashMap.newKeySet();
CandidateComponentsIndex index = CandidateComponentsIndexLoader.loadIndex(org.springframework.util.ClassUtils.getDefaultClassLoader());
for (String className : scanEntities(arr)) {
Class<?> entityType = org.springframework.util.ClassUtils.forName(className, null);
@@ -163,7 +164,11 @@ public class EasyormRepositoryRegistrar implements ImportBeanDefinitionRegistrar
definition.setBeanClass(ReactiveRepositoryFactoryBean.class);
definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
definition.getPropertyValues().add("entityType", entityType);
registry.registerBeanDefinition(beanName, definition);
if (!registry.containsBeanDefinition(beanName)) {
registry.registerBeanDefinition(beanName, definition);
} else {
entityInfos.remove(entityInfo);
}
}
if (entityInfo.isNonReactive()) {
String beanName = entityType.getSimpleName().concat("SyncRepository");
@@ -175,7 +180,11 @@ public class EasyormRepositoryRegistrar implements ImportBeanDefinitionRegistrar
definition.setBeanClass(SyncRepositoryFactoryBean.class);
definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
definition.getPropertyValues().add("entityType", entityType);
registry.registerBeanDefinition(beanName, definition);
if (!registry.containsBeanDefinition(beanName)) {
registry.registerBeanDefinition(beanName, definition);
} else {
entityInfos.remove(entityInfo);
}
}
}