diff --git a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java index 0107247b..2e9e2a35 100644 --- a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java +++ b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java @@ -143,7 +143,7 @@ public class StorageManager implements IStorageManager { @Override public void inject() { var applicationContext = StorageContext.getApplicationContext(); - var componentBeans = applicationContext.getBeansWithAnnotation(Component.class); + var componentBeans = applicationContext.getBeansWithAnnotation(Component.class); for (var bean : componentBeans.values()) { ReflectionUtils.filterFieldsInClass(bean.getClass(), field -> field.isAnnotationPresent(ResInjection.class), field -> { Type type = field.getGenericType(); @@ -251,15 +251,14 @@ public class StorageManager implements IStorageManager { var resourcePatternResolver = new PathMatchingResourcePatternResolver(); var metadataReaderFactory = new CachingMetadataReaderFactory(resourcePatternResolver); String fileName; - if(clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).value().equals("") - &&clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).alias().equals("")){ - fileName=clazz.getSimpleName(); - } - else{ - if(clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).value().equals("")) - fileName=clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).alias(); + if (clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).value().equals("") + && clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).alias().equals("")) { + fileName = clazz.getSimpleName(); + } else { + if (clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).value().equals("")) + fileName = clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).alias(); else - fileName=clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).value(); + fileName = clazz.getAnnotation(com.zfoo.storage.model.anno.Resource.class).value(); } try { // 一个class类只能匹配一个资源文件,如果匹配多个则会有歧义 diff --git a/storage/src/main/java/com/zfoo/storage/model/anno/ExcelFieldName.java b/storage/src/main/java/com/zfoo/storage/model/anno/ExcelFieldName.java index 650f38f4..07ba6127 100644 --- a/storage/src/main/java/com/zfoo/storage/model/anno/ExcelFieldName.java +++ b/storage/src/main/java/com/zfoo/storage/model/anno/ExcelFieldName.java @@ -3,7 +3,7 @@ package com.zfoo.storage.model.anno; import java.lang.annotation.*; /** - *指定文件列名,不指定则默认列名与字段名一致 + * 指定文件列名,不指定则默认列名与字段名一致 */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/storage/src/main/java/com/zfoo/storage/model/anno/Resource.java b/storage/src/main/java/com/zfoo/storage/model/anno/Resource.java index 84f680b3..f0ec0d24 100644 --- a/storage/src/main/java/com/zfoo/storage/model/anno/Resource.java +++ b/storage/src/main/java/com/zfoo/storage/model/anno/Resource.java @@ -21,6 +21,7 @@ import java.lang.annotation.*; * 资源注解 * 可以指定对应的资源文件名(只指定文件名,不需要文件后缀) * 如果不指定资源文件名,则默认通过扫描路径获取与类名相同的文件资源 + * * @author godotg * @version 4.0 */