tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-05-21 06:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
godotg
2024-05-30 15:12:32 +08:00
parent aa40b36616 11de5b50e1
commit 8cc4eaf64d
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orm/src/main/java/com/zfoo/orm/manager/OrmManager.java
+5 -2
View File
@@ -40,6 +40,7 @@ import org.bson.codecs.configuration.CodecRegistries;
import org.bson.codecs.configuration.CodecRegistry;
import org.bson.codecs.pojo.PojoCodecProvider;
import org.bson.types.ObjectId;
import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.type.AnnotationMetadata;
@@ -191,7 +192,9 @@ public class OrmManager implements IOrmManager {
var applicationContext = OrmContext.getApplicationContext();
var componentBeans = applicationContext.getBeansWithAnnotation(Component.class);
for (var bean : componentBeans.values()) {
ReflectionUtils.filterFieldsInClass(bean.getClass()
//防止被CGLIB代理时 直接赋值无效
var targetBean = Objects.requireNonNullElse(AopProxyUtils.getSingletonTarget(bean), bean);
ReflectionUtils.filterFieldsInClass(targetBean.getClass()
, field -> field.isAnnotationPresent(EntityCacheAutowired.class)
, field -> {
Type type = field.getGenericType();
@@ -212,7 +215,7 @@ public class OrmManager implements IOrmManager {
}
ReflectionUtils.makeAccessible(field);
ReflectionUtils.setField(field, bean, entityCaches);
ReflectionUtils.setField(field, targetBean, entityCaches);
allEntityCachesUsableMap.put(entityClazz, true);
});
}
storage/src/main/java/com/zfoo/storage/manager/StorageManager.java
+8 -3
View File
@@ -29,6 +29,7 @@ import com.zfoo.storage.model.StorageDefinition;
import com.zfoo.storage.util.function.Func1;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
@@ -148,12 +149,16 @@ public class StorageManager implements IStorageManager {
var applicationContext = StorageContext.getApplicationContext();
var componentBeans = applicationContext.getBeansWithAnnotation(Component.class);
for (var bean : componentBeans.values()) {
var clazz = bean.getClass();
//防止被CGLIB代理时 直接赋值无效
var targetBean = Objects.requireNonNullElse(AopProxyUtils.getSingletonTarget(bean), bean);
var clazz = targetBean.getClass();
ReflectionUtils.filterFieldsInClass(clazz, field -> field.isAnnotationPresent(StorageAutowired.class), field -> {
Type type = field.getGenericType();
if (!(type instanceof ParameterizedType)) {
throw new RuntimeException(StringUtils.format("[bean:{}] type declaration is incorrect, not a generic class", bean.getClass().getSimpleName()));
throw new RuntimeException(StringUtils.format("[bean:{}] type declaration is incorrect, not a generic class", targetBean.getClass().getSimpleName()));
}
Type[] types = ((ParameterizedType) type).getActualTypeArguments();
@@ -181,7 +186,7 @@ public class StorageManager implements IStorageManager {
}
ReflectionUtils.makeAccessible(field);
ReflectionUtils.setField(field, bean, storage);
ReflectionUtils.setField(field, targetBean, storage);
storage.setRecycle(false);
});
}