diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java
index 889ff3eb8931902fb98b0dec1e2192604a8d3155..93534911c65c03572ba0e73ea3ada2c12e1e4c94 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AbstractAdapterMapperGenerator.java
@@ -1,20 +1,13 @@
 package io.github.linpeilie.processor;
 
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.*;
 import io.github.linpeilie.processor.metadata.AbstractAdapterMethodMetadata;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Modifier;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collection;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
 
 import static javax.tools.Diagnostic.Kind.ERROR;
 
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java
index be2d558650d9e23ab0be6e4f0873ea0410b8e389..214f5fa271ab8d60ebd3fbaf49decc6cfb74b57e 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProcessor.java
@@ -1,57 +1,18 @@
 package io.github.linpeilie.processor;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.TypeName;
 import io.github.linpeilie.ComponentModelConstant;
-import io.github.linpeilie.annotations.AutoEnumMapper;
-import io.github.linpeilie.annotations.AutoMapMapper;
-import io.github.linpeilie.annotations.AutoMapper;
-import io.github.linpeilie.annotations.AutoMappers;
-import io.github.linpeilie.annotations.AutoMapping;
-import io.github.linpeilie.annotations.AutoMappings;
-import io.github.linpeilie.annotations.ComponentModelConfig;
-import io.github.linpeilie.annotations.MapperConfig;
-import io.github.linpeilie.annotations.ReverseAutoMapping;
-import io.github.linpeilie.annotations.ReverseAutoMappings;
-import io.github.linpeilie.processor.generator.AutoEnumMapperGenerator;
-import io.github.linpeilie.processor.generator.AutoMapperGenerator;
-import io.github.linpeilie.processor.generator.DefaultAdapterMapperGenerator;
-import io.github.linpeilie.processor.generator.MapperConfigGenerator;
-import io.github.linpeilie.processor.generator.SolonAdapterMapperGenerator;
-import io.github.linpeilie.processor.generator.SpringAdapterMapperGenerator;
-import io.github.linpeilie.processor.metadata.AbstractAdapterMethodMetadata;
-import io.github.linpeilie.processor.metadata.AdapterEnumMethodMetadata;
-import io.github.linpeilie.processor.metadata.AdapterMapMethodMetadata;
-import io.github.linpeilie.processor.metadata.AdapterMethodMetadata;
-import io.github.linpeilie.processor.metadata.AutoEnumMapperMetadata;
-import io.github.linpeilie.processor.metadata.AutoMapMapperMetadata;
-import io.github.linpeilie.processor.metadata.AutoMapperMetadata;
-import io.github.linpeilie.processor.metadata.AutoMappingMetadata;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.Filer;
-import javax.annotation.processing.Messager;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.annotation.processing.SupportedOptions;
+import io.github.linpeilie.annotations.*;
+import io.github.linpeilie.processor.generator.*;
+import io.github.linpeilie.processor.metadata.*;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.collection.ListUtil;
+import org.dromara.hutool.core.exception.ExceptionUtil;
+import org.dromara.hutool.core.text.StrUtil;
+import org.mapstruct.MappingConstants;
+
+import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -61,26 +22,14 @@ import javax.lang.model.type.MirroredTypeException;
 import javax.lang.model.type.MirroredTypesException;
 import javax.lang.model.type.TypeMirror;
 import javax.tools.Diagnostic;
-import org.mapstruct.MappingConstants;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.*;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
-import static io.github.linpeilie.processor.Constants.AUTO_ENUM_MAPPER_ANNOTATION;
-import static io.github.linpeilie.processor.Constants.AUTO_MAPPERS_ANNOTATION;
-import static io.github.linpeilie.processor.Constants.AUTO_MAPPER_ANNOTATION;
-import static io.github.linpeilie.processor.Constants.AUTO_MAP_MAPPER_ANNOTATION;
-import static io.github.linpeilie.processor.Constants.COMPONENT_MODEL_CONFIG_ANNOTATION;
-import static io.github.linpeilie.processor.Constants.MAPPER_ANNOTATION;
-import static io.github.linpeilie.processor.Constants.MAPPER_CONFIG_ANNOTATION;
-import static io.github.linpeilie.processor.ProcessorOptions.ADAPTER_CLASS_NAME;
-import static io.github.linpeilie.processor.ProcessorOptions.ADAPTER_PACKAGE;
-import static io.github.linpeilie.processor.ProcessorOptions.BUILDER_BUILD_METHOD;
-import static io.github.linpeilie.processor.ProcessorOptions.BUILDER_DISABLE_BUILDER;
-import static io.github.linpeilie.processor.ProcessorOptions.MAPPER_CONFIG_CLASS;
-import static io.github.linpeilie.processor.ProcessorOptions.MAPPER_PACKAGE;
-import static io.github.linpeilie.processor.ProcessorOptions.MAP_ADAPTER_CLASS_NAME;
-import static io.github.linpeilie.processor.ProcessorOptions.NULL_VALUE_MAPPING_STRATEGY;
-import static io.github.linpeilie.processor.ProcessorOptions.NULL_VALUE_PROPERTY_MAPPING_STRATEGY;
-import static io.github.linpeilie.processor.ProcessorOptions.UNMAPPED_SOURCE_POLICY;
-import static io.github.linpeilie.processor.ProcessorOptions.UNMAPPED_TARGET_POLICY;
+import static io.github.linpeilie.processor.Constants.*;
+import static io.github.linpeilie.processor.ProcessorOptions.*;
 import static javax.tools.Diagnostic.Kind.ERROR;
 
 @SupportedAnnotationTypes({AUTO_MAPPER_ANNOTATION, AUTO_MAPPERS_ANNOTATION, AUTO_MAP_MAPPER_ANNOTATION,
@@ -415,7 +364,7 @@ public class AutoMapperProcessor extends AbstractProcessor {
 
         // load previous mapper config
         final List<TypeElement> typeElements = buildCollator.getRecords();
-        if (CollectionUtil.isNotEmpty(typeElements)) {
+        if (CollUtil.isNotEmpty(typeElements)) {
             messager.printMessage(Diagnostic.Kind.NOTE,
                 "The previous Mapper Config Class was read , class name : " + typeElements.get(0));
             loadMapperConfig(typeElements.get(0).getAnnotation(MapperConfig.class));
@@ -432,7 +381,7 @@ public class AutoMapperProcessor extends AbstractProcessor {
             if (mapperConfigOptional.isPresent()) {
                 loadMapperConfig(mapperConfigOptional.get().getAnnotation(MapperConfig.class));
                 // record
-                buildCollator.writeTypeElements(CollectionUtil.newArrayList((TypeElement) mapperConfigOptional.get()));
+                buildCollator.writeTypeElements(ListUtil.of((TypeElement) mapperConfigOptional.get()));
             }
         }
 
@@ -506,7 +455,7 @@ public class AutoMapperProcessor extends AbstractProcessor {
             if (!autoMapperMetadata.isReverseConvertGenerate()) {
                 return;
             }
-            boolean defineReverseMapping = CollectionUtil.isNotEmpty(autoMapperMetadata.getFieldReverseMappingList());
+            boolean defineReverseMapping = CollUtil.isNotEmpty(autoMapperMetadata.getFieldReverseMappingList());
             final AutoMapperMetadata reverseMapperMetadata = reverseMapper(autoMapperMetadata);
             if (defineReverseMapping) {
                 addMapper(reverseMapperMetadata);
@@ -540,7 +489,7 @@ public class AutoMapperProcessor extends AbstractProcessor {
         reverseMapperMetadata.setImportsClassNameList(autoMapperMetadata.getImportsClassNameList());
         reverseMapperMetadata.setMapstructConfigClass(
             ClassName.get(AutoMapperProperties.getConfigPackage(), AutoMapperProperties.getConfigClassName()));
-        if (CollectionUtil.isNotEmpty(autoMapperMetadata.getFieldReverseMappingList())) {
+        if (CollUtil.isNotEmpty(autoMapperMetadata.getFieldReverseMappingList())) {
             reverseMapperMetadata.setFieldMappingList(autoMapperMetadata.getFieldReverseMappingList());
         } else {
             // 需要继承的属性
@@ -787,7 +736,7 @@ public class AutoMapperProcessor extends AbstractProcessor {
         String elementName = ele.getSimpleName().toString();
 
         if (ele.getKind() == ElementKind.METHOD) {
-            elementName = ObjectUtil.defaultIfBlank(StrUtil.getGeneralField(elementName), elementName);
+            elementName = StrUtil.defaultIfBlank(StrUtil.getGeneralField(elementName), elementName);
         }
 
         if (StrUtil.isNotEmpty(autoMapping.source())) {
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java
index 1a72ec8377a71c55ea94a9e9399314bfcda4b254..81933df4b3db462e9b64fad5ff0f047db18548a6 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/AutoMapperProperties.java
@@ -1,6 +1,5 @@
 package io.github.linpeilie.processor;
 
-import org.mapstruct.Builder;
 import org.mapstruct.NullValueMappingStrategy;
 import org.mapstruct.NullValuePropertyMappingStrategy;
 import org.mapstruct.ReportingPolicy;
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java
index 39f4a16dd261af4de5756c4684f4193e8c58773f..f5f2e5bc5a872926b4496f2785977568e32c7e04 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/BuildCollator.java
@@ -1,24 +1,20 @@
 package io.github.linpeilie.processor;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.io.FileUtil;
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.io.file.FileUtil;
+
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * 构建校对器
@@ -62,7 +58,7 @@ public class BuildCollator {
     }
 
     private void write(Collection<String> lines) {
-        if (CollectionUtil.isEmpty(lines)) {
+        if (CollUtil.isEmpty(lines)) {
             return;
         }
 
@@ -87,7 +83,7 @@ public class BuildCollator {
 
     public void consumeRecords(Consumer<TypeElement> consumer) {
         final List<TypeElement> typeElements = getRecords();
-        if (CollectionUtil.isNotEmpty(typeElements)) {
+        if (CollUtil.isNotEmpty(typeElements)) {
             typeElements.forEach(consumer);
         }
     }
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/Constants.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/Constants.java
index 58ee910b6942b7be40b60b593a7d9ddc93b72f78..ee83a9e4123fdc21a0c45ff8752271986672389e 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/Constants.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/Constants.java
@@ -1,6 +1,5 @@
 package io.github.linpeilie.processor;
 
-import java.io.File;
 import org.mapstruct.MappingConstants;
 
 public class Constants {
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java
index 893054bf9628a0b1f7f21341210bf4f77b5479ee..0ead13c23e30e92c25b94d0e81bfa8e963f8487b 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/AutoMapperGenerator.java
@@ -1,35 +1,24 @@
 package io.github.linpeilie.processor.generator;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeSpec;
-import io.github.linpeilie.annotations.Immutable;
+import com.squareup.javapoet.*;
 import io.github.linpeilie.processor.metadata.AutoMapperMetadata;
 import io.github.linpeilie.processor.metadata.AutoMappingMetadata;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.dromara.hutool.core.text.StrUtil;
+
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
-import javax.tools.Diagnostic;
-import org.apache.commons.lang3.StringUtils;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.io.Writer;
+import java.util.*;
+import java.util.stream.Collectors;
 
-import static io.github.linpeilie.processor.Constants.*;
+import static io.github.linpeilie.processor.Constants.MAPSTRUCT_MAPPER_CLASS_NAME;
+import static io.github.linpeilie.processor.Constants.MAPSTRUCT_MAPPER_PACKAGE;
 
 public class AutoMapperGenerator {
 
@@ -108,7 +97,7 @@ public class AutoMapperGenerator {
             .addParameters(parameterSpecs)
             .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
             .returns(target);
-        if (CollectionUtil.isNotEmpty(autoMappingMetadataList)) {
+        if (CollUtil.isNotEmpty(autoMappingMetadataList)) {
             methodSpecBuilder.addAnnotations(buildMappingAnnotations(autoMappingMetadataList));
         }
         return methodSpecBuilder.build();
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java
index 3caaa0f46e035db3375c3ed86e04f30cb3a0a03d..be20197f9d8287a93857ebe5146535120d4d25e8 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/DefaultAdapterMapperGenerator.java
@@ -2,13 +2,12 @@ package io.github.linpeilie.processor.generator;
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
 import com.squareup.javapoet.TypeSpec;
 import io.github.linpeilie.processor.AbstractAdapterMapperGenerator;
 import io.github.linpeilie.processor.metadata.AbstractAdapterMethodMetadata;
-import java.util.Collection;
+
 import javax.lang.model.element.Modifier;
+import java.util.Collection;
 
 public class DefaultAdapterMapperGenerator extends AbstractAdapterMapperGenerator {
 
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java
index 0e086f3862cc030a5cd00c9e04418ace0b922182..3ff31215f7fb7a183dd6672674c2b7ee018f1a4e 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/MapperConfigGenerator.java
@@ -1,19 +1,15 @@
 package io.github.linpeilie.processor.generator;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.*;
 import io.github.linpeilie.processor.AutoMapperProperties;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
+import org.dromara.hutool.core.collection.CollUtil;
+
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
 
 import static javax.tools.Diagnostic.Kind.ERROR;
 
@@ -44,7 +40,7 @@ public class MapperConfigGenerator {
     private AnnotationSpec buildMapperConfigAnnotationSpec(final String adapterClassName, final List<TypeMirror> uses) {
         CodeBlock.Builder usesCodeBuilder = CodeBlock.builder().add("{");
         usesCodeBuilder.add("$T.class", ClassName.get(AutoMapperProperties.getAdapterPackage(), adapterClassName));
-        if (CollectionUtil.isNotEmpty(uses)) {
+        if (CollUtil.isNotEmpty(uses)) {
             uses.forEach(use -> {
                 usesCodeBuilder.add(", $T.class", use);
             });
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java
index 87c4447186f0035008c1da5cfe29fd852818a871..4e48cd398d95afd2fa45c7ae0ab58764936846df 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SolonAdapterMapperGenerator.java
@@ -1,9 +1,9 @@
 package io.github.linpeilie.processor.generator;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
-import java.util.Collection;
+import org.dromara.hutool.core.collection.ListUtil;
+
 import java.util.List;
 
 public class SolonAdapterMapperGenerator extends IocAdapterMapperGenerator {
@@ -25,6 +25,6 @@ public class SolonAdapterMapperGenerator extends IocAdapterMapperGenerator {
 
     @Override
     protected List<AnnotationSpec> injectAnnotations() {
-        return CollectionUtil.newArrayList(inject());
+        return ListUtil.of(inject());
     }
 }
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java
index 6dbda0dc1078b8a1ee3f71300e0534207e9991b7..3a337e744d13cac581dd6121c189cafe0d0c61ce 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/generator/SpringAdapterMapperGenerator.java
@@ -1,18 +1,10 @@
 package io.github.linpeilie.processor.generator;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.TypeSpec;
-import io.github.linpeilie.processor.AbstractAdapterMapperGenerator;
-import io.github.linpeilie.processor.metadata.AbstractAdapterMethodMetadata;
-import java.util.Collection;
+import org.dromara.hutool.core.collection.ListUtil;
+
 import java.util.List;
-import javax.lang.model.element.Modifier;
 
 public class SpringAdapterMapperGenerator extends IocAdapterMapperGenerator {
 
@@ -41,7 +33,7 @@ public class SpringAdapterMapperGenerator extends IocAdapterMapperGenerator {
 
     @Override
     protected List<AnnotationSpec> injectAnnotations() {
-        return CollectionUtil.newArrayList(autowired(), lazy());
+        return ListUtil.of(autowired(), lazy());
     }
 
 }
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java
index b6cae0f4fdf4d492ca463a23e7079cb9d6e07570..0dc9491c9e460fdfb20c090b1fa4ec7f8239bcef 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AdapterMapMethodMetadata.java
@@ -1,7 +1,6 @@
 package io.github.linpeilie.processor.metadata;
 
 import com.squareup.javapoet.ClassName;
-import java.lang.annotation.Target;
 
 public class AdapterMapMethodMetadata extends AbstractAdapterMethodMetadata {
 
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java
index e60265056b1d0b5eefa6b857de2a045fa3480709..846909b098f7fb9b8258f5bd9112bf4e3fbadad1 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoEnumMapperMetadata.java
@@ -1,6 +1,5 @@
 package io.github.linpeilie.processor.metadata;
 
-import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.TypeName;
 
 public class AutoEnumMapperMetadata extends AbstractMapperMetadata {
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java
index 6f4d58ba5cba660caea27f0499e14dc958448ac9..baf65b298370d6e886e9450acf26686ca0282b94 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/metadata/AutoMapperMetadata.java
@@ -1,9 +1,8 @@
 package io.github.linpeilie.processor.metadata;
 
 import com.squareup.javapoet.ClassName;
-import io.github.linpeilie.processor.AutoMapperProperties;
+
 import java.util.List;
-import org.mapstruct.ReportingPolicy;
 
 public class AutoMapperMetadata extends AbstractMapperMetadata {
 
diff --git a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/solon/SolonComponentProcessor.java b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/solon/SolonComponentProcessor.java
index 168668d5349181f1d24d1bb6ecd3c7247d3eb111..cc57e1228fbdd69ddd655a8fba8cf8f7dda03c62 100644
--- a/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/solon/SolonComponentProcessor.java
+++ b/mapstruct-plus-processor/src/main/java/io/github/linpeilie/processor/solon/SolonComponentProcessor.java
@@ -1,13 +1,13 @@
 package io.github.linpeilie.processor.solon;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.collection.ListUtil;
 import io.github.linpeilie.ComponentModelConstant;
-import java.util.List;
+import org.dromara.hutool.core.collection.ListUtil;
 import org.mapstruct.ap.internal.model.Annotation;
 import org.mapstruct.ap.internal.model.Mapper;
 import org.mapstruct.ap.internal.processor.AnnotationBasedComponentModelProcessor;
 
+import java.util.List;
+
 public class SolonComponentProcessor extends AnnotationBasedComponentModelProcessor {
     @Override
     protected String getComponentModelIdentifier() {
@@ -16,7 +16,7 @@ public class SolonComponentProcessor extends AnnotationBasedComponentModelProces
 
     @Override
     protected List<Annotation> getTypeAnnotations(final Mapper mapper) {
-        return CollectionUtil.newArrayList(component());
+        return ListUtil.of(component());
     }
 
     private Annotation component() {
@@ -29,7 +29,7 @@ public class SolonComponentProcessor extends AnnotationBasedComponentModelProces
 
     @Override
     protected List<Annotation> getMapperReferenceAnnotations() {
-        return CollectionUtil.newArrayList(inject());
+        return ListUtil.of(inject());
     }
 
     @Override
diff --git a/mapstruct-plus/pom.xml b/mapstruct-plus/pom.xml
index cca4476b3f9da65ed73589a5ec998379372e2a33..bbbe3aea6db62ea99fe2f7201e2444167d03d385 100644
--- a/mapstruct-plus/pom.xml
+++ b/mapstruct-plus/pom.xml
@@ -24,7 +24,7 @@
             <artifactId>mapstruct</artifactId>
         </dependency>
         <dependency>
-            <groupId>cn.hutool</groupId>
+            <groupId>org.dromara.hutool</groupId>
             <artifactId>hutool-core</artifactId>
         </dependency>
     </dependencies>
diff --git a/mapstruct-plus/src/main/java/io/github/linpeilie/BaseMapper.java b/mapstruct-plus/src/main/java/io/github/linpeilie/BaseMapper.java
index e031b5a13163f2a6615c48841abb36d9b6d658c4..1d3ac8a365d08631cbf7f9c21e74cb6ac15263c2 100644
--- a/mapstruct-plus/src/main/java/io/github/linpeilie/BaseMapper.java
+++ b/mapstruct-plus/src/main/java/io/github/linpeilie/BaseMapper.java
@@ -1,11 +1,11 @@
 package io.github.linpeilie;
 
-import cn.hutool.core.collection.CollectionUtil;
+import org.dromara.hutool.core.collection.CollUtil;
+import org.mapstruct.MappingTarget;
+
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.mapstruct.MappingTarget;
 
 public interface BaseMapper<S, T> {
 
@@ -14,7 +14,7 @@ public interface BaseMapper<S, T> {
     T convert(S source, @MappingTarget T target);
 
     default List<T> convert(List<S> sourceList) {
-        if (CollectionUtil.isEmpty(sourceList)) {
+        if (CollUtil.isEmpty(sourceList)) {
             return new ArrayList<>();
         }
         return sourceList.stream().map(this::convert).collect(Collectors.toList());
diff --git a/mapstruct-plus/src/main/java/io/github/linpeilie/map/MapObjectConvert.java b/mapstruct-plus/src/main/java/io/github/linpeilie/map/MapObjectConvert.java
index 6ad4a0ed139843b21632c4b30ea4db28e10b82ee..95da96d535208ffd4f84c094d1fa6286c23d1bd2 100644
--- a/mapstruct-plus/src/main/java/io/github/linpeilie/map/MapObjectConvert.java
+++ b/mapstruct-plus/src/main/java/io/github/linpeilie/map/MapObjectConvert.java
@@ -1,6 +1,7 @@
 package io.github.linpeilie.map;
 
-import cn.hutool.core.convert.Convert;
+import org.dromara.hutool.core.convert.Convert;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
@@ -39,7 +40,7 @@ public class MapObjectConvert {
     }
 
     public static Boolean objToBoolean(Object obj) {
-        return Convert.toBool(obj);
+        return Convert.toBoolean(obj);
     }
 
     public static Date objToDate(Object obj) {
diff --git a/pom.xml b/pom.xml
index c908be3a52fd4e3e07a12d9c7b7c9e0af827cddd..101d35d427b86cfb77dea9705ebd58d8498dc76e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
-        <hutool.version>5.8.15</hutool.version>
+        <hutool.version>6.0.0-M11</hutool.version>
         <projectUrl>https://github.com/linpeilie/mapstruct-plus.git</projectUrl>
     </properties>
 
@@ -64,7 +64,7 @@
                 <version>5.3.23</version>
             </dependency>
             <dependency>
-                <groupId>cn.hutool</groupId>
+                <groupId>org.dromara.hutool</groupId>
                 <artifactId>hutool-core</artifactId>
                 <version>${hutool.version}</version>
             </dependency>