fix: 移除 BPP，使用 @primary 指定 FileRecorder

Author: cadecode

common/plugin/storage/src/main/java/com/github/cadecode/uniboot/common/plugin/storage/config/XFileStorageConfig.java

@@ -1,65 +1,16 @@
 package com.github.cadecode.uniboot.common.plugin.storage.config;
 
-import cn.hutool.core.util.ObjUtil;
-import com.github.cadecode.uniboot.common.plugin.storage.handler.AbstractStorageHandler;
-import lombok.RequiredArgsConstructor;
 import org.dromara.x.file.storage.spring.EnableFileStorage;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.Arrays;
-import java.util.Optional;
-
 /**
  * x-file-storage 配置类
  *
  * @author Cade Li
  * @since 2023/10/25
  */
 @EnableFileStorage
-@RequiredArgsConstructor
 @Configuration
 public class XFileStorageConfig {
 
-    public static final String BEAN_NAME_FILE_RECORDER = "fileRecorder";
-
-    @Bean
-    public FileRecorderBeanDefinitionRegistryPostProcessor fileRecorderBeanDefinitionRegistryPostProcessor() {
-        return new FileRecorderBeanDefinitionRegistryPostProcessor();
-    }
-
-    /**
-     * 解决自定义 AbstractStorageHandler 不能替代 x-file-storage 框架默认 FileRecorder
-     */
-    public static class FileRecorderBeanDefinitionRegistryPostProcessor implements BeanDefinitionRegistryPostProcessor {
-
-        @Override
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
-
-        }
-
-        @Override
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-            String[] handlerBeanNames = beanFactory.getBeanNamesForType(AbstractStorageHandler.class);
-            // 查找 primary 的，不存在则取第一个
-            if (ObjUtil.isNotEmpty(handlerBeanNames)) {
-                Optional<BeanDefinition> primaryBF = Arrays.stream(handlerBeanNames)
-                        .map(beanFactory::getBeanDefinition)
-                        .filter(BeanDefinition::isPrimary)
-                        .findFirst();
-                BeanDefinition handlerBF;
-                handlerBF = primaryBF.orElseGet(() -> beanFactory.getBeanDefinition(handlerBeanNames[0]));
-                if (beanFactory instanceof DefaultListableBeanFactory) {
-                    ((DefaultListableBeanFactory) beanFactory).removeBeanDefinition(BEAN_NAME_FILE_RECORDER);
-                    ((DefaultListableBeanFactory) beanFactory).registerBeanDefinition(BEAN_NAME_FILE_RECORDER, handlerBF);
-                }
-            }
-        }
-    }
 }

common/plugin/storage/src/main/java/com/github/cadecode/uniboot/common/plugin/storage/handler/AbstractStorageHandler.java

@@ -1,12 +1,20 @@
 package com.github.cadecode.uniboot.common.plugin.storage.handler;
 
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.x.file.storage.core.recorder.FileRecorder;
+import org.springframework.beans.factory.InitializingBean;
 
 /**
  * 文件存储处理器
  *
  * @author Cade Li
  * @since 2023/10/27
  */
-public abstract class AbstractStorageHandler implements FileRecorder {
+@Slf4j
+public abstract class AbstractStorageHandler implements FileRecorder, InitializingBean {
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("File storage handler {} is loaded", this.getClass().getName());
+    }
 }

framework/framework_base/src/main/java/com/github/cadecode/uniboot/framework/base/plugin/handler/StorageRecordHandler.java

@@ -8,6 +8,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.x.file.storage.core.FileInfo;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
 /**
@@ -18,6 +19,7 @@
  */
 @Slf4j
 @RequiredArgsConstructor
+@Primary
 @Component
 public class StorageRecordHandler extends AbstractStorageHandler {