diff --git a/EasyExcel/pom.xml b/EasyExcel/pom.xml
index d8230d98b..7c07ee3f0 100644
--- a/EasyExcel/pom.xml
+++ b/EasyExcel/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.netease.lowcode.extensions</groupId>
     <artifactId>EasyExcel</artifactId>
-    <version>2.4.1</version>
+    <version>2.4.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -108,6 +108,10 @@
             <artifactId>codewave-file-connector-library</artifactId>
             <version>1.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -118,7 +122,7 @@
                 <version>1.7.1</version>
                 <configuration>
                     <jarWithDependencies>false</jarWithDependencies>
-                    <rewriteVersion>true</rewriteVersion>
+<!--                    <rewriteVersion>true</rewriteVersion>-->
                 </configuration>
                 <executions>
                     <execution>
diff --git a/async_function_pool/pom.xml b/async_function_pool/pom.xml
index 82aaa31cb..68ca28d11 100644
--- a/async_function_pool/pom.xml
+++ b/async_function_pool/pom.xml
@@ -12,13 +12,13 @@
 
     <groupId>com.netease</groupId>
     <artifactId>async_function_pool</artifactId>
-    <version>1.0.4</version>
+    <version>1.1.0</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <nasl.ide.version>3.3</nasl.ide.version>
+        <nasl.ide.version>3.8</nasl.ide.version>
     </properties>
     <dependencies>
         <!--本案例是本地系统引入nasl-metadata-collector-0.8.0.jar的方式。
@@ -35,6 +35,21 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.83</version>
         </dependency>
+        <dependency>
+            <artifactId>lcap-annotation</artifactId>
+            <groupId>com.netease.lowcode</groupId>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -57,10 +72,10 @@
             <plugin>
                 <groupId>com.netease.lowcode</groupId>
                 <artifactId>nasl-metadata-maven-plugin</artifactId>
-                <version>1.4.2</version>
+                <version>1.4.3</version>
                 <configuration>
                     <jarWithDependencies>false</jarWithDependencies>
-                    <rewriteVersion>false</rewriteVersion>
+                    <rewriteVersion>true</rewriteVersion>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/async_function_pool/src/main/java/com/netease/lib/tasks/annotation/AsyncLogicAnnotation.java b/async_function_pool/src/main/java/com/netease/lib/tasks/annotation/AsyncLogicAnnotation.java
new file mode 100644
index 000000000..c1ebe2ceb
--- /dev/null
+++ b/async_function_pool/src/main/java/com/netease/lib/tasks/annotation/AsyncLogicAnnotation.java
@@ -0,0 +1,15 @@
+package com.netease.lib.tasks.annotation;
+
+import com.netease.lowcode.annotation.LCAPLogicAnnotation;
+import com.netease.lowcode.core.annotation.NaslAnnotation;
+
+@NaslAnnotation(
+        applyTo = {NaslAnnotation.Component.LOGIC} // 用于声明这是一个逻辑注解
+)
+public class AsyncLogicAnnotation extends LCAPLogicAnnotation {
+    @NaslAnnotation.Property(
+            title = "是否开加入多线程执行",
+            defaultValue = "false"
+    )
+    public Boolean useAnno;
+}
diff --git a/async_function_pool/src/main/java/com/netease/lib/tasks/api/FunctionManagerApi.java b/async_function_pool/src/main/java/com/netease/lib/tasks/api/FunctionManagerApi.java
index 8a5008f24..20f207ae3 100644
--- a/async_function_pool/src/main/java/com/netease/lib/tasks/api/FunctionManagerApi.java
+++ b/async_function_pool/src/main/java/com/netease/lib/tasks/api/FunctionManagerApi.java
@@ -1,5 +1,6 @@
 package com.netease.lib.tasks.api;
 
+import com.alibaba.fastjson.JSONObject;
 import com.netease.lib.tasks.model.ThreadResultDTO;
 import com.netease.lowcode.core.annotation.NaslLogic;
 import org.slf4j.Logger;
@@ -35,12 +36,14 @@ public class FunctionManagerApi {
      * 运行中任务注册
      * 任务id，任务
      */
-    private final Map<String, CompletableFuture<String>> runningTaskRegister = new ConcurrentHashMap<>();
-
-
+    private final Map<String, CompletableFuture<Object>> runningTaskRegister = new ConcurrentHashMap<>();
     @Resource(name = "libraryCommonTaskExecutor")
     private Executor contextAwareExecutor;
 
+    public void putRunningTask(String taskId, CompletableFuture<Object> future) {
+        runningTaskRegister.put(taskId, future);
+    }
+
     /**
      * 初始化注册逻辑
      *
@@ -70,7 +73,15 @@ public String asyncRunLogic(String logicKey, String requestStr) {
             logger.error("asyncRunLogic not exist: {}", logicKey);
             return null;
         }
-        CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> function.apply(requestStr), contextAwareExecutor);
+        CompletableFuture<Object> future = CompletableFuture.supplyAsync(() -> {
+            try {
+                return function.apply(requestStr);
+            } catch (Exception e) {
+                // 使用你的日志框架记录异常
+                logger.error("异步任务执行异常: {}", e.getMessage(), e);
+            }
+            return null;
+        }, contextAwareExecutor);
         logger.info("asyncRunLogic success: {}", logicKey);
         String taskId = UUID.randomUUID().toString();
         runningTaskRegister.put(taskId, future);
@@ -89,14 +100,20 @@ public List<ThreadResultDTO> syncGetLogicResult(List<String> taskIdList) {
         taskIdList.forEach(taskId -> {
             ThreadResultDTO resultDTO = new ThreadResultDTO();
             resultDTO.setTaskId(taskId);
-            CompletableFuture<String> functionWeak = runningTaskRegister.get(taskId);
+            CompletableFuture<Object> functionWeak = runningTaskRegister.get(taskId);
             if (functionWeak == null) {
                 resultDTO.setTaskStatus(3);
                 resultDTOList.add(resultDTO);
                 return;
             }
             CompletableFuture future = runningTaskRegister.get(taskId);
-            String result = (String) future.join();
+            Object resObj = future.join();
+            String result;
+            if (resObj instanceof String) {
+                result = (String) resObj;
+            } else {
+                result = JSONObject.toJSONString(resObj);
+            }
             runningTaskRegister.remove(taskId);
             resultDTO.setTaskResult(result);
             resultDTO.setTaskStatus(1);
@@ -117,7 +134,7 @@ public List<ThreadResultDTO> asyncGetLogicResult(List<String> taskIdList) {
         taskIdList.forEach(taskId -> {
             ThreadResultDTO resultDTO = new ThreadResultDTO();
             resultDTO.setTaskId(taskId);
-            CompletableFuture<String> functionWeak = runningTaskRegister.get(taskId);
+            CompletableFuture<Object> functionWeak = runningTaskRegister.get(taskId);
             if (functionWeak == null) {
                 resultDTO.setTaskStatus(3);
                 resultDTOList.add(resultDTO);
@@ -125,7 +142,13 @@ public List<ThreadResultDTO> asyncGetLogicResult(List<String> taskIdList) {
             }
             CompletableFuture future = runningTaskRegister.get(taskId);
             if (future.isDone()) {
-                String result = (String) future.join();
+                Object resObj = future.join();
+                String result;
+                if (resObj instanceof String) {
+                    result = (String) resObj;
+                } else {
+                    result = JSONObject.toJSONString(resObj);
+                }
                 runningTaskRegister.remove(taskId);
                 resultDTO.setTaskResult(result);
                 resultDTO.setTaskStatus(1);
@@ -143,7 +166,15 @@ public List<ThreadResultDTO> asyncGetLogicResult(List<String> taskIdList) {
     @NaslLogic
     public Boolean asyncRunLogicNoResult(Function<String, String> asyncfunction, String requestStr) {
         try {
-            contextAwareExecutor.execute(() -> asyncfunction.apply(requestStr));
+            contextAwareExecutor.execute(() -> {
+                        try {
+                            asyncfunction.apply(requestStr);
+                        } catch (Exception e) {
+                            // 使用你的日志框架记录异常
+                            logger.error("异步任务执行异常: {}", e.getMessage(), e);
+                        }
+                    }
+            );
             return true;
         } catch (RejectedExecutionException e) {
             logger.error("Async task rejected for request: {}", requestStr, e);
diff --git a/async_function_pool/src/main/java/com/netease/lib/tasks/aspect/ExtensionAsyncLogicExcuteAspect.java b/async_function_pool/src/main/java/com/netease/lib/tasks/aspect/ExtensionAsyncLogicExcuteAspect.java
new file mode 100644
index 000000000..abe73f218
--- /dev/null
+++ b/async_function_pool/src/main/java/com/netease/lib/tasks/aspect/ExtensionAsyncLogicExcuteAspect.java
@@ -0,0 +1,53 @@
+package com.netease.lib.tasks.aspect;
+
+import com.netease.lib.tasks.annotation.AsyncLogicAnnotation;
+import com.netease.lib.tasks.api.FunctionManagerApi;
+import com.netease.lib.tasks.util.AsyncLogicAnnotationConfigUtil;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+
+import static java.lang.Thread.sleep;
+
+@Aspect
+@Component
+public class ExtensionAsyncLogicExcuteAspect {
+    private final static Logger log = LoggerFactory.getLogger("LCAP_EXTENSION_LOGGER");
+    @Resource
+    private FunctionManagerApi functionManagerApi;
+
+    @Resource(name = "libraryCommonTaskExecutor")
+    private Executor contextAwareExecutor;
+
+    @Around("execution(* *.*.*.service.*LogicService.*(..))")
+    public Object aroundCustomizeServiceMethods(ProceedingJoinPoint joinPoint) throws Throwable {
+        List<String> allUseAsyncAnnoLogicNames = AsyncLogicAnnotationConfigUtil
+                .listAlluseAnnoLogicNames(AsyncLogicAnnotation.class.getSimpleName());
+        if (!allUseAsyncAnnoLogicNames.contains(joinPoint.getSignature().getName())) {
+            return joinPoint.proceed();
+        }
+        CompletableFuture<Object> future = CompletableFuture.supplyAsync(() -> {
+            try {
+                sleep(10*1000);
+                return joinPoint.proceed();
+            } catch (Throwable e) {
+                log.error("ExtensionAsyncLogicExcuteAspect error", e);
+                return null;
+            }
+        }, contextAwareExecutor);
+        String taskId = UUID.randomUUID().toString();
+        functionManagerApi.putRunningTask(taskId, future);
+        return taskId;
+    }
+}
+
+
diff --git a/async_function_pool/src/main/java/com/netease/lib/tasks/util/AsyncLogicAnnotationConfigUtil.java b/async_function_pool/src/main/java/com/netease/lib/tasks/util/AsyncLogicAnnotationConfigUtil.java
new file mode 100644
index 000000000..688218e92
--- /dev/null
+++ b/async_function_pool/src/main/java/com/netease/lib/tasks/util/AsyncLogicAnnotationConfigUtil.java
@@ -0,0 +1,61 @@
+package com.netease.lib.tasks.util;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.FileCopyUtils;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class AsyncLogicAnnotationConfigUtil {
+    private final static Logger log = LoggerFactory.getLogger("LCAP_EXTENSION_LOGGER");
+
+    private static final String ANNOTATION_METADATA_LOGIC = "annotation/annotation_metadata_logic_";
+    private static Map<String, List<String>> useAnnoLogicNames = new HashMap<>();
+
+    public static JSONArray readAnnotationFile(String annoName) {
+        try {
+            ClassPathResource resource = new ClassPathResource(ANNOTATION_METADATA_LOGIC + annoName + ".json");
+            InputStream inputStream = resource.getInputStream();
+            byte[] bdata = FileCopyUtils.copyToByteArray(inputStream);
+            JSONArray array = JSONObject.parseArray(new String(bdata, StandardCharsets.UTF_8));
+            return array;
+        } catch (Exception e) {
+            log.error("readAnnotationFile error", e);
+            // 处理异常
+            return null;
+        }
+    }
+
+    public static List<String> listAlluseAnnoLogicNames(String annoName) {
+        if (useAnnoLogicNames != null) {
+            List<String> result = useAnnoLogicNames.get(annoName);
+            if (result != null) {
+                return result;
+            }
+        }
+        JSONArray annoArray = readAnnotationFile(annoName);
+        if (annoArray == null) {
+            useAnnoLogicNames.put(annoName, new ArrayList<>());
+            return new ArrayList<>();
+        }
+        List<String> result = new ArrayList<>();
+        annoArray.forEach(anno -> {
+            JSONObject annoObj = (JSONObject) anno;
+            String logicName = annoObj.getString("logicName");
+            JSONObject annotationProperties = annoObj.getJSONObject("annotationProperties");
+            if ("true".equals(annotationProperties.getString("useAnno"))) {
+                result.add(logicName);
+            }
+        });
+        useAnnoLogicNames.put(annoName, result);
+        return result;
+    }
+}
diff --git a/common-es-search-tool/pom.xml b/common-es-search-tool/pom.xml
index fba70a68f..3c3b68ed5 100644
--- a/common-es-search-tool/pom.xml
+++ b/common-es-search-tool/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.netease</groupId>
     <artifactId>common-es-search-tool</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/ElasticsearchApi.java b/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/ElasticsearchApi.java
index e4800bff7..4ca602275 100644
--- a/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/ElasticsearchApi.java
+++ b/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/ElasticsearchApi.java
@@ -8,6 +8,7 @@
 import com.netease.lowcode.core.annotation.NaslLogic;
 import com.netease.lowcode.lib.api.config.CommonEsSearchConfig;
 import com.netease.lowcode.lib.api.config.SortTypeEnum;
+import com.netease.lowcode.lib.api.dto.QueryItemsDto;
 import com.netease.lowcode.lib.api.dto.QueryItemsListDto;
 import com.netease.lowcode.lib.api.dto.QueryRequestParam;
 import com.netease.lowcode.lib.api.dto.QueryResultDto;
@@ -77,16 +78,16 @@ private void fillDefaultParam(QueryRequestParam queryRequestParam) {
         if (!CollectionUtils.isEmpty(queryRequestParam.getQueryItems()) && !CollectionUtils.isEmpty(queryRequestParam.getQueryItemList())) {
             throw new IllegalArgumentException("queryItemList和queryItems不能同时传入");
         }
-        if (!CollectionUtils.isEmpty(queryRequestParam.getQueryItems())) {
-            QueryItemsListDto queryItemsListDto = new QueryItemsListDto();
-            queryItemsListDto.setQueryItems(queryRequestParam.getQueryItems());
-            queryRequestParam.setQueryItemList(new ArrayList<>());
-            queryRequestParam.getQueryItemList().add(queryItemsListDto);
-            // 1表示queryItems内多个条件之间为与；2表示queryItems内多个条件之间为或。所以这边需要旋转一下。
-            // fillQueryBuilder执行时，1是外与内或。不旋转的话会执行内或。
-            queryRequestParam.setLogicalOperator(queryRequestParam.getLogicalOperator() == 1 ? 2 : 1);
-            queryRequestParam.setQueryItems(null);
-        }
+//        if (!CollectionUtils.isEmpty(queryRequestParam.getQueryItems())) {
+//            QueryItemsListDto queryItemsListDto = new QueryItemsListDto();
+//            queryItemsListDto.setQueryItems(queryRequestParam.getQueryItems());
+//            queryRequestParam.setQueryItemList(new ArrayList<>());
+//            queryRequestParam.getQueryItemList().add(queryItemsListDto);
+//            // 1表示queryItems内多个条件之间为与；2表示queryItems内多个条件之间为或。所以这边需要旋转一下。
+//            // fillQueryBuilder执行时，1是外与内或。不旋转的话会执行内或。
+//            queryRequestParam.setLogicalOperator(queryRequestParam.getLogicalOperator() == 1 ? 2 : 1);
+//            queryRequestParam.setQueryItems(null);
+//        }
     }
 
     /**
@@ -212,6 +213,9 @@ public QueryResultDto query(QueryRequestParam queryRequestParam) throws IllegalA
     public QueryResultDto queryCommon(QueryRequestParam queryRequestParam) throws IllegalArgumentException {
         try {
             log.info("queryRequestParam:{}", JSONObject.toJSONString(queryRequestParam));
+            if (!CollectionUtils.isEmpty(queryRequestParam.getQueryItems()) && !CollectionUtils.isEmpty(queryRequestParam.getQueryItemList())) {
+                throw new IllegalArgumentException("queryItems和queryItemList不能同时存在");
+            }
             LocalDateTime now1 = LocalDateTime.now();
             fillDefaultParam(queryRequestParam);
             SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
@@ -239,8 +243,11 @@ public QueryResultDto queryCommon(QueryRequestParam queryRequestParam) throws Il
             }
             BoolQueryBuilder queryBuilder = new BoolQueryBuilder();
             // 查询条件 1与2或
-            if (queryRequestParam.getQueryItemList() != null) {
-                queryBuilder = fillQueryBuilder(queryRequestParam);
+            if (!CollectionUtils.isEmpty(queryRequestParam.getQueryItems())) {
+                queryBuilder = fillQueryBuilderQueryItems(queryRequestParam.getLogicalOperator(), queryRequestParam.getQueryItems());
+            } else if (!CollectionUtils.isEmpty(queryRequestParam.getQueryItemList())) {
+                // 查询条件 1与或 2或与
+                queryBuilder = fillQueryBuilderQueryList(queryRequestParam.getLogicalOperator(), queryRequestParam.getQueryItemList());
             }
             String scrollTime = null;
             if (queryRequestParam.getScrollTime() != null) {
@@ -277,11 +284,11 @@ private Map<Object, Object> handleQueryItemsDto(String queryValue) {
         return map;
     }
 
-    private BoolQueryBuilder fillQueryBuilder(QueryRequestParam queryRequestParam) {
+    private BoolQueryBuilder fillQueryBuilderQueryList(Integer logicalOperator, List<QueryItemsListDto> queryItemList) {
         //1与2或
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
-        if (queryRequestParam.getLogicalOperator() == 1) {
-            queryRequestParam.getQueryItemList().forEach(queryItemListDto -> {
+        if (logicalOperator == 1) {
+            queryItemList.forEach(queryItemListDto -> {
                 BoolQueryBuilder queryBuilderItem = QueryBuilders.boolQuery();
                 queryItemListDto.getQueryItems().forEach(queryItemDto -> {
                     //查询类型，精确1 termQuery、模糊2 wildcardQuery、范围3 rangeQuery
@@ -302,12 +309,14 @@ private BoolQueryBuilder fillQueryBuilder(QueryRequestParam queryRequestParam) {
                         });
                     } else if (queryItemDto.getQueryType() == 4) {
                         queryBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue())));
+                    } else if (queryItemDto.getQueryType() == 5) {
+                        queryBuilderItem.should(QueryBuilders.matchQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
                     }
                 });
                 queryBuilder.must(queryBuilderItem);
             });
         } else {
-            queryRequestParam.getQueryItemList().forEach(queryItemListDto -> {
+            queryItemList.forEach(queryItemListDto -> {
                 BoolQueryBuilder queryBuilderItem = QueryBuilders.boolQuery();
                 queryItemListDto.getQueryItems().forEach(queryItemDto -> {
                     //查询类型，精确1 termQuery、模糊2 wildcardQuery、范围3 rangeQuery
@@ -328,6 +337,8 @@ private BoolQueryBuilder fillQueryBuilder(QueryRequestParam queryRequestParam) {
                         });
                     } else if (queryItemDto.getQueryType() == 4) {
                         queryBuilder.mustNot(QueryBuilders.termQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
+                    } else if (queryItemDto.getQueryType() == 5) {
+                        queryBuilderItem.must(QueryBuilders.matchQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
                     }
                 });
                 queryBuilder.should(queryBuilderItem);
@@ -335,4 +346,60 @@ private BoolQueryBuilder fillQueryBuilder(QueryRequestParam queryRequestParam) {
         }
         return queryBuilder;
     }
+
+
+    private BoolQueryBuilder fillQueryBuilderQueryItems(Integer logicalOperator, List<QueryItemsDto> queryItems) {
+        //1与2或
+        BoolQueryBuilder queryBuilderItem = QueryBuilders.boolQuery();
+        if (logicalOperator == 2) {
+            queryItems.forEach(queryItemDto -> {
+                //查询类型，精确1 termQuery、模糊2 wildcardQuery、范围3 rangeQuery
+                if (queryItemDto.getQueryType() == 1) {
+                    queryBuilderItem.should(QueryBuilders.termQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
+                } else if (queryItemDto.getQueryType() == 2) {
+                    queryBuilderItem.should(QueryBuilders.wildcardQuery(queryItemDto.getParameter(), "*" + queryItemDto.getQueryValue() + "*"));
+                } else if (queryItemDto.getQueryType() == 3) {
+                    Map<Object, Object> mapQueryValue = handleQueryItemsDto(queryItemDto.getQueryValue());
+                    mapQueryValue.forEach((key, value) -> {
+                        if (key != null && value != null) {
+                            queryBuilderItem.should(QueryBuilders.rangeQuery(queryItemDto.getParameter()).gte(key).lte(value));
+                        } else if (key != null) {
+                            queryBuilderItem.should(QueryBuilders.rangeQuery(queryItemDto.getParameter()).gte(key));
+                        } else if (value != null) {
+                            queryBuilderItem.should(QueryBuilders.rangeQuery(queryItemDto.getParameter()).lte(value));
+                        }
+                    });
+                } else if (queryItemDto.getQueryType() == 4) {
+                    queryBuilderItem.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.termQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue())));
+                } else if (queryItemDto.getQueryType() == 5) {
+                    queryBuilderItem.should(QueryBuilders.matchQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
+                }
+            });
+        } else {
+            queryItems.forEach(queryItemDto -> {
+                //查询类型，精确1 termQuery、模糊2 wildcardQuery、范围3 rangeQuery
+                if (queryItemDto.getQueryType() == 1) {
+                    queryBuilderItem.must(QueryBuilders.termQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
+                } else if (queryItemDto.getQueryType() == 2) {
+                    queryBuilderItem.must(QueryBuilders.wildcardQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
+                } else if (queryItemDto.getQueryType() == 3) {
+                    Map<Object, Object> mapQueryValue = handleQueryItemsDto(queryItemDto.getQueryValue());
+                    mapQueryValue.forEach((key, value) -> {
+                        if (key != null && value != null) {
+                            queryBuilderItem.must(QueryBuilders.rangeQuery(queryItemDto.getParameter()).gte(key).lte(value));
+                        } else if (key != null) {
+                            queryBuilderItem.must(QueryBuilders.rangeQuery(queryItemDto.getParameter()).gte(key));
+                        } else if (value != null) {
+                            queryBuilderItem.must(QueryBuilders.rangeQuery(queryItemDto.getParameter()).lte(value));
+                        }
+                    });
+                } else if (queryItemDto.getQueryType() == 4) {
+                    queryBuilderItem.mustNot(QueryBuilders.termQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
+                } else if (queryItemDto.getQueryType() == 5) {
+                    queryBuilderItem.must(QueryBuilders.matchQuery(queryItemDto.getParameter(), queryItemDto.getQueryValue()));
+                }
+            });
+        }
+        return queryBuilderItem;
+    }
 }
diff --git a/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/dto/QueryItemsDto.java b/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/dto/QueryItemsDto.java
index 399366331..d65bb4410 100644
--- a/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/dto/QueryItemsDto.java
+++ b/common-es-search-tool/src/main/java/com/netease/lowcode/lib/api/dto/QueryItemsDto.java
@@ -9,7 +9,7 @@ public class QueryItemsDto {
      */
     public String parameter;
     /**
-     * 查询类型，精确1、模糊2、范围3、不等于4
+     * 查询类型，精确1 termQuery、模糊2 wildcardQuery、范围3 rangeQuery、4不等于、5 matchQuery
      */
     public Integer queryType;
     /**
diff --git a/freemarker-tool/pom.xml b/freemarker-tool/pom.xml
index 3f3398f5d..8104260f8 100644
--- a/freemarker-tool/pom.xml
+++ b/freemarker-tool/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.netease.lowcode</groupId>
     <artifactId>freemarker-tool</artifactId>
     <!-- We currently do not support snapshots. Please use a testing version number like 0.x.x, e.g. 0.1.12 -->
-    <version>1.3.7</version>
+    <version>1.4.0</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -113,38 +113,38 @@
 
     <build>
         <plugins>
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-shade-plugin</artifactId>-->
-<!--                <version>3.2.2</version>-->
-<!--                <configuration>-->
-<!--                    <relocations>-->
-<!--                        <relocation>-->
-<!--                            <pattern>com.spire</pattern>-->
-<!--                            <shadedPattern>shade.extension.freemarker.com.spire</shadedPattern>-->
-<!--                        </relocation>-->
-<!--                        <relocation>-->
-<!--                            <pattern>okhttp3</pattern>-->
-<!--                            <shadedPattern>shade.extension.freemarker.okhttp3</shadedPattern>-->
-<!--                        </relocation>-->
-<!--                    </relocations>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>shade</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
+            <!--            <plugin>-->
+            <!--                <groupId>org.apache.maven.plugins</groupId>-->
+            <!--                <artifactId>maven-shade-plugin</artifactId>-->
+            <!--                <version>3.2.2</version>-->
+            <!--                <configuration>-->
+            <!--                    <relocations>-->
+            <!--                        <relocation>-->
+            <!--                            <pattern>com.spire</pattern>-->
+            <!--                            <shadedPattern>shade.extension.freemarker.com.spire</shadedPattern>-->
+            <!--                        </relocation>-->
+            <!--                        <relocation>-->
+            <!--                            <pattern>okhttp3</pattern>-->
+            <!--                            <shadedPattern>shade.extension.freemarker.okhttp3</shadedPattern>-->
+            <!--                        </relocation>-->
+            <!--                    </relocations>-->
+            <!--                </configuration>-->
+            <!--                <executions>-->
+            <!--                    <execution>-->
+            <!--                        <phase>package</phase>-->
+            <!--                        <goals>-->
+            <!--                            <goal>shade</goal>-->
+            <!--                        </goals>-->
+            <!--                    </execution>-->
+            <!--                </executions>-->
+            <!--            </plugin>-->
             <plugin>
                 <groupId>com.netease.lowcode</groupId>
                 <artifactId>nasl-metadata-maven-plugin</artifactId>
                 <version>1.4.1</version>
                 <configuration>
                     <jarWithDependencies>false</jarWithDependencies>
-                    <rewriteVersion>false</rewriteVersion>
+                    <rewriteVersion>true</rewriteVersion>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/freemarker-tool/src/main/java/com/netease/lowcode/freemarker/util/FreeMarkerUtil.java b/freemarker-tool/src/main/java/com/netease/lowcode/freemarker/util/FreeMarkerUtil.java
index da3c58140..474d575ce 100644
--- a/freemarker-tool/src/main/java/com/netease/lowcode/freemarker/util/FreeMarkerUtil.java
+++ b/freemarker-tool/src/main/java/com/netease/lowcode/freemarker/util/FreeMarkerUtil.java
@@ -10,17 +10,11 @@
 import com.spire.xls.FileFormat;
 import com.spire.xls.Workbook;
 import freemarker.cache.URLTemplateLoader;
-import freemarker.core.HTMLOutputFormat;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -37,7 +31,10 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
@@ -79,12 +76,12 @@ public static DownloadResponseDTO createFile(CreateRequest request) {
                 return DownloadResponseDTO.OK(outUrl.getResult(), outUrl.getFilePath());
             } else {
 
-                return DownloadResponseDTO.FAIL("文件上传失败","");
+                return DownloadResponseDTO.FAIL("文件上传失败", "");
             }
 
         } catch (Throwable e) {
 
-            return DownloadResponseDTO.FAIL("执行异常:"+e.getMessage(), Arrays.toString(e.getStackTrace()));
+            return DownloadResponseDTO.FAIL("执行异常:" + e.getMessage(), Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -122,12 +119,12 @@ public static DownloadResponseDTO createNewXlsx(CreateRequest request) {
                 return DownloadResponseDTO.OK(outUrl.getResult(), outUrl.getFilePath());
             } else {
 
-                return DownloadResponseDTO.FAIL("文件上传失败","");
+                return DownloadResponseDTO.FAIL("文件上传失败", "");
             }
 
         } catch (Throwable e) {
 
-            return DownloadResponseDTO.FAIL("执行异常:"+e.getMessage(), Arrays.toString(e.getStackTrace()));
+            return DownloadResponseDTO.FAIL("执行异常:" + e.getMessage(), Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -141,7 +138,7 @@ public static DownloadResponseDTO createNewXlsx(CreateRequest request) {
     public static DownloadResponseDTO createNewDocxFile(CreateDocxRequest request) {
         log.info("createDocxFile request:{}", request);
 
-        Map<String,String> templateFileMap = new HashMap<>();
+        Map<String, String> templateFileMap = new HashMap<>();
         try {
             CreateDocxRequestValidator.validate(request);
 
@@ -176,7 +173,7 @@ public static DownloadResponseDTO createNewDocxFile(CreateDocxRequest request) {
             // 下载模板文件
             if (request.templateUrl != null) {
                 for (Map.Entry<String, String> entry : request.templateUrl.entrySet()) {
-                    templateFileMap.put(entry.getKey(),FileUtil.getTrueUrl(entry.getValue()));
+                    templateFileMap.put(entry.getKey(), FileUtil.getTrueUrl(entry.getValue()));
                 }
             }
 
@@ -193,14 +190,14 @@ public static DownloadResponseDTO createNewDocxFile(CreateDocxRequest request) {
 //                System.out.println("文件写入成功");
 //            }
             // 上传文件
-            UploadResponseDTO outUrl = FileUtil.uploadStream(new ByteArrayInputStream(outputStream.toByteArray()),request.outFileName);
+            UploadResponseDTO outUrl = FileUtil.uploadStream(new ByteArrayInputStream(outputStream.toByteArray()), request.outFileName);
             outputStream.close();
             if (Objects.nonNull(outUrl)) {
 
                 return DownloadResponseDTO.OK(outUrl.getResult(), outUrl.getFilePath());
             } else {
 
-                return DownloadResponseDTO.FAIL("文件上传失败","");
+                return DownloadResponseDTO.FAIL("文件上传失败", "");
             }
         } catch (Throwable e) {
             return DownloadResponseDTO.FAIL("执行异常:" + e.getMessage(), Arrays.toString(e.getStackTrace()));
@@ -210,7 +207,7 @@ public static DownloadResponseDTO createNewDocxFile(CreateDocxRequest request) {
     public static ByteArrayOutputStream createDocx(String jsonData,
                                                    Map<String, String> picMap,
                                                    InputStream docxInputSteam,
-                                                   Map<String,String> templateFileMap,
+                                                   Map<String, String> templateFileMap,
                                                    boolean enableRichTextImage) throws Exception {
         log.info("createDocx jsonData:{}, picMap:{}, docxInputSteam:{}, templateFileMap:{}, enableRichTextImage:{}", jsonData, picMap, docxInputSteam, templateFileMap, enableRichTextImage);
         ZipOutputStream zipOut = null;
@@ -247,13 +244,13 @@ public static ByteArrayOutputStream createDocx(String jsonData,
             //最初设计的模板
             zipOut = new ZipOutputStream(outputStream);
             //开始覆盖文档, 不要删除原图片，存在无需替换的情况，因此全部保留
-            writeZipFileV2(new ByteArrayInputStream(templateDocBytes),zipOut,templateFileStreamMap);
+            writeZipFileV2(new ByteArrayInputStream(templateDocBytes), zipOut, templateFileStreamMap);
             //写入图片 ，可能存在用户命名与保留文件重复，客户图片名称前加特定标识，由用户控制
             writePicture(picMap, zipOut);
 
             return outputStream;
         } finally {
-            if (zipOut != null){
+            if (zipOut != null) {
                 zipOut.close();
             }
         }
@@ -282,7 +279,7 @@ protected URL getURL(String name) {
     }
 
     private static void writeZipFileV2(InputStream zipInputStream,
-                                       ZipOutputStream zipOut,Map<String, ByteArrayInputStream> templateFileStreamMap) throws IOException {
+                                       ZipOutputStream zipOut, Map<String, ByteArrayInputStream> templateFileStreamMap) throws IOException {
 
         int len;
         byte[] buffer = new byte[1024];
@@ -317,10 +314,10 @@ private static void writePicture(Map<String, String> picMap, ZipOutputStream zip
         Base64.Decoder decoder = Base64.getDecoder();
         for (Map.Entry<String, String> entry : picMap.entrySet()) {
             // 用户输入的图片名称可能会与原文件重复，这里交由使用方控制，图片名称前加个标识区分，防止覆盖
-            ZipEntry next = new ZipEntry("word/media/"+entry.getKey());
+            ZipEntry next = new ZipEntry("word/media/" + entry.getKey());
             zipout.putNextEntry(new ZipEntry(next.toString()));
             byte[] bytes = decoder.decode(entry.getValue());
-            InputStream in  = new ByteArrayInputStream(bytes);
+            InputStream in = new ByteArrayInputStream(bytes);
             while ((len = in.read(buffer)) != -1) {
                 zipout.write(buffer, 0, len);
             }
@@ -582,4 +579,19 @@ private static String guessImageContentType(String extension) {
                 return "image/" + extension;
         }
     }
+
+    /**
+     * 通用文本模板处理
+     */
+    @NaslLogic
+    public static String textFreemarker(String templateStr, Map<String, String> data) {
+        try {
+            Template template = new Template("dynamic", new StringReader(templateStr));
+            StringWriter writer = new StringWriter();
+            template.process(data, writer);
+            return writer.toString();
+        } catch (Exception e) {
+            throw new RuntimeException("模板处理失败", e);
+        }
+    }
 }
diff --git a/redis-template-tool/pom.xml b/redis-template-tool/pom.xml
index c3272a748..643854d28 100644
--- a/redis-template-tool/pom.xml
+++ b/redis-template-tool/pom.xml
@@ -84,7 +84,7 @@
                 <version>1.5.1</version>
                 <configuration>
                     <jarWithDependencies>false</jarWithDependencies>
-                    <rewriteVersion>true</rewriteVersion>
+<!--                    <rewriteVersion>true</rewriteVersion>-->
                 </configuration>
                 <executions>
                     <execution>