diff --git a/admin/admin-biz/src/main/resources/bootstrap.yml b/admin/admin-biz/src/main/resources/bootstrap.yml
index ea5f92b..56b327b 100644
--- a/admin/admin-biz/src/main/resources/bootstrap.yml
+++ b/admin/admin-biz/src/main/resources/bootstrap.yml
@@ -36,7 +36,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}
diff --git a/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java b/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java
index fd78645..b8023e1 100644
--- a/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java
+++ b/auth/src/main/java/cn/fateverse/auth/config/CaptchaConfig.java
@@ -34,7 +34,7 @@ public class CaptchaConfig {
         //鱼眼 com.google.code.kaptcha.impl.FishEyeGimpy
         //阴影 com.google.code.kaptcha.impl.ShadowGimpy
 //        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ#$!@&%");
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"1234567890");
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"0123456789");
         properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
         DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
         Config config = new Config(properties);
diff --git a/auth/src/main/resources/bootstrap.yml b/auth/src/main/resources/bootstrap.yml
index 49756c5..5fb4c30 100644
--- a/auth/src/main/resources/bootstrap.yml
+++ b/auth/src/main/resources/bootstrap.yml
@@ -39,7 +39,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}
diff --git a/visual/code-gen/pom.xml b/code-gen/pom.xml
similarity index 100%
rename from visual/code-gen/pom.xml
rename to code-gen/pom.xml
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/CodeGenApplication.java b/code-gen/src/main/java/cn/fateverse/code/CodeGenApplication.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/CodeGenApplication.java
rename to code-gen/src/main/java/cn/fateverse/code/CodeGenApplication.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/aspect/DynamicTableAspect.java b/code-gen/src/main/java/cn/fateverse/code/aspect/DynamicTableAspect.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/aspect/DynamicTableAspect.java
rename to code-gen/src/main/java/cn/fateverse/code/aspect/DynamicTableAspect.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/config/CodeGenConfig.java b/code-gen/src/main/java/cn/fateverse/code/config/CodeGenConfig.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/config/CodeGenConfig.java
rename to code-gen/src/main/java/cn/fateverse/code/config/CodeGenConfig.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/controller/DataSourceController.java b/code-gen/src/main/java/cn/fateverse/code/controller/DataSourceController.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/controller/DataSourceController.java
rename to code-gen/src/main/java/cn/fateverse/code/controller/DataSourceController.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/controller/DynamicTableController.java b/code-gen/src/main/java/cn/fateverse/code/controller/DynamicTableController.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/controller/DynamicTableController.java
rename to code-gen/src/main/java/cn/fateverse/code/controller/DynamicTableController.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/controller/RegularController.java b/code-gen/src/main/java/cn/fateverse/code/controller/RegularController.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/controller/RegularController.java
rename to code-gen/src/main/java/cn/fateverse/code/controller/RegularController.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/controller/TableController.java b/code-gen/src/main/java/cn/fateverse/code/controller/TableController.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/controller/TableController.java
rename to code-gen/src/main/java/cn/fateverse/code/controller/TableController.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/ApiClass.java b/code-gen/src/main/java/cn/fateverse/code/entity/ApiClass.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/ApiClass.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/ApiClass.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/CodeDataSource.java b/code-gen/src/main/java/cn/fateverse/code/entity/CodeDataSource.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/CodeDataSource.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/CodeDataSource.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/DynamicPage.java b/code-gen/src/main/java/cn/fateverse/code/entity/DynamicPage.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/DynamicPage.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/DynamicPage.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/InterTable.java b/code-gen/src/main/java/cn/fateverse/code/entity/InterTable.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/InterTable.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/InterTable.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/Module.java b/code-gen/src/main/java/cn/fateverse/code/entity/Module.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/Module.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/Module.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/OptionInfo.java b/code-gen/src/main/java/cn/fateverse/code/entity/OptionInfo.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/OptionInfo.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/OptionInfo.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/Regular.java b/code-gen/src/main/java/cn/fateverse/code/entity/Regular.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/Regular.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/Regular.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/RelTable.java b/code-gen/src/main/java/cn/fateverse/code/entity/RelTable.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/RelTable.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/RelTable.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/RelTableColumn.java b/code-gen/src/main/java/cn/fateverse/code/entity/RelTableColumn.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/RelTableColumn.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/RelTableColumn.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/Table.java b/code-gen/src/main/java/cn/fateverse/code/entity/Table.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/Table.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/Table.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/TableColumn.java b/code-gen/src/main/java/cn/fateverse/code/entity/TableColumn.java
similarity index 99%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/TableColumn.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/TableColumn.java
index de9d58d..6c15665 100644
--- a/visual/code-gen/src/main/java/cn/fateverse/code/entity/TableColumn.java
+++ b/code-gen/src/main/java/cn/fateverse/code/entity/TableColumn.java
@@ -1,6 +1,5 @@
 package cn.fateverse.code.entity;
 
-import cn.hutool.core.util.StrUtil;
 import cn.fateverse.code.util.constant.CodeGenConstants;
 import cn.fateverse.common.core.annotaion.EnableAutoField;
 import cn.fateverse.common.core.entity.BaseEntity;
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/bo/TableGenBo.java b/code-gen/src/main/java/cn/fateverse/code/entity/bo/TableGenBo.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/bo/TableGenBo.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/bo/TableGenBo.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/DataSourceDto.java b/code-gen/src/main/java/cn/fateverse/code/entity/dto/DataSourceDto.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/DataSourceDto.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/dto/DataSourceDto.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/ImportDto.java b/code-gen/src/main/java/cn/fateverse/code/entity/dto/ImportDto.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/ImportDto.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/dto/ImportDto.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/RegularDto.java b/code-gen/src/main/java/cn/fateverse/code/entity/dto/RegularDto.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/RegularDto.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/dto/RegularDto.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/TableDto.java b/code-gen/src/main/java/cn/fateverse/code/entity/dto/TableDto.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/dto/TableDto.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/dto/TableDto.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/query/DataSourceQuery.java b/code-gen/src/main/java/cn/fateverse/code/entity/query/DataSourceQuery.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/query/DataSourceQuery.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/query/DataSourceQuery.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/query/DynamicTable.java b/code-gen/src/main/java/cn/fateverse/code/entity/query/DynamicTable.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/query/DynamicTable.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/query/DynamicTable.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/query/RegularQuery.java b/code-gen/src/main/java/cn/fateverse/code/entity/query/RegularQuery.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/query/RegularQuery.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/query/RegularQuery.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/query/TableQuery.java b/code-gen/src/main/java/cn/fateverse/code/entity/query/TableQuery.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/query/TableQuery.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/query/TableQuery.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/DataSourceVo.java b/code-gen/src/main/java/cn/fateverse/code/entity/vo/DataSourceVo.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/DataSourceVo.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/vo/DataSourceVo.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/RegularVo.java b/code-gen/src/main/java/cn/fateverse/code/entity/vo/RegularVo.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/RegularVo.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/vo/RegularVo.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/TableInfoVo.java b/code-gen/src/main/java/cn/fateverse/code/entity/vo/TableInfoVo.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/TableInfoVo.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/vo/TableInfoVo.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/TableVo.java b/code-gen/src/main/java/cn/fateverse/code/entity/vo/TableVo.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/entity/vo/TableVo.java
rename to code-gen/src/main/java/cn/fateverse/code/entity/vo/TableVo.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/enums/BackTemplateEnum.java b/code-gen/src/main/java/cn/fateverse/code/enums/BackTemplateEnum.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/enums/BackTemplateEnum.java
rename to code-gen/src/main/java/cn/fateverse/code/enums/BackTemplateEnum.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/enums/DynamicSourceEnum.java b/code-gen/src/main/java/cn/fateverse/code/enums/DynamicSourceEnum.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/enums/DynamicSourceEnum.java
rename to code-gen/src/main/java/cn/fateverse/code/enums/DynamicSourceEnum.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/enums/FrontTemplateEnum.java b/code-gen/src/main/java/cn/fateverse/code/enums/FrontTemplateEnum.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/enums/FrontTemplateEnum.java
rename to code-gen/src/main/java/cn/fateverse/code/enums/FrontTemplateEnum.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/factory/DynamicDataSourceService.java b/code-gen/src/main/java/cn/fateverse/code/factory/DynamicDataSourceService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/factory/DynamicDataSourceService.java
rename to code-gen/src/main/java/cn/fateverse/code/factory/DynamicDataSourceService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/factory/DynamicTableService.java b/code-gen/src/main/java/cn/fateverse/code/factory/DynamicTableService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/factory/DynamicTableService.java
rename to code-gen/src/main/java/cn/fateverse/code/factory/DynamicTableService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/factory/impl/AbstractDynamicTableService.java b/code-gen/src/main/java/cn/fateverse/code/factory/impl/AbstractDynamicTableService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/factory/impl/AbstractDynamicTableService.java
rename to code-gen/src/main/java/cn/fateverse/code/factory/impl/AbstractDynamicTableService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/factory/impl/MySQLDynamicTableService.java b/code-gen/src/main/java/cn/fateverse/code/factory/impl/MySQLDynamicTableService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/factory/impl/MySQLDynamicTableService.java
rename to code-gen/src/main/java/cn/fateverse/code/factory/impl/MySQLDynamicTableService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/factory/impl/OracleDynamicTableService.java b/code-gen/src/main/java/cn/fateverse/code/factory/impl/OracleDynamicTableService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/factory/impl/OracleDynamicTableService.java
rename to code-gen/src/main/java/cn/fateverse/code/factory/impl/OracleDynamicTableService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/mapper/DataSourceMapper.java b/code-gen/src/main/java/cn/fateverse/code/mapper/DataSourceMapper.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/mapper/DataSourceMapper.java
rename to code-gen/src/main/java/cn/fateverse/code/mapper/DataSourceMapper.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/mapper/RegularMapper.java b/code-gen/src/main/java/cn/fateverse/code/mapper/RegularMapper.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/mapper/RegularMapper.java
rename to code-gen/src/main/java/cn/fateverse/code/mapper/RegularMapper.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/mapper/TableColumnMapper.java b/code-gen/src/main/java/cn/fateverse/code/mapper/TableColumnMapper.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/mapper/TableColumnMapper.java
rename to code-gen/src/main/java/cn/fateverse/code/mapper/TableColumnMapper.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/mapper/TableMapper.java b/code-gen/src/main/java/cn/fateverse/code/mapper/TableMapper.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/mapper/TableMapper.java
rename to code-gen/src/main/java/cn/fateverse/code/mapper/TableMapper.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/DynamicTableMapper.java b/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/DynamicTableMapper.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/DynamicTableMapper.java
rename to code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/DynamicTableMapper.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/MySqlDynamicTableMapper.java b/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/MySqlDynamicTableMapper.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/MySqlDynamicTableMapper.java
rename to code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/MySqlDynamicTableMapper.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/OracleDynamicTableMapper.java b/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/OracleDynamicTableMapper.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/OracleDynamicTableMapper.java
rename to code-gen/src/main/java/cn/fateverse/code/mapper/dynamic/OracleDynamicTableMapper.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/DataSourceService.java b/code-gen/src/main/java/cn/fateverse/code/service/DataSourceService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/DataSourceService.java
rename to code-gen/src/main/java/cn/fateverse/code/service/DataSourceService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/DynamicTableMetadataService.java b/code-gen/src/main/java/cn/fateverse/code/service/DynamicTableMetadataService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/DynamicTableMetadataService.java
rename to code-gen/src/main/java/cn/fateverse/code/service/DynamicTableMetadataService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/RegularService.java b/code-gen/src/main/java/cn/fateverse/code/service/RegularService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/RegularService.java
rename to code-gen/src/main/java/cn/fateverse/code/service/RegularService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/TableService.java b/code-gen/src/main/java/cn/fateverse/code/service/TableService.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/TableService.java
rename to code-gen/src/main/java/cn/fateverse/code/service/TableService.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/impl/DataSourceServiceImpl.java b/code-gen/src/main/java/cn/fateverse/code/service/impl/DataSourceServiceImpl.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/impl/DataSourceServiceImpl.java
rename to code-gen/src/main/java/cn/fateverse/code/service/impl/DataSourceServiceImpl.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/impl/DynamicTableMetadataServiceImpl.java b/code-gen/src/main/java/cn/fateverse/code/service/impl/DynamicTableMetadataServiceImpl.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/impl/DynamicTableMetadataServiceImpl.java
rename to code-gen/src/main/java/cn/fateverse/code/service/impl/DynamicTableMetadataServiceImpl.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/impl/RegularServiceImpl.java b/code-gen/src/main/java/cn/fateverse/code/service/impl/RegularServiceImpl.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/impl/RegularServiceImpl.java
rename to code-gen/src/main/java/cn/fateverse/code/service/impl/RegularServiceImpl.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/service/impl/TableServiceImpl.java b/code-gen/src/main/java/cn/fateverse/code/service/impl/TableServiceImpl.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/service/impl/TableServiceImpl.java
rename to code-gen/src/main/java/cn/fateverse/code/service/impl/TableServiceImpl.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/util/constant/CodeGenConstants.java b/code-gen/src/main/java/cn/fateverse/code/util/constant/CodeGenConstants.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/util/constant/CodeGenConstants.java
rename to code-gen/src/main/java/cn/fateverse/code/util/constant/CodeGenConstants.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityInitializer.java b/code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityInitializer.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityInitializer.java
rename to code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityInitializer.java
diff --git a/visual/code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityUtils.java b/code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityUtils.java
similarity index 100%
rename from visual/code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityUtils.java
rename to code-gen/src/main/java/cn/fateverse/code/util/velocity/VelocityUtils.java
diff --git a/visual/code-gen/src/main/resources/bootstrap-pro.yml b/code-gen/src/main/resources/bootstrap-pro.yml
similarity index 100%
rename from visual/code-gen/src/main/resources/bootstrap-pro.yml
rename to code-gen/src/main/resources/bootstrap-pro.yml
diff --git a/visual/code-gen/src/main/resources/bootstrap.yml b/code-gen/src/main/resources/bootstrap.yml
similarity index 97%
rename from visual/code-gen/src/main/resources/bootstrap.yml
rename to code-gen/src/main/resources/bootstrap.yml
index 651040f..bf69b79 100644
--- a/visual/code-gen/src/main/resources/bootstrap.yml
+++ b/code-gen/src/main/resources/bootstrap.yml
@@ -34,7 +34,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}
diff --git a/visual/code-gen/src/main/resources/mapper/DataSourceMapper.xml b/code-gen/src/main/resources/mapper/DataSourceMapper.xml
similarity index 100%
rename from visual/code-gen/src/main/resources/mapper/DataSourceMapper.xml
rename to code-gen/src/main/resources/mapper/DataSourceMapper.xml
diff --git a/visual/code-gen/src/main/resources/mapper/RegularMapper.xml b/code-gen/src/main/resources/mapper/RegularMapper.xml
similarity index 100%
rename from visual/code-gen/src/main/resources/mapper/RegularMapper.xml
rename to code-gen/src/main/resources/mapper/RegularMapper.xml
diff --git a/visual/code-gen/src/main/resources/mapper/TableColumnMapper.xml b/code-gen/src/main/resources/mapper/TableColumnMapper.xml
similarity index 100%
rename from visual/code-gen/src/main/resources/mapper/TableColumnMapper.xml
rename to code-gen/src/main/resources/mapper/TableColumnMapper.xml
diff --git a/visual/code-gen/src/main/resources/mapper/TableMapper.xml b/code-gen/src/main/resources/mapper/TableMapper.xml
similarity index 100%
rename from visual/code-gen/src/main/resources/mapper/TableMapper.xml
rename to code-gen/src/main/resources/mapper/TableMapper.xml
diff --git a/visual/code-gen/src/main/resources/mapper/dynamic/DynamicTableMapper.xml b/code-gen/src/main/resources/mapper/dynamic/DynamicTableMapper.xml
similarity index 100%
rename from visual/code-gen/src/main/resources/mapper/dynamic/DynamicTableMapper.xml
rename to code-gen/src/main/resources/mapper/dynamic/DynamicTableMapper.xml
diff --git a/visual/code-gen/src/main/resources/mapper/dynamic/MySqlDynamicTableMapper.xml b/code-gen/src/main/resources/mapper/dynamic/MySqlDynamicTableMapper.xml
similarity index 100%
rename from visual/code-gen/src/main/resources/mapper/dynamic/MySqlDynamicTableMapper.xml
rename to code-gen/src/main/resources/mapper/dynamic/MySqlDynamicTableMapper.xml
diff --git a/visual/code-gen/src/main/resources/mapper/dynamic/OracleDynamicTableMapper.xml b/code-gen/src/main/resources/mapper/dynamic/OracleDynamicTableMapper.xml
similarity index 100%
rename from visual/code-gen/src/main/resources/mapper/dynamic/OracleDynamicTableMapper.xml
rename to code-gen/src/main/resources/mapper/dynamic/OracleDynamicTableMapper.xml
diff --git a/visual/code-gen/src/main/resources/vm/java/controller.java.vm b/code-gen/src/main/resources/vm/java/controller.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/controller.java.vm
rename to code-gen/src/main/resources/vm/java/controller.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/entity.java.vm b/code-gen/src/main/resources/vm/java/entity.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/entity.java.vm
rename to code-gen/src/main/resources/vm/java/entity.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/entityDto.java.vm b/code-gen/src/main/resources/vm/java/entityDto.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/entityDto.java.vm
rename to code-gen/src/main/resources/vm/java/entityDto.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/entityQuery.java.vm b/code-gen/src/main/resources/vm/java/entityQuery.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/entityQuery.java.vm
rename to code-gen/src/main/resources/vm/java/entityQuery.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/entityVo.java.vm b/code-gen/src/main/resources/vm/java/entityVo.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/entityVo.java.vm
rename to code-gen/src/main/resources/vm/java/entityVo.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/mybatis/mapper.java.vm b/code-gen/src/main/resources/vm/java/mybatis/mapper.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/mybatis/mapper.java.vm
rename to code-gen/src/main/resources/vm/java/mybatis/mapper.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/mybatis/serviceImpl.java.vm b/code-gen/src/main/resources/vm/java/mybatis/serviceImpl.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/mybatis/serviceImpl.java.vm
rename to code-gen/src/main/resources/vm/java/mybatis/serviceImpl.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/mybatisplus/mapper.java.vm b/code-gen/src/main/resources/vm/java/mybatisplus/mapper.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/mybatisplus/mapper.java.vm
rename to code-gen/src/main/resources/vm/java/mybatisplus/mapper.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/mybatisplus/serviceImpl.java.vm b/code-gen/src/main/resources/vm/java/mybatisplus/serviceImpl.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/mybatisplus/serviceImpl.java.vm
rename to code-gen/src/main/resources/vm/java/mybatisplus/serviceImpl.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/java/service.java.vm b/code-gen/src/main/resources/vm/java/service.java.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/java/service.java.vm
rename to code-gen/src/main/resources/vm/java/service.java.vm
diff --git a/visual/code-gen/src/main/resources/vm/react/api.ts.vm b/code-gen/src/main/resources/vm/react/api.ts.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/react/api.ts.vm
rename to code-gen/src/main/resources/vm/react/api.ts.vm
diff --git a/visual/code-gen/src/main/resources/vm/react/type.ts.vm b/code-gen/src/main/resources/vm/react/type.ts.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/react/type.ts.vm
rename to code-gen/src/main/resources/vm/react/type.ts.vm
diff --git a/visual/code-gen/src/main/resources/vm/react/view.tsx.vm b/code-gen/src/main/resources/vm/react/view.tsx.vm
similarity index 99%
rename from visual/code-gen/src/main/resources/vm/react/view.tsx.vm
rename to code-gen/src/main/resources/vm/react/view.tsx.vm
index 47a8d09..44a1867 100644
--- a/visual/code-gen/src/main/resources/vm/react/view.tsx.vm
+++ b/code-gen/src/main/resources/vm/react/view.tsx.vm
@@ -3,14 +3,14 @@ import { PlusCircleTwoTone, EditTwoTone, DeleteTwoTone, ExclamationCircleOutline
 import Table, { ColumnsType } from "antd/lib/table";
 import { TableRowSelection } from "antd/lib/table/interface";
 import React, { Fragment, useEffect, useReducer, useState } from "react";
-import { get${ClassName}List, get${ClassName}Details, add${ClassName}, edit${ClassName}, del${ClassName} } from "../../api/${businessName}";
+import { get${ClassName}List, get${ClassName}Details, add${ClassName}, edit${ClassName}, del${ClassName} } from "./view.tsx${businessName}";
 #if($table.hasDictSelect())
 import { DTag } from "../../components/DTag";
 import { getCacheType } from "../../utils/cache";
 #end
 import SearchForm from "../../components/SearchForm";
 import { IModalConfig, IResponse } from "../../type";
-import { DataType } from "../../type/${businessName}";
+import { DataType } from "./view.tsx${businessName}";
 import confirm from "antd/lib/modal/confirm";
 import { parseDateTime, queryReducer, reducerPagination } from "../../utils/tool";
 
diff --git a/visual/code-gen/src/main/resources/vm/vue/api.js.vm b/code-gen/src/main/resources/vm/vue/api.js.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/vue/api.js.vm
rename to code-gen/src/main/resources/vm/vue/api.js.vm
diff --git a/visual/code-gen/src/main/resources/vm/vue/index.vue.vm b/code-gen/src/main/resources/vm/vue/index.vue.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/vue/index.vue.vm
rename to code-gen/src/main/resources/vm/vue/index.vue.vm
diff --git a/visual/code-gen/src/main/resources/vm/xml/mapperMySql.xml.vm b/code-gen/src/main/resources/vm/xml/mapperMySql.xml.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/xml/mapperMySql.xml.vm
rename to code-gen/src/main/resources/vm/xml/mapperMySql.xml.vm
diff --git a/visual/code-gen/src/main/resources/vm/xml/mapperOracle.xml.vm b/code-gen/src/main/resources/vm/xml/mapperOracle.xml.vm
similarity index 100%
rename from visual/code-gen/src/main/resources/vm/xml/mapperOracle.xml.vm
rename to code-gen/src/main/resources/vm/xml/mapperOracle.xml.vm
diff --git a/visual/custom-query/pom.xml b/custom-query/custom-query-biz/pom.xml
similarity index 88%
rename from visual/custom-query/pom.xml
rename to custom-query/custom-query-biz/pom.xml
index 3ae5af9..9fa810b 100644
--- a/visual/custom-query/pom.xml
+++ b/custom-query/custom-query-biz/pom.xml
@@ -3,19 +3,28 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>visual</artifactId>
+        <artifactId>custom-query</artifactId>
         <groupId>cn.fateverse</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>custom-query</artifactId>
-    <description>自定义查询模块</description>
+    <artifactId>custom-query-biz</artifactId>
+
     <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
+
+
     <dependencies>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>custom-query-submter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>cn.fateverse</groupId>
             <artifactId>common-security</artifactId>
@@ -89,4 +98,5 @@
         </plugins>
     </build>
 
+
 </project>
\ No newline at end of file
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/CustomQueryApplication.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/CustomQueryApplication.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/CustomQueryApplication.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/CustomQueryApplication.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/aspect/DynamicDataSourceAspect.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/aspect/DynamicDataSourceAspect.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/aspect/DynamicDataSourceAspect.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/aspect/DynamicDataSourceAspect.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/constant/QueryConstant.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/constant/QueryConstant.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/constant/QueryConstant.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/constant/QueryConstant.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/DataAdapterController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataAdapterController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/DataAdapterController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataAdapterController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/DataSourceManageController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataSourceManageController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/DataSourceManageController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataSourceManageController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/DynamicDataSourceTableController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DynamicDataSourceTableController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/DynamicDataSourceTableController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DynamicDataSourceTableController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/DynamicEchartsController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DynamicEchartsController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/DynamicEchartsController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DynamicEchartsController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/PageController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PageController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/PageController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PageController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/SqlSearchController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/SqlSearchController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/SqlSearchController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/SqlSearchController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/SqlUniQueryController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/SqlUniQueryController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/SqlUniQueryController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/SqlUniQueryController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/TableController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TableController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/TableController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TableController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/TopoUniQueryController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TopoUniQueryController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/TopoUniQueryController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TopoUniQueryController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/controller/TopologySearchController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TopologySearchController.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/controller/TopologySearchController.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TopologySearchController.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/DataAdapter.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DataAdapter.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/DataAdapter.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DataAdapter.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/DataSourceManage.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DataSourceManage.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/DataSourceManage.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DataSourceManage.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/DataSourceManageCount.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DataSourceManageCount.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/DataSourceManageCount.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DataSourceManageCount.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/DynamicEcharts.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DynamicEcharts.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/DynamicEcharts.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DynamicEcharts.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/DynamicPage.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DynamicPage.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/DynamicPage.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DynamicPage.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/DynamicTable.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DynamicTable.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/DynamicTable.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/DynamicTable.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/Table.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Table.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/Table.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Table.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/TableColumn.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableColumn.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/TableColumn.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableColumn.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/TableInfo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableInfo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/TableInfo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableInfo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/TableRelationalMapping.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableRelationalMapping.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/TableRelationalMapping.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableRelationalMapping.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/TableRole.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableRole.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/TableRole.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/TableRole.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/UniColumn.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/UniColumn.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/UniColumn.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/UniColumn.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/UniCon.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/UniCon.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/UniCon.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/UniCon.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/UniQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/UniQuery.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/UniQuery.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/UniQuery.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/bo/SqlSelect.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/bo/SqlSelect.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/bo/SqlSelect.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/bo/SqlSelect.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/bo/TableBo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/bo/TableBo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/bo/TableBo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/bo/TableBo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/bo/TopologySelect.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/bo/TopologySelect.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/bo/TopologySelect.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/bo/TopologySelect.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/DataAdapterDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/DataAdapterDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/DataAdapterDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/DataAdapterDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/DataSourceManageDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/DataSourceManageDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/DataSourceManageDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/DataSourceManageDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/DynamicEchartsDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/DynamicEchartsDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/DynamicEchartsDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/DynamicEchartsDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/ImportDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/ImportDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/ImportDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/ImportDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/SearchInfo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/SearchInfo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/SearchInfo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/SearchInfo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/SqlDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/SqlDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/SqlDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/SqlDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TableColumnDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TableColumnDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TableColumnDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TableColumnDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TableDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TableDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TableDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TableDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TableRelationalMappingDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TableRelationalMappingDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TableRelationalMappingDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TableRelationalMappingDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TopoDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TopoDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/TopoDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/TopoDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/UniConDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/UniConDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/UniConDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/UniConDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/UniQueryDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/UniQueryDto.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/dto/UniQueryDto.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/UniQueryDto.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DataAdapterQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DataAdapterQuery.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DataAdapterQuery.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DataAdapterQuery.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DataSourceManageQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DataSourceManageQuery.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DataSourceManageQuery.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DataSourceManageQuery.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DynamicEchartsQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DynamicEchartsQuery.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DynamicEchartsQuery.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DynamicEchartsQuery.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DynamicTableQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DynamicTableQuery.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/query/DynamicTableQuery.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/DynamicTableQuery.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/query/TableQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/TableQuery.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/query/TableQuery.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/TableQuery.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/query/UniQueryQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/UniQueryQuery.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/query/UniQueryQuery.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/UniQueryQuery.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/Edge.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/Edge.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/Edge.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/Edge.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/EdgeConfig.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/EdgeConfig.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/EdgeConfig.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/EdgeConfig.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/Node.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/Node.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/Node.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/Node.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/NodeColumn.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/NodeColumn.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/NodeColumn.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/NodeColumn.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/TopologyBo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/TopologyBo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/topology/TopologyBo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/topology/TopologyBo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/CustomQueryResult.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/CustomQueryResult.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/CustomQueryResult.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/CustomQueryResult.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/DataSourceManageVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataSourceManageVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/DataSourceManageVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DataSourceManageVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/DynamicEchartsVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DynamicEchartsVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/DynamicEchartsVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/DynamicEchartsVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/SqlInfoVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SqlInfoVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/SqlInfoVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SqlInfoVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TableColumnVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TableColumnVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TableColumnVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TableColumnVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TableTopoVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TableTopoVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TableTopoVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TableTopoVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TableVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TableVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TableVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TableVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TopoVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TopoVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/TopoVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/TopoVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/UniConVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/UniConVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/UniConVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/UniConVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/UniQueryVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/UniQueryVo.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/entity/vo/UniQueryVo.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/UniQueryVo.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/enums/DataAdapterSource.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/DataAdapterSource.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/enums/DataAdapterSource.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/DataAdapterSource.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/enums/DataAdapterType.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/DataAdapterType.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/enums/DataAdapterType.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/DataAdapterType.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/enums/DynamicSourceEnum.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/DynamicSourceEnum.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/enums/DynamicSourceEnum.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/DynamicSourceEnum.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/factory/DynamicDataSourceFactory.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/DynamicDataSourceFactory.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/factory/DynamicDataSourceFactory.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/DynamicDataSourceFactory.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/factory/DynamicDataSourceService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/DynamicDataSourceService.java
similarity index 97%
rename from visual/custom-query/src/main/java/cn/fateverse/query/factory/DynamicDataSourceService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/DynamicDataSourceService.java
index 67b3dc7..78f74af 100644
--- a/visual/custom-query/src/main/java/cn/fateverse/query/factory/DynamicDataSourceService.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/DynamicDataSourceService.java
@@ -3,7 +3,6 @@ package cn.fateverse.query.factory;
 import cn.fateverse.common.core.exception.CustomException;
 import cn.fateverse.query.entity.DataSourceManage;
 import cn.fateverse.query.enums.DynamicSourceEnum;
-import cn.fateverse.query.factory.impl.AbstractDynamicDataSourceFactory;
 import cn.fateverse.query.mapper.DynamicDataSourceMapper;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/AbstractDynamicDataSourceFactory.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/AbstractDynamicDataSourceFactory.java
similarity index 93%
rename from visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/AbstractDynamicDataSourceFactory.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/AbstractDynamicDataSourceFactory.java
index ea08255..f963a44 100644
--- a/visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/AbstractDynamicDataSourceFactory.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/AbstractDynamicDataSourceFactory.java
@@ -3,6 +3,7 @@ package cn.fateverse.query.factory.impl;
 import cn.fateverse.query.entity.DataSourceManage;
 import cn.fateverse.query.entity.DynamicPage;
 import cn.fateverse.query.enums.DynamicSourceEnum;
+import cn.fateverse.query.submeter.datasource.SubmeterDataSource;
 import cn.fateverse.query.utils.MyBatisResourceUtils;
 import cn.hutool.core.util.StrUtil;
 import cn.fateverse.common.core.entity.PageInfo;
@@ -42,8 +43,10 @@ public abstract class AbstractDynamicDataSourceFactory implements DynamicDataSou
         } else {
             baseUrl = dataSourceManage.getUrl();
         }
+        //todo 后续分表查询可将数据源替换为新的数据源即可
         DataSource dataSource = new UnpooledDataSource(mysqlEnum.getDrive(), baseUrl,
                 dataSourceManage.getUsername(), dataSourceManage.getPassword());
+//        sessionFactoryBean.setDataSource(new SubmeterDataSource(dataSource));
         sessionFactoryBean.setDataSource(dataSource);
         SqlSessionFactory sqlSessionFactory;
         try {
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/MariaDynamicDataSourceFactory.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/MariaDynamicDataSourceFactory.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/MariaDynamicDataSourceFactory.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/MariaDynamicDataSourceFactory.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/MySqlDynamicDataSourceFactory.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/MySqlDynamicDataSourceFactory.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/MySqlDynamicDataSourceFactory.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/MySqlDynamicDataSourceFactory.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/OracleDynamicDataSourceFactory.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/OracleDynamicDataSourceFactory.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/OracleDynamicDataSourceFactory.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/OracleDynamicDataSourceFactory.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/PostgresDynamicDataSourceFactory.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/PostgresDynamicDataSourceFactory.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/factory/impl/PostgresDynamicDataSourceFactory.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/factory/impl/PostgresDynamicDataSourceFactory.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/handler/adapter/DataAdapterHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/adapter/DataAdapterHandler.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/handler/adapter/DataAdapterHandler.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/adapter/DataAdapterHandler.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/handler/adapter/impl/CustomQueryDataAdapterHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/adapter/impl/CustomQueryDataAdapterHandler.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/handler/adapter/impl/CustomQueryDataAdapterHandler.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/adapter/impl/CustomQueryDataAdapterHandler.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/handler/engine/EngineExecuteHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/EngineExecuteHandler.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/handler/engine/EngineExecuteHandler.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/EngineExecuteHandler.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/handler/reader/DataAdapterHandlerReader.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/reader/DataAdapterHandlerReader.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/handler/reader/DataAdapterHandlerReader.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/reader/DataAdapterHandlerReader.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/handler/reader/EngineExecuteHandlerReader.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/reader/EngineExecuteHandlerReader.java
similarity index 95%
rename from visual/custom-query/src/main/java/cn/fateverse/query/handler/reader/EngineExecuteHandlerReader.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/reader/EngineExecuteHandlerReader.java
index 9b53146..e5b6eb7 100644
--- a/visual/custom-query/src/main/java/cn/fateverse/query/handler/reader/EngineExecuteHandlerReader.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/reader/EngineExecuteHandlerReader.java
@@ -2,8 +2,6 @@ package cn.fateverse.query.handler.reader;
 
 import cn.fateverse.query.entity.DataAdapter;
 import cn.fateverse.query.handler.engine.EngineExecuteHandler;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/DataSourceManageMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataSourceManageMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/DataSourceManageMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataSourceManageMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/DynamicDataSourceMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DynamicDataSourceMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/DynamicDataSourceMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DynamicDataSourceMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/DynamicEchartsMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DynamicEchartsMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/DynamicEchartsMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DynamicEchartsMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableColumnMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableColumnMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableColumnMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableColumnMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableRelationalMappingMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableRelationalMappingMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableRelationalMappingMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableRelationalMappingMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableRoleMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableRoleMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/TableRoleMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/TableRoleMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/UniColumnMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniColumnMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/UniColumnMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniColumnMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/UniConMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniConMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/UniConMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniConMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/MariaDynamicDataSourceMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/MariaDynamicDataSourceMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/MariaDynamicDataSourceMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/MariaDynamicDataSourceMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/MySqlDynamicDataSourceMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/MySqlDynamicDataSourceMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/MySqlDynamicDataSourceMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/MySqlDynamicDataSourceMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/OracleDynamicDataSourceMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/OracleDynamicDataSourceMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/OracleDynamicDataSourceMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/OracleDynamicDataSourceMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/PostgresDynamicDataSourceMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/PostgresDynamicDataSourceMapper.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/mapper/dynamic/PostgresDynamicDataSourceMapper.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/dynamic/PostgresDynamicDataSourceMapper.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/DataAdapterService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataAdapterService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/DataAdapterService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataAdapterService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/DataSourceManageService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataSourceManageService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/DataSourceManageService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataSourceManageService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/DynamicDataSearchService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DynamicDataSearchService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/DynamicDataSearchService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DynamicDataSearchService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/DynamicDataSourceTableService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DynamicDataSourceTableService.java
similarity index 99%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/DynamicDataSourceTableService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DynamicDataSourceTableService.java
index 58ca6cb..a1ce6c1 100644
--- a/visual/custom-query/src/main/java/cn/fateverse/query/service/DynamicDataSourceTableService.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DynamicDataSourceTableService.java
@@ -11,7 +11,6 @@ import cn.fateverse.query.enums.DynamicSourceEnum;
 import cn.fateverse.query.entity.query.DynamicTableQuery;
 import cn.fateverse.query.mapper.DynamicDataSourceMapper;
 import cn.fateverse.query.mapper.TableMapper;
-import com.alibaba.fastjson2.JSON;
 import com.github.pagehelper.JSqlParser;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/DynamicEchartsService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DynamicEchartsService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/DynamicEchartsService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DynamicEchartsService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/PageService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/PageService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/PageService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/PageService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/SearchService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SearchService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/SearchService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SearchService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/SqlSearchService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SqlSearchService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/SqlSearchService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SqlSearchService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/TableService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/TableService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/TableService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/TableService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/TopologyAnalyzeService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/TopologyAnalyzeService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/TopologyAnalyzeService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/TopologyAnalyzeService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/TopologySearchService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/TopologySearchService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/TopologySearchService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/TopologySearchService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/UniQueryService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/UniQueryService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/UniQueryService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/UniQueryService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/AbstractUniQueryService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/AbstractUniQueryService.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/AbstractUniQueryService.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/AbstractUniQueryService.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DataAdapterServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DataAdapterServiceImpl.java
similarity index 98%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DataAdapterServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DataAdapterServiceImpl.java
index af95e37..f729233 100644
--- a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DataAdapterServiceImpl.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DataAdapterServiceImpl.java
@@ -14,7 +14,6 @@ import cn.fateverse.common.mybatis.utils.PageUtils;
 import cn.fateverse.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DataSourceManageServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DataSourceManageServiceImpl.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DataSourceManageServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DataSourceManageServiceImpl.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DynamicEchartsServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DynamicEchartsServiceImpl.java
similarity index 96%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DynamicEchartsServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DynamicEchartsServiceImpl.java
index 9807285..82a801e 100644
--- a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/DynamicEchartsServiceImpl.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/DynamicEchartsServiceImpl.java
@@ -9,10 +9,8 @@ import cn.fateverse.query.service.DynamicEchartsService;
 import cn.fateverse.common.core.entity.Option;
 import cn.fateverse.common.core.result.page.TableDataInfo;
 import cn.fateverse.common.mybatis.utils.PageUtils;
-import cn.fateverse.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/PageServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PageServiceImpl.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/PageServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PageServiceImpl.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/SqlSearchServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/SqlSearchServiceImpl.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/SqlSearchServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/SqlSearchServiceImpl.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/SqlUniQueryServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/SqlUniQueryServiceImpl.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/SqlUniQueryServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/SqlUniQueryServiceImpl.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/TableServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/TableServiceImpl.java
similarity index 99%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/TableServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/TableServiceImpl.java
index fba63a1..af28708 100644
--- a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/TableServiceImpl.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/TableServiceImpl.java
@@ -24,7 +24,6 @@ import cn.fateverse.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/TopoUniQueryServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/TopoUniQueryServiceImpl.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/TopoUniQueryServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/TopoUniQueryServiceImpl.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/service/impl/TopologySearchServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/TopologySearchServiceImpl.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/service/impl/TopologySearchServiceImpl.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/TopologySearchServiceImpl.java
diff --git a/visual/custom-query/src/main/java/cn/fateverse/query/utils/MyBatisResourceUtils.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/utils/MyBatisResourceUtils.java
similarity index 100%
rename from visual/custom-query/src/main/java/cn/fateverse/query/utils/MyBatisResourceUtils.java
rename to custom-query/custom-query-biz/src/main/java/cn/fateverse/query/utils/MyBatisResourceUtils.java
diff --git a/visual/custom-query/src/main/resources/bootstrap-pro.yml b/custom-query/custom-query-biz/src/main/resources/bootstrap-pro.yml
similarity index 100%
rename from visual/custom-query/src/main/resources/bootstrap-pro.yml
rename to custom-query/custom-query-biz/src/main/resources/bootstrap-pro.yml
diff --git a/visual/custom-query/src/main/resources/bootstrap.yml b/custom-query/custom-query-biz/src/main/resources/bootstrap.yml
similarity index 98%
rename from visual/custom-query/src/main/resources/bootstrap.yml
rename to custom-query/custom-query-biz/src/main/resources/bootstrap.yml
index 19799f5..183f34c 100644
--- a/visual/custom-query/src/main/resources/bootstrap.yml
+++ b/custom-query/custom-query-biz/src/main/resources/bootstrap.yml
@@ -39,7 +39,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}
diff --git a/visual/custom-query/src/main/resources/mapper/DataAdapterMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/DataAdapterMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/DataAdapterMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/DataAdapterMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/DataSourceManageMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/DataSourceManageMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/DataSourceManageMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/DataSourceManageMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/DynamicEchartsMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/DynamicEchartsMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/DynamicEchartsMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/DynamicEchartsMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/TableColumnMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/TableColumnMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/TableColumnMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/TableColumnMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/TableMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/TableMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/TableMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/TableMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/TableRelationalMappingMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/TableRelationalMappingMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/TableRelationalMappingMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/TableRelationalMappingMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/TableRoleMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/TableRoleMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/TableRoleMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/TableRoleMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/UniColumnMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/UniColumnMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/UniColumnMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/UniColumnMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/UniConMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/UniConMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/UniConMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/UniConMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/UniQueryMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/UniQueryMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/UniQueryMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/UniQueryMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/dynamic/DynamicDataSourceMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/dynamic/DynamicDataSourceMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/dynamic/DynamicDataSourceMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/dynamic/DynamicDataSourceMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/dynamic/MariaDynamicDataSourceMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/dynamic/MariaDynamicDataSourceMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/dynamic/MariaDynamicDataSourceMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/dynamic/MariaDynamicDataSourceMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/dynamic/MySqlDynamicDataSourceMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/dynamic/MySqlDynamicDataSourceMapper.xml
similarity index 98%
rename from visual/custom-query/src/main/resources/mapper/dynamic/MySqlDynamicDataSourceMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/dynamic/MySqlDynamicDataSourceMapper.xml
index ad6dd6f..07d2ce2 100644
--- a/visual/custom-query/src/main/resources/mapper/dynamic/MySqlDynamicDataSourceMapper.xml
+++ b/custom-query/custom-query-biz/src/main/resources/mapper/dynamic/MySqlDynamicDataSourceMapper.xml
@@ -101,7 +101,7 @@
     </select>
 
     <select id="selectTableListCount" resultType="java.lang.Long">
-        select count(1)
+        select count(*)
         from information_schema.tables
         where table_schema = (select database())
         <if test="table.tableName != null and table.tableName != ''">
@@ -113,7 +113,7 @@
         <if test="table.startTime != null and table.endTime != null"><!-- 开始时间检索 -->
             and create_time between #{table.startTime} and #{table.endTime}
         </if>
-        <if test="list !=null and list.size!=0">
+        <if test="list !=null and list.size!= 0">
             and  table_name not in
             <foreach collection="list" item="name" separator="," open="(" close=")">
                  #{name}
diff --git a/visual/custom-query/src/main/resources/mapper/dynamic/OracleDynamicDataSourceMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/dynamic/OracleDynamicDataSourceMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/dynamic/OracleDynamicDataSourceMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/dynamic/OracleDynamicDataSourceMapper.xml
diff --git a/visual/custom-query/src/main/resources/mapper/dynamic/PostgresDynamicDataSourceMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/dynamic/PostgresDynamicDataSourceMapper.xml
similarity index 100%
rename from visual/custom-query/src/main/resources/mapper/dynamic/PostgresDynamicDataSourceMapper.xml
rename to custom-query/custom-query-biz/src/main/resources/mapper/dynamic/PostgresDynamicDataSourceMapper.xml
diff --git a/custom-query/custom-query-submter/pom.xml b/custom-query/custom-query-submter/pom.xml
new file mode 100644
index 0000000..0e70bae
--- /dev/null
+++ b/custom-query/custom-query-submter/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>custom-query</artifactId>
+        <groupId>cn.fateverse</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>custom-query-submter</artifactId>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-sql-parser-binder</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-sql-parser-mysql</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-sql-parser-sql92</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-sql-parser-statement</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>shardingsphere-merge</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-core-execute</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-core</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/adapter/WrapperAdapter.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/adapter/WrapperAdapter.java
new file mode 100644
index 0000000..0ca8a96
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/adapter/WrapperAdapter.java
@@ -0,0 +1,43 @@
+package cn.fateverse.query.submeter.adapter;
+
+import lombok.SneakyThrows;
+import org.apache.shardingsphere.shardingjdbc.jdbc.adapter.invocation.JdbcMethodInvocation;
+
+import java.sql.SQLException;
+import java.sql.Wrapper;
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class WrapperAdapter implements Wrapper {
+
+    private final Collection<JdbcMethodInvocation> jdbcMethodInvocations = new ArrayList<>();
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        if (isWrapperFor(iface)) {
+            return (T) this;
+        }
+        throw new SQLException(String.format("[%s] cannot be unwrapped as [%s]", getClass().getName(), iface.getName()));
+    }
+
+    @Override
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return iface.isInstance(this);
+    }
+
+
+    @SneakyThrows
+    public final void recordMethodInvocation(final Class<?> targetClass, final String methodName, final Class<?>[] argumentTypes, final Object[] arguments) {
+        jdbcMethodInvocations.add(new JdbcMethodInvocation(targetClass.getMethod(methodName, argumentTypes), arguments));
+    }
+
+    /**
+     * Replay methods invocation.
+     *
+     * @param target target object
+     */
+    public final void replayMethodsInvocation(final Object target) {
+        for (JdbcMethodInvocation each : jdbcMethodInvocations) {
+            each.invoke(target);
+        }
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractConnectionAdapter.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractConnectionAdapter.java
new file mode 100644
index 0000000..fb0b6ef
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractConnectionAdapter.java
@@ -0,0 +1,161 @@
+package cn.fateverse.query.submeter.connection;
+
+import cn.fateverse.query.submeter.executor.ForceExecuteTemplate;
+import cn.fateverse.query.submeter.executor.ForceExecuteCallback;
+import lombok.Getter;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+
+@Getter
+public abstract class AbstractConnectionAdapter extends AbstractUnsupportedOperationConnection{
+
+
+
+    private boolean autoCommit = true;
+    private boolean readOnly = true;
+    private volatile boolean closed;
+
+
+    private int transactionIsolation = TRANSACTION_READ_UNCOMMITTED;
+
+
+    private final List<Connection> cachedConnections = new LinkedList<>();
+
+    private final ForceExecuteTemplate<Connection> forceExecuteTemplate = new ForceExecuteTemplate<>();
+
+    private final ForceExecuteTemplate<Map.Entry<String, Connection>> forceExecuteTemplateForClose = new ForceExecuteTemplate<>();
+
+    public final Connection getConnection() throws SQLException {
+        Connection connection = getDataSource().getConnection();
+        cachedConnections.add(connection);
+        return connection;
+    }
+
+    public final List<Connection> getConnections() throws SQLException {
+        if (cachedConnections.size() > 0){
+            return cachedConnections;
+        }
+        Connection connection = getDataSource().getConnection();
+        cachedConnections.add(connection);
+        return cachedConnections;
+    }
+
+
+    protected abstract DataSource getDataSource();
+
+
+
+    @Override
+    public void setAutoCommit(boolean autoCommit) throws SQLException {
+        this.autoCommit = autoCommit;
+    }
+
+    @Override
+    public boolean getAutoCommit() throws SQLException {
+        return autoCommit;
+    }
+
+    @Override
+    public void commit() throws SQLException {
+        commitForLocalTransaction();
+    }
+
+    @Override
+    public void rollback() throws SQLException {
+        rollbackForLocalTransaction();
+    }
+
+    private void rollbackForLocalTransaction() throws SQLException {
+        forceExecuteTemplate.execute(cachedConnections, new ForceExecuteCallback<Connection>() {
+
+            @Override
+            public void execute(final Connection connection) throws SQLException {
+                connection.rollback();
+            }
+        });
+    }
+
+    private void commitForLocalTransaction() throws SQLException {
+        forceExecuteTemplate.execute(cachedConnections, new ForceExecuteCallback<Connection>() {
+            @Override
+            public void execute(final Connection connection) throws SQLException {
+                connection.commit();
+            }
+        });
+    }
+
+    @Override
+    public void close() throws SQLException {
+        closed = true;
+        try {
+            forceExecuteTemplate.execute(cachedConnections , new ForceExecuteCallback<Connection>() {
+                @Override
+                public void execute(final Connection connection) throws SQLException {
+                    connection.close();
+                }
+            });
+        } finally {
+            cachedConnections.clear();
+        }
+    }
+
+    @Override
+    public boolean isClosed() throws SQLException {
+        return closed;
+    }
+
+    @Override
+    public void setReadOnly(boolean readOnly) throws SQLException {
+        this.readOnly = readOnly;
+    }
+
+    @Override
+    public boolean isReadOnly() throws SQLException {
+        return readOnly;
+    }
+
+    @Override
+    public void setTransactionIsolation(int level) throws SQLException {
+        transactionIsolation = level;
+//        recordMethodInvocation(Connection.class, "setTransactionIsolation", new Class[]{int.class}, new Object[]{level});
+        forceExecuteTemplate.execute(cachedConnections, connection -> connection.setTransactionIsolation(level));
+    }
+
+    @Override
+    public int getTransactionIsolation() throws SQLException {
+        if (cachedConnections.isEmpty()) {
+            return transactionIsolation;
+        }
+        return cachedConnections.iterator().next().getTransactionIsolation();
+    }
+
+    @Override
+    public SQLWarning getWarnings() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public void clearWarnings() throws SQLException {
+
+    }
+
+
+    @Override
+    public void setHoldability(int holdability) throws SQLException {
+
+    }
+
+    @Override
+    public int getHoldability() throws SQLException {
+        return ResultSet.CLOSE_CURSORS_AT_COMMIT;
+    }
+
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractUnsupportedOperationConnection.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractUnsupportedOperationConnection.java
new file mode 100644
index 0000000..5f83970
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractUnsupportedOperationConnection.java
@@ -0,0 +1,151 @@
+package cn.fateverse.query.submeter.connection;
+
+import cn.fateverse.query.submeter.adapter.WrapperAdapter;
+
+import java.sql.*;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+
+public abstract class AbstractUnsupportedOperationConnection extends WrapperAdapter implements Connection {
+
+    @Override
+    public final CallableStatement prepareCall(final String sql) throws SQLException {
+        throw new SQLFeatureNotSupportedException("prepareCall");
+    }
+
+    @Override
+    public final CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency) throws SQLException {
+        throw new SQLFeatureNotSupportedException("prepareCall");
+    }
+
+    @Override
+    public final CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) throws SQLException {
+        throw new SQLFeatureNotSupportedException("prepareCall");
+    }
+
+    @Override
+    public final String nativeSQL(final String sql) throws SQLException {
+        throw new SQLFeatureNotSupportedException("nativeSQL");
+    }
+
+    @Override
+    public final Savepoint setSavepoint() throws SQLException {
+        throw new SQLFeatureNotSupportedException("setSavepoint");
+    }
+
+    @Override
+    public final Savepoint setSavepoint(final String name) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setSavepoint name");
+    }
+
+    @Override
+    public final void releaseSavepoint(final Savepoint savepoint) throws SQLException {
+        throw new SQLFeatureNotSupportedException("releaseSavepoint");
+    }
+
+    @Override
+    public final void rollback(final Savepoint savepoint) throws SQLException {
+        throw new SQLFeatureNotSupportedException("rollback savepoint");
+    }
+
+    @Override
+    public final void abort(final Executor executor) throws SQLException {
+        throw new SQLFeatureNotSupportedException("abort");
+    }
+
+    @Override
+    public final String getCatalog() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getCatalog");
+    }
+
+    @Override
+    public final void setCatalog(final String catalog) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setCatalog");
+    }
+
+    @Override
+    public final String getSchema() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getSchema");
+    }
+
+    @Override
+    public final void setSchema(final String schema) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setSchema");
+    }
+
+    @Override
+    public final Map<String, Class<?>> getTypeMap() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getTypeMap");
+    }
+
+    @Override
+    public final void setTypeMap(final Map<String, Class<?>> map) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setTypeMap");
+    }
+
+    @Override
+    public final int getNetworkTimeout() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getNetworkTimeout");
+    }
+
+    @Override
+    public final void setNetworkTimeout(final Executor executor, final int milliseconds) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setNetworkTimeout");
+    }
+
+    @Override
+    public final Clob createClob() throws SQLException {
+        throw new SQLFeatureNotSupportedException("createClob");
+    }
+
+    @Override
+    public final Blob createBlob() throws SQLException {
+        throw new SQLFeatureNotSupportedException("createBlob");
+    }
+
+    @Override
+    public final NClob createNClob() throws SQLException {
+        throw new SQLFeatureNotSupportedException("createNClob");
+    }
+
+    @Override
+    public final SQLXML createSQLXML() throws SQLException {
+        throw new SQLFeatureNotSupportedException("createSQLXML");
+    }
+
+    @Override
+    public final Array createArrayOf(final String typeName, final Object[] elements) throws SQLException {
+        throw new SQLFeatureNotSupportedException("createArrayOf");
+    }
+
+    @Override
+    public final Struct createStruct(final String typeName, final Object[] attributes) throws SQLException {
+        throw new SQLFeatureNotSupportedException("createStruct");
+    }
+
+    @Override
+    public final boolean isValid(final int timeout) throws SQLException {
+        throw new SQLFeatureNotSupportedException("isValid");
+    }
+
+    @Override
+    public final Properties getClientInfo() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getClientInfo");
+    }
+
+    @Override
+    public final String getClientInfo(final String name) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getClientInfo name");
+    }
+
+    @Override
+    public final void setClientInfo(final String name, final String value) {
+        throw new UnsupportedOperationException("setClientInfo name value");
+    }
+
+    @Override
+    public final void setClientInfo(final Properties properties) {
+        throw new UnsupportedOperationException("setClientInfo properties");
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/SubmeterConnection.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/SubmeterConnection.java
new file mode 100644
index 0000000..94accfc
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/SubmeterConnection.java
@@ -0,0 +1,85 @@
+package cn.fateverse.query.submeter.connection;
+
+import cn.fateverse.query.submeter.preparestatement.SubmeterPreparedStatement;
+import lombok.Getter;
+import org.apache.shardingsphere.shardingjdbc.jdbc.core.datasource.metadata.CachedDatabaseMetaData;
+
+import javax.sql.DataSource;
+import java.sql.*;
+
+public class SubmeterConnection extends AbstractConnectionAdapter {
+
+    @Getter
+    private final DataSource dataSource;
+
+    private CachedDatabaseMetaData cachedDatabaseMetaData;
+
+    private DatabaseMetaData databaseMetaData;
+
+    public SubmeterConnection(DataSource dataSource) {
+        this.dataSource = dataSource;
+
+        try (Connection connection = dataSource.getConnection()) {
+            databaseMetaData = connection.getMetaData();
+            cachedDatabaseMetaData = new CachedDatabaseMetaData(databaseMetaData);
+
+        } catch (Exception e) {
+            System.out.println("出错了");
+        }
+
+    }
+
+    @Override
+    public DatabaseMetaData getMetaData() throws SQLException {
+        return databaseMetaData;
+    }
+
+
+    @Override
+    public Statement createStatement() throws SQLException {
+//        return dataSource.getConnection().createStatement();
+        return new SubmeterPreparedStatement(this);
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql) throws SQLException {
+        return new SubmeterPreparedStatement(this, sql);
+    }
+
+    @Override
+    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
+//        return dataSource.getConnection().createStatement(resultSetType, resultSetConcurrency);
+        return new SubmeterPreparedStatement(this, resultSetType, resultSetConcurrency);
+
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
+        return new SubmeterPreparedStatement(this, sql, resultSetType, resultSetConcurrency);
+    }
+
+    @Override
+    public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+        return new SubmeterPreparedStatement(this, resultSetType, resultSetConcurrency, resultSetHoldability);
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+        return new SubmeterPreparedStatement(this, sql, resultSetType, resultSetConcurrency, resultSetHoldability);
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
+        return new SubmeterPreparedStatement(this, sql, autoGeneratedKeys);
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+        return new SubmeterPreparedStatement(this, sql, Statement.RETURN_GENERATED_KEYS);
+    }
+
+    @Override
+    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+        return new SubmeterPreparedStatement(this, sql, Statement.RETURN_GENERATED_KEYS);
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractDataSourceAdapter.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractDataSourceAdapter.java
new file mode 100644
index 0000000..3f5f0dd
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractDataSourceAdapter.java
@@ -0,0 +1,51 @@
+package cn.fateverse.query.submeter.datasource;
+
+import javax.sql.DataSource;
+import java.io.PrintWriter;
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.logging.Logger;
+
+public abstract class AbstractDataSourceAdapter extends AbstractUnsupportedOperationDataSource implements AutoCloseable {
+
+    protected final DataSource dataSource;
+
+
+    private PrintWriter logWriter = new PrintWriter(System.out);
+
+    public AbstractDataSourceAdapter(DataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @Override
+    public final Logger getParentLogger() {
+        return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+    }
+
+    @Override
+    public final Connection getConnection(final String username, final String password) throws SQLException {
+        return getConnection();
+    }
+
+
+    @Override
+    public void close() throws Exception {
+        try {
+            Method method = dataSource.getClass().getDeclaredMethod("close");
+            method.setAccessible(true);
+            method.invoke(dataSource);
+        } catch (final ReflectiveOperationException ignored) {
+        }
+    }
+
+    @Override
+    public PrintWriter getLogWriter() throws SQLException {
+        return logWriter;
+    }
+
+    @Override
+    public void setLogWriter(PrintWriter out) throws SQLException {
+        this.logWriter = out;
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractUnsupportedOperationDataSource.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractUnsupportedOperationDataSource.java
new file mode 100644
index 0000000..ab3eca1
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractUnsupportedOperationDataSource.java
@@ -0,0 +1,21 @@
+package cn.fateverse.query.submeter.datasource;
+
+import cn.fateverse.query.submeter.adapter.WrapperAdapter;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+
+public abstract class AbstractUnsupportedOperationDataSource extends WrapperAdapter implements DataSource {
+
+    @Override
+    public final int getLoginTimeout() throws SQLException {
+        throw new SQLFeatureNotSupportedException("unsupported getLoginTimeout()");
+    }
+
+    @Override
+    public final void setLoginTimeout(final int seconds) throws SQLException {
+        throw new SQLFeatureNotSupportedException("unsupported setLoginTimeout(int seconds)");
+    }
+}
+
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSource.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSource.java
new file mode 100644
index 0000000..a701f40
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSource.java
@@ -0,0 +1,25 @@
+package cn.fateverse.query.submeter.datasource;
+
+
+import cn.fateverse.query.submeter.connection.SubmeterConnection;
+
+import javax.sql.DataSource;
+
+public class SubmeterDataSource extends AbstractDataSourceAdapter {
+
+
+
+    public SubmeterDataSource(DataSource dataSource) {
+        super(dataSource);
+    }
+
+
+    @Override
+    public final SubmeterConnection getConnection() {
+        return new SubmeterConnection(dataSource);
+    }
+
+
+
+
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSourceFactory.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSourceFactory.java
new file mode 100644
index 0000000..ca0eed2
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSourceFactory.java
@@ -0,0 +1,4 @@
+package cn.fateverse.query.submeter.datasource;
+
+public class SubmeterDataSourceFactory {
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteCallback.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteCallback.java
new file mode 100644
index 0000000..6642f51
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteCallback.java
@@ -0,0 +1,14 @@
+package cn.fateverse.query.submeter.executor;
+
+import java.sql.SQLException;
+
+public interface ForceExecuteCallback<T> {
+
+    /**
+     * Execute.
+     *
+     * @param target target to be executed
+     * @throws SQLException SQL exception
+     */
+    void execute(T target) throws SQLException;
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteTemplate.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteTemplate.java
new file mode 100644
index 0000000..cc32c98
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteTemplate.java
@@ -0,0 +1,38 @@
+package cn.fateverse.query.submeter.executor;
+
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.LinkedList;
+
+public class ForceExecuteTemplate <T> {
+
+    /**
+     * Force execute.
+     *
+     * @param targets targets to be executed
+     * @param callback force execute callback
+     * @throws SQLException throw SQL exception after all targets are executed
+     */
+    public void execute(final Collection<T> targets, final ForceExecuteCallback<T> callback) throws SQLException {
+        Collection<SQLException> exceptions = new LinkedList<>();
+        for (T each : targets) {
+            try {
+                callback.execute(each);
+            } catch (final SQLException ex) {
+                exceptions.add(ex);
+            }
+        }
+        throwSQLExceptionIfNecessary(exceptions);
+    }
+
+    private void throwSQLExceptionIfNecessary(final Collection<SQLException> exceptions) throws SQLException {
+        if (exceptions.isEmpty()) {
+            return;
+        }
+        SQLException ex = new SQLException();
+        for (SQLException each : exceptions) {
+            ex.setNextException(each);
+        }
+        throw ex;
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/JdbcMethodInvocation.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/JdbcMethodInvocation.java
new file mode 100644
index 0000000..0be988d
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/JdbcMethodInvocation.java
@@ -0,0 +1,27 @@
+package cn.fateverse.query.submeter.invocation;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+import java.lang.reflect.Method;
+
+@RequiredArgsConstructor
+public class JdbcMethodInvocation {
+    
+    @Getter
+    private final Method method;
+    
+    @Getter
+    private final Object[] arguments;
+    
+    /**
+     * Invoke JDBC method.
+     * 
+     * @param target target object
+     */
+    @SneakyThrows
+    public void invoke(final Object target) {
+        method.invoke(target, arguments);
+    }
+}
\ No newline at end of file
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/SetParameterMethodInvocation.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/SetParameterMethodInvocation.java
new file mode 100644
index 0000000..a449acc
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/SetParameterMethodInvocation.java
@@ -0,0 +1,29 @@
+package cn.fateverse.query.submeter.invocation;
+
+import lombok.Getter;
+
+import java.lang.reflect.Method;
+
+public final class SetParameterMethodInvocation extends JdbcMethodInvocation {
+    
+    @Getter
+    private final int index;
+    
+    @Getter
+    private final Object value;
+    
+    public SetParameterMethodInvocation(final Method method, final Object[] arguments, final Object value) {
+        super(method, arguments);
+        this.index = (int) arguments[0];
+        this.value = value;
+    }
+    
+    /**
+     * Set argument.
+     * 
+     * @param value argument value
+     */
+    public void changeValueArgument(final Object value) {
+        getArguments()[1] = value;
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractStatementAdapter.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractStatementAdapter.java
new file mode 100644
index 0000000..9a81a9e
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractStatementAdapter.java
@@ -0,0 +1,233 @@
+package cn.fateverse.query.submeter.preparestatement;
+
+import cn.fateverse.query.submeter.executor.ForceExecuteCallback;
+import cn.fateverse.query.submeter.executor.ForceExecuteTemplate;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+@RequiredArgsConstructor
+public abstract class AbstractStatementAdapter extends AbstractUnsupportedOperationStatement {
+
+    private final Class<? extends Statement> targetClass;
+
+    private boolean closed;
+
+    private boolean poolable;
+
+    private int fetchSize;
+
+    private final ForceExecuteTemplate<Statement> forceExecuteTemplate = new ForceExecuteTemplate<>();
+
+
+    @Getter
+    private final List<Statement> statements = new LinkedList<>();
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void close() throws SQLException {
+        closed = true;
+        try {
+            forceExecuteTemplate.execute(statements, new ForceExecuteCallback<Statement>() {
+
+                @Override
+                public void execute(final Statement statement) throws SQLException {
+                    statement.close();
+                }
+            });
+        } finally {
+            statements.clear();
+        }
+    }
+
+    @Override
+    public final boolean isClosed() {
+        return closed;
+    }
+
+    @Override
+    public final boolean isPoolable() {
+        return poolable;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void setPoolable(final boolean poolable) throws SQLException {
+        this.poolable = poolable;
+        forceExecuteTemplate.execute(statements, new ForceExecuteCallback<Statement>() {
+
+            @Override
+            public void execute(final Statement statement) throws SQLException {
+                statement.setPoolable(poolable);
+            }
+        });
+    }
+
+    @Override
+    public final int getFetchSize() {
+        return fetchSize;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void setFetchSize(final int rows) throws SQLException {
+        this.fetchSize = rows;
+//        statements.forEach(statement -> {
+//            try {
+//                statement.setFetchSize(rows);
+//            } catch (SQLException e) {
+//                throw new RuntimeException(e);
+//            }
+//        });
+//        recordMethodInvocation(targetClass, "setFetchSize", new Class[] {int.class}, new Object[] {rows});
+        forceExecuteTemplate.execute(statements, new ForceExecuteCallback<Statement>() {
+
+            @Override
+            public void execute(final Statement statement) throws SQLException {
+                statement.setFetchSize(rows);
+            }
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void setEscapeProcessing(final boolean enable) throws SQLException {
+        forceExecuteTemplate.execute(statements, new ForceExecuteCallback<Statement>() {
+
+            @Override
+            public void execute(final Statement statement) throws SQLException {
+                statement.setEscapeProcessing(enable);
+            }
+        });
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void cancel() throws SQLException {
+        forceExecuteTemplate.execute(statements, new ForceExecuteCallback<Statement>() {
+
+            @Override
+            public void execute(final Statement statement) throws SQLException {
+                statement.cancel();
+            }
+        });
+    }
+
+    @Override
+    public final int getUpdateCount() throws SQLException {
+        if (isAccumulate()) {
+            return accumulate();
+        } else {
+            Collection<? extends Statement> statements = this.statements;
+            if (0 == statements.size()) {
+                return -1;
+            }
+            return this.statements.iterator().next().getUpdateCount();
+        }
+    }
+
+    private int accumulate() throws SQLException {
+        long result = 0;
+        boolean hasResult = false;
+        for (Statement each : this.statements) {
+            int updateCount = each.getUpdateCount();
+            if (updateCount > -1) {
+                hasResult = true;
+            }
+            result += updateCount;
+        }
+        if (result > Integer.MAX_VALUE) {
+            result = Integer.MAX_VALUE;
+        }
+        return hasResult ? Long.valueOf(result).intValue() : -1;
+    }
+
+    @Override
+    public final SQLWarning getWarnings() {
+        return null;
+    }
+
+    @Override
+    public final void clearWarnings() {
+    }
+
+    @Override
+    public final boolean getMoreResults() throws SQLException {
+        boolean result = false;
+        for (Statement each : this.statements) {
+            result = each.getMoreResults();
+        }
+        return result;
+    }
+
+    @Override
+    public final boolean getMoreResults(final int current) {
+        return false;
+    }
+
+    @Override
+    public final int getMaxFieldSize() throws SQLException {
+        return this.statements.isEmpty() ? 0 : this.statements.iterator().next().getMaxFieldSize();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void setMaxFieldSize(final int max) throws SQLException {
+//        recordMethodInvocation(targetClass, "setMaxFieldSize", new Class[] {int.class}, new Object[] {max});
+        forceExecuteTemplate.execute(this.statements, new ForceExecuteCallback<Statement>() {
+
+            @Override
+            public void execute(final Statement statement) throws SQLException {
+                statement.setMaxFieldSize(max);
+            }
+        });
+    }
+
+    // TODO Confirm MaxRows for multiple databases is need special handle. eg: 10 statements maybe MaxRows / 10
+    @Override
+    public final int getMaxRows() throws SQLException {
+        return this.statements.isEmpty() ? -1 : this.statements.iterator().next().getMaxRows();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void setMaxRows(final int max) throws SQLException {
+//        recordMethodInvocation(targetClass, "setMaxRows", new Class[] {int.class}, new Object[] {max});
+        forceExecuteTemplate.execute(this.statements, new ForceExecuteCallback<Statement>() {
+
+            @Override
+            public void execute(final Statement statement) throws SQLException {
+                statement.setMaxRows(max);
+            }
+        });
+    }
+
+    @Override
+    public final int getQueryTimeout() throws SQLException {
+        return this.statements.isEmpty() ? 0 : this.statements.iterator().next().getQueryTimeout();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public final void setQueryTimeout(final int seconds) throws SQLException {
+
+//        recordMethodInvocation(targetClass, "setQueryTimeout", new Class[] {int.class}, new Object[] {seconds});
+        forceExecuteTemplate.execute(this.statements, new ForceExecuteCallback<Statement>() {
+
+            @Override
+            public void execute(final Statement statement) throws SQLException {
+                statement.setQueryTimeout(seconds);
+            }
+        });
+    }
+
+    protected abstract boolean isAccumulate();
+
+}
+
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractSubmeterPreparedStatementAdapter.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractSubmeterPreparedStatementAdapter.java
new file mode 100644
index 0000000..3775464
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractSubmeterPreparedStatementAdapter.java
@@ -0,0 +1,256 @@
+package cn.fateverse.query.submeter.preparestatement;
+
+import cn.fateverse.query.submeter.invocation.SetParameterMethodInvocation;
+import lombok.Getter;
+import lombok.SneakyThrows;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.LinkedList;
+import java.util.List;
+
+public abstract class AbstractSubmeterPreparedStatementAdapter extends AbstractUnsupportedOperationPreparedStatement {
+
+    private final List<SetParameterMethodInvocation> setParameterMethodInvocations = new LinkedList<>();
+
+    @Getter
+    private final List<Object> parameters = new ArrayList<>();
+
+    @Override
+    public final void setNull(final int parameterIndex, final int sqlType) {
+        setParameter(parameterIndex, null);
+    }
+
+    @Override
+    public final void setNull(final int parameterIndex, final int sqlType, final String typeName) {
+        setParameter(parameterIndex, null);
+    }
+
+    @Override
+    public final void setBoolean(final int parameterIndex, final boolean x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setByte(final int parameterIndex, final byte x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setShort(final int parameterIndex, final short x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setInt(final int parameterIndex, final int x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setLong(final int parameterIndex, final long x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setFloat(final int parameterIndex, final float x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setDouble(final int parameterIndex, final double x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setString(final int parameterIndex, final String x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBigDecimal(final int parameterIndex, final BigDecimal x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setDate(final int parameterIndex, final Date x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setDate(final int parameterIndex, final Date x, final Calendar cal) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setTime(final int parameterIndex, final Time x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setTime(final int parameterIndex, final Time x, final Calendar cal) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setTimestamp(final int parameterIndex, final Timestamp x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setTimestamp(final int parameterIndex, final Timestamp x, final Calendar cal) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBytes(final int parameterIndex, final byte[] x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBlob(final int parameterIndex, final Blob x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBlob(final int parameterIndex, final InputStream x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBlob(final int parameterIndex, final InputStream x, final long length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setClob(final int parameterIndex, final Clob x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setClob(final int parameterIndex, final Reader x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setClob(final int parameterIndex, final Reader x, final long length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setAsciiStream(final int parameterIndex, final InputStream x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setAsciiStream(final int parameterIndex, final InputStream x, final int length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setAsciiStream(final int parameterIndex, final InputStream x, final long length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public final void setUnicodeStream(final int parameterIndex, final InputStream x, final int length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBinaryStream(final int parameterIndex, final InputStream x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBinaryStream(final int parameterIndex, final InputStream x, final int length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setBinaryStream(final int parameterIndex, final InputStream x, final long length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setCharacterStream(final int parameterIndex, final Reader x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setCharacterStream(final int parameterIndex, final Reader x, final int length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setCharacterStream(final int parameterIndex, final Reader x, final long length) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setURL(final int parameterIndex, final URL x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setSQLXML(final int parameterIndex, final SQLXML x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setObject(final int parameterIndex, final Object x) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setObject(final int parameterIndex, final Object x, final int targetSqlType) {
+        setParameter(parameterIndex, x);
+    }
+
+    @Override
+    public final void setObject(final int parameterIndex, final Object x, final int targetSqlType, final int scaleOrLength) {
+        setParameter(parameterIndex, x);
+    }
+
+    private void setParameter(final int parameterIndex, final Object value) {
+        if (parameters.size() == parameterIndex - 1) {
+            parameters.add(value);
+            return;
+        }
+        for (int i = parameters.size(); i <= parameterIndex - 1; i++) {
+            parameters.add(null);
+        }
+        parameters.set(parameterIndex - 1, value);
+    }
+
+    protected final void replaySetParameter(final PreparedStatement preparedStatement, final List<Object> parameters) {
+        setParameterMethodInvocations.clear();
+        addParameters(parameters);
+        for (SetParameterMethodInvocation each : setParameterMethodInvocations) {
+            each.invoke(preparedStatement);
+        }
+    }
+
+    private void addParameters(final List<Object> parameters) {
+        int i = 0;
+        for (Object each : parameters) {
+            setParameter(new Class[]{int.class, Object.class}, i++ + 1, each);
+        }
+    }
+
+    @SneakyThrows
+    private void setParameter(final Class[] argumentTypes, final Object... arguments) {
+        setParameterMethodInvocations.add(new SetParameterMethodInvocation(PreparedStatement.class.getMethod("setObject", argumentTypes), arguments, arguments[1]));
+    }
+
+    @Override
+    public final void clearParameters() {
+        parameters.clear();
+        setParameterMethodInvocations.clear();
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationPreparedStatement.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationPreparedStatement.java
new file mode 100644
index 0000000..0a0d3d3
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationPreparedStatement.java
@@ -0,0 +1,112 @@
+package cn.fateverse.query.submeter.preparestatement;
+
+import java.io.Reader;
+import java.sql.*;
+
+public abstract class AbstractUnsupportedOperationPreparedStatement extends AbstractStatementAdapter implements PreparedStatement {
+
+
+    public AbstractUnsupportedOperationPreparedStatement() {
+        super(PreparedStatement.class);
+    }
+
+    @Override
+    public final ResultSetMetaData getMetaData() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getMetaData");
+    }
+
+    @Override
+    public final ParameterMetaData getParameterMetaData() throws SQLException {
+        throw new SQLFeatureNotSupportedException("ParameterMetaData");
+    }
+
+    @Override
+    public final void setNString(final int parameterIndex, final String x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setNString");
+    }
+
+    @Override
+    public final void setNClob(final int parameterIndex, final NClob x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setNClob");
+    }
+
+    @Override
+    public final void setNClob(final int parameterIndex, final Reader x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setNClob");
+    }
+
+    @Override
+    public final void setNClob(final int parameterIndex, final Reader x, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setNClob");
+    }
+
+    @Override
+    public final void setNCharacterStream(final int parameterIndex, final Reader x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setNCharacterStream");
+    }
+
+    @Override
+    public final void setNCharacterStream(final int parameterIndex, final Reader x, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setNCharacterStream");
+    }
+
+    @Override
+    public final void setArray(final int parameterIndex, final Array x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setArray");
+    }
+
+    @Override
+    public final void setRowId(final int parameterIndex, final RowId x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setRowId");
+    }
+
+    @Override
+    public final void setRef(final int parameterIndex, final Ref x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setRef");
+    }
+
+//    @Override
+//    public final ResultSet executeQuery(final String sql) throws SQLException {
+//        throw new SQLFeatureNotSupportedException("executeQuery with SQL for PreparedStatement");
+//    }
+
+    @Override
+    public final int executeUpdate(final String sql) throws SQLException {
+        throw new SQLFeatureNotSupportedException("executeUpdate with SQL for PreparedStatement");
+    }
+
+    @Override
+    public final int executeUpdate(final String sql, final int autoGeneratedKeys) throws SQLException {
+        throw new SQLFeatureNotSupportedException("executeUpdate with SQL for PreparedStatement");
+    }
+
+    @Override
+    public final int executeUpdate(final String sql, final int[] columnIndexes) throws SQLException {
+        throw new SQLFeatureNotSupportedException("executeUpdate with SQL for PreparedStatement");
+    }
+
+    @Override
+    public final int executeUpdate(final String sql, final String[] columnNames) throws SQLException {
+        throw new SQLFeatureNotSupportedException("executeUpdate with SQL for PreparedStatement");
+    }
+
+    @Override
+    public final boolean execute(final String sql) throws SQLException {
+        throw new SQLFeatureNotSupportedException("execute with SQL for PreparedStatement");
+    }
+
+    @Override
+    public final boolean execute(final String sql, final int autoGeneratedKeys) throws SQLException {
+        throw new SQLFeatureNotSupportedException("execute with SQL for PreparedStatement");
+    }
+
+    @Override
+    public final boolean execute(final String sql, final int[] columnIndexes) throws SQLException {
+        throw new SQLFeatureNotSupportedException("execute with SQL for PreparedStatement");
+    }
+
+    @Override
+    public final boolean execute(final String sql, final String[] columnNames) throws SQLException {
+        throw new SQLFeatureNotSupportedException("execute with SQL for PreparedStatement");
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationStatement.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationStatement.java
new file mode 100644
index 0000000..4d4f5de
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationStatement.java
@@ -0,0 +1,51 @@
+package cn.fateverse.query.submeter.preparestatement;
+
+import cn.fateverse.query.submeter.adapter.WrapperAdapter;
+
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
+
+public abstract class AbstractUnsupportedOperationStatement extends WrapperAdapter implements Statement {
+
+    @Override
+    public final int getFetchDirection() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getFetchDirection");
+    }
+
+    @Override
+    public final void setFetchDirection(final int direction) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setFetchDirection");
+    }
+
+    @Override
+    public final void addBatch(final String sql) throws SQLException {
+        throw new SQLFeatureNotSupportedException("addBatch sql");
+    }
+
+    @Override
+    public void clearBatch() throws SQLException {
+        throw new SQLFeatureNotSupportedException("clearBatch");
+    }
+
+    @Override
+    public int[] executeBatch() throws SQLException {
+        throw new SQLFeatureNotSupportedException("executeBatch");
+    }
+
+    @Override
+    public final void closeOnCompletion() throws SQLException {
+        throw new SQLFeatureNotSupportedException("closeOnCompletion");
+    }
+
+    @Override
+    public final boolean isCloseOnCompletion() throws SQLException {
+        throw new SQLFeatureNotSupportedException("isCloseOnCompletion");
+    }
+
+    @Override
+    public final void setCursorName(final String name) throws SQLException {
+        throw new SQLFeatureNotSupportedException("setCursorName");
+    }
+}
+
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/SubmeterPreparedStatement.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/SubmeterPreparedStatement.java
new file mode 100644
index 0000000..352fc46
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/SubmeterPreparedStatement.java
@@ -0,0 +1,244 @@
+package cn.fateverse.query.submeter.preparestatement;
+
+import cn.fateverse.query.submeter.connection.SubmeterConnection;
+import cn.fateverse.query.submeter.executor.ForceExecuteTemplate;
+import cn.fateverse.query.submeter.result.SubmeterResult;
+import org.apache.shardingsphere.sharding.execute.sql.execute.result.StreamQueryResult;
+import org.apache.shardingsphere.sharding.merge.dql.ShardingDQLResultMerger;
+import org.apache.shardingsphere.sql.parser.SQLParserEngine;
+import org.apache.shardingsphere.sql.parser.SQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.binder.SQLStatementContextFactory;
+import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
+import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaData;
+import org.apache.shardingsphere.sql.parser.binder.metadata.table.TableMetaDataLoader;
+import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
+import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
+import org.apache.shardingsphere.underlying.common.database.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.underlying.executor.QueryResult;
+import org.apache.shardingsphere.underlying.merge.result.MergedResult;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SubmeterPreparedStatement extends AbstractSubmeterPreparedStatementAdapter {
+
+    private final SubmeterConnection connection;
+
+    private final String sql;
+    private final int resultSetType;
+    private final int resultSetConcurrency;
+    private final int resultSetHoldability;
+    private final boolean returnGeneratedKeys;
+
+    private final SQLParserEngine parserEngine;
+
+    private ResultSet currentResultSet;
+
+
+    private final ForceExecuteTemplate<Statement> forceExecuteTemplate = new ForceExecuteTemplate<>();
+
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection) {
+        this(connection, "", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT, false);
+    }
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection, final String sql) {
+        this(connection, sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT, false);
+    }
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection, final String sql, final int resultSetType, final int resultSetConcurrency) {
+        this(connection, sql, resultSetType, resultSetConcurrency, ResultSet.HOLD_CURSORS_OVER_COMMIT, false);
+    }
+
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection, final String sql, final int autoGeneratedKeys) {
+        this(connection, sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT, Statement.RETURN_GENERATED_KEYS == autoGeneratedKeys);
+    }
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection, final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) {
+        this(connection, sql, resultSetType, resultSetConcurrency, resultSetHoldability, false);
+    }
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection, final int resultSetType, final int resultSetConcurrency) {
+        this(connection, "", resultSetType, resultSetConcurrency, ResultSet.HOLD_CURSORS_OVER_COMMIT, false);
+    }
+
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection, final int autoGeneratedKeys) {
+        this(connection, "", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT, Statement.RETURN_GENERATED_KEYS == autoGeneratedKeys);
+    }
+
+    public SubmeterPreparedStatement(final SubmeterConnection connection, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) {
+        this(connection, "", resultSetType, resultSetConcurrency, resultSetHoldability, false);
+    }
+
+
+    private SubmeterPreparedStatement(
+            final SubmeterConnection connection, final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability, final boolean returnGeneratedKeys) {
+        this.connection = connection;
+        this.sql = sql;
+        this.resultSetConcurrency = resultSetConcurrency;
+        this.resultSetType = resultSetType;
+        this.resultSetHoldability = resultSetHoldability;
+        this.returnGeneratedKeys = returnGeneratedKeys;
+        this.parserEngine = SQLParserEngineFactory.getSQLParserEngine("MySQL");
+    }
+
+    @Override
+    protected boolean isAccumulate() {
+        return false;
+    }
+
+
+    @Override
+    public ResultSet executeQuery() throws SQLException {
+        return getStatements().get(0)
+                .executeQuery(sql);
+    }
+
+    @Override
+    public ResultSet executeQuery(String sql) throws SQLException {
+        return getStatements().get(0)
+                .executeQuery(sql);
+    }
+
+    @Override
+    public int executeUpdate() throws SQLException {
+        return 0;
+    }
+
+    @Override
+    public boolean execute() throws SQLException {
+        Connection connection1 = connection.getConnection();
+
+        PreparedStatement preparedStatement1 = connection1.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
+        getStatements().add(preparedStatement1);
+
+        PreparedStatement preparedStatement2 = connection1.prepareStatement(sql.replace("sys_operation_log_1", "sys_operation_log_2"), resultSetType, resultSetConcurrency, resultSetHoldability);
+        getStatements().add(preparedStatement2);
+        List<Boolean> booleans = new ArrayList<>(getStatements().size());
+
+
+
+        setParametersForStatements();
+        replayMethodForStatements();
+
+
+
+
+
+        forceExecuteTemplate.execute(getStatements(), (statement) -> {
+            boolean execute = ((PreparedStatement) statement).execute();
+            booleans.add(execute);
+        });
+
+
+        SQLStatement sqlStatement = parserEngine.parse(sql, false);
+        Map<String, TableMetaData> tableMetaDataMap = new HashMap<>(1, 1);
+
+        TableMetaData metaData1 = TableMetaDataLoader.load(connection.getDataSource(), "sys_operation_log_1", "MySQL");
+        tableMetaDataMap.put("sys_operation_log_1", metaData1);
+        TableMetaData metaData2 = TableMetaDataLoader.load(connection.getDataSource(), "sys_operation_log_2", "MySQL");
+        tableMetaDataMap.put("sys_operation_log_2", metaData2);
+        SchemaMetaData schemaMetaData = new SchemaMetaData(tableMetaDataMap);
+
+        SQLStatementContext sqlStatementContext = SQLStatementContextFactory.newInstance(schemaMetaData, sql, getParameters(), sqlStatement);
+        MySQLDatabaseType databaseType = new MySQLDatabaseType();
+        ShardingDQLResultMerger shardingDQLResultMerger = new ShardingDQLResultMerger(databaseType);
+
+
+        List<ResultSet> resultSets = getResultSets();
+        List<QueryResult> queryResults = getQueryResults(resultSets);
+        MergedResult mergedResult = shardingDQLResultMerger.merge(queryResults, sqlStatementContext, schemaMetaData);
+        SubmeterResult result = new SubmeterResult(resultSets, mergedResult, sqlStatementContext, this);
+
+
+        currentResultSet = result;
+
+        return booleans.get(0);
+    }
+
+
+    private void setParametersForStatements() {
+        for (int i = 0; i < getStatements().size(); i++) {
+            replaySetParameter((PreparedStatement) getStatements().get(i), getParameters());
+        }
+    }
+    private void replayMethodForStatements() {
+        for (Statement each : getStatements()) {
+            replayMethodsInvocation(each);
+        }
+    }
+
+    private void clearPrevious() throws SQLException {
+        getStatements().clear();
+        getParameters().clear();
+    }
+
+    @Override
+    public void addBatch() throws SQLException {
+
+    }
+
+    @Override
+    public ResultSet getResultSet() throws SQLException {
+        if (null != currentResultSet) {
+            return currentResultSet;
+        }
+        if (getStatements().size() > 0) {
+
+
+            return getStatements().get(0).getResultSet();
+        } else {
+            return null;
+        }
+    }
+
+    private List<ResultSet> getResultSets() throws SQLException {
+        List<ResultSet> result = new ArrayList<>(getStatements().size());
+        for (Statement each : getStatements()) {
+            result.add(each.getResultSet());
+        }
+        return result;
+    }
+
+
+    private List<QueryResult> getQueryResults(final List<ResultSet> resultSets) throws SQLException {
+        List<QueryResult> result = new ArrayList<>(resultSets.size());
+        for (ResultSet each : resultSets) {
+            if (null != each) {
+                result.add(new StreamQueryResult(each));
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public int getResultSetConcurrency() throws SQLException {
+        return resultSetConcurrency;
+    }
+
+    @Override
+    public int getResultSetType() throws SQLException {
+        return resultSetType;
+    }
+
+    @Override
+    public Connection getConnection() throws SQLException {
+        return connection;
+    }
+
+    @Override
+    public ResultSet getGeneratedKeys() throws SQLException {
+        return null;
+    }
+
+    @Override
+    public int getResultSetHoldability() throws SQLException {
+        return resultSetHoldability;
+    }
+
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/AbstractResultSetAdapter.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/AbstractResultSetAdapter.java
new file mode 100644
index 0000000..ff38017
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/AbstractResultSetAdapter.java
@@ -0,0 +1,98 @@
+package cn.fateverse.query.submeter.result;
+
+import cn.fateverse.query.submeter.executor.ForceExecuteTemplate;
+import cn.fateverse.query.submeter.unsupported.AbstractUnsupportedOperationResultSet;
+import lombok.Getter;
+import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
+
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.util.List;
+
+/**
+ * @author Clay
+ * @date 2024/4/7 16:59
+ */
+public abstract class AbstractResultSetAdapter extends AbstractUnsupportedOperationResultSet {
+
+    @Getter
+    private final List<ResultSet> resultSets;
+
+    @Getter
+    private final SQLStatementContext sqlStatementContext;
+
+    private boolean closed;
+
+    private final ForceExecuteTemplate<ResultSet> forceExecuteTemplate = new ForceExecuteTemplate<>();
+
+
+    protected AbstractResultSetAdapter(List<ResultSet> resultSets, SQLStatementContext sqlStatementContext) {
+        this.resultSets = resultSets;
+        this.sqlStatementContext = sqlStatementContext;
+    }
+
+    @Override
+    public final ResultSetMetaData getMetaData() throws SQLException {
+        return new SubmeterResultSetMetaData(resultSets.get(0).getMetaData(), sqlStatementContext);
+    }
+
+    @Override
+    public final int findColumn(final String columnLabel) throws SQLException {
+        return resultSets.get(0).findColumn(columnLabel);
+    }
+
+    @Override
+    public final void close() throws SQLException {
+        closed = true;
+        forceExecuteTemplate.execute(resultSets, ResultSet::close);
+    }
+
+    @Override
+    public final boolean isClosed() {
+        return closed;
+    }
+
+    @Override
+    public final void setFetchDirection(final int direction) throws SQLException {
+        forceExecuteTemplate.execute(resultSets, resultSet -> resultSet.setFetchDirection(direction));
+    }
+
+    @Override
+    public final int getFetchDirection() throws SQLException {
+        return resultSets.get(0).getFetchDirection();
+    }
+
+    @Override
+    public final void setFetchSize(final int rows) throws SQLException {
+        forceExecuteTemplate.execute(resultSets, resultSet -> resultSet.setFetchSize(rows));
+    }
+
+    @Override
+    public final int getFetchSize() throws SQLException {
+        return resultSets.get(0).getFetchSize();
+    }
+
+    @Override
+    public final int getType() throws SQLException {
+        return resultSets.get(0).getType();
+    }
+
+    @Override
+    public final int getConcurrency() throws SQLException {
+        return resultSets.get(0).getConcurrency();
+    }
+
+    @Override
+    public final SQLWarning getWarnings() throws SQLException {
+        return resultSets.get(0).getWarnings();
+    }
+
+    @Override
+    public final void clearWarnings() throws SQLException {
+        forceExecuteTemplate.execute(resultSets, ResultSet::clearWarnings);
+    }
+
+
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResult.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResult.java
new file mode 100644
index 0000000..2d3355d
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResult.java
@@ -0,0 +1,350 @@
+package cn.fateverse.query.submeter.result;
+
+import cn.fateverse.query.submeter.util.ResultSetUtil;
+import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
+import org.apache.shardingsphere.underlying.merge.result.MergedResult;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.*;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * @author Clay
+ * @date 2024/4/7 17:07
+ */
+public class SubmeterResult extends AbstractResultSetAdapter {
+
+
+    private final MergedResult mergeResultSet;
+
+    private final Statement statement;
+
+    private final Map<String, Integer> columnLabelAndIndexMap;
+
+    public SubmeterResult(final List<ResultSet> resultSets, final MergedResult mergeResultSet, SQLStatementContext sqlStatementContext, Statement statement) throws SQLException {
+        super(resultSets, sqlStatementContext);
+        this.mergeResultSet = mergeResultSet;
+        columnLabelAndIndexMap = createColumnLabelAndIndexMap(resultSets.get(0).getMetaData());
+        this.statement = statement;
+    }
+
+    private Map<String, Integer> createColumnLabelAndIndexMap(final ResultSetMetaData resultSetMetaData) throws SQLException {
+        Map<String, Integer> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        for (int columnIndex = resultSetMetaData.getColumnCount(); columnIndex > 0; columnIndex--) {
+            result.put(resultSetMetaData.getColumnLabel(columnIndex), columnIndex);
+        }
+        return result;
+    }
+
+
+    @Override
+    public boolean next() throws SQLException {
+        return mergeResultSet.next();
+    }
+
+    @Override
+    public boolean wasNull() throws SQLException {
+        return mergeResultSet.wasNull();
+    }
+
+    @Override
+    public boolean getBoolean(final int columnIndex) throws SQLException {
+        return (boolean) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, boolean.class), boolean.class);
+    }
+
+    @Override
+    public boolean getBoolean(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (boolean) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, boolean.class), boolean.class);
+    }
+
+    @Override
+    public byte getByte(final int columnIndex) throws SQLException {
+        return (byte) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, byte.class), byte.class);
+    }
+
+    @Override
+    public byte getByte(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (byte) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, byte.class), byte.class);
+    }
+
+    @Override
+    public short getShort(final int columnIndex) throws SQLException {
+        return (short) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, short.class), short.class);
+    }
+
+    @Override
+    public short getShort(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (short) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, short.class), short.class);
+    }
+
+    @Override
+    public int getInt(final int columnIndex) throws SQLException {
+        return (int) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, int.class), int.class);
+    }
+
+    @Override
+    public int getInt(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (int) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, int.class), int.class);
+    }
+
+    @Override
+    public long getLong(final int columnIndex) throws SQLException {
+        return (long) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, long.class), long.class);
+    }
+
+    @Override
+    public long getLong(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (long) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, long.class), long.class);
+    }
+
+    @Override
+    public float getFloat(final int columnIndex) throws SQLException {
+        return (float) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, float.class), float.class);
+    }
+
+    @Override
+    public float getFloat(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (float) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, float.class), float.class);
+    }
+
+    @Override
+    public double getDouble(final int columnIndex) throws SQLException {
+        return (double) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, double.class), double.class);
+    }
+
+    @Override
+    public double getDouble(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (double) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, double.class), double.class);
+    }
+
+    @Override
+    public String getString(final int columnIndex) throws SQLException {
+        return (String) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, String.class), String.class);
+    }
+
+    @Override
+    public String getString(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (String) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, String.class), String.class);
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(final int columnIndex) throws SQLException {
+        return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+    }
+
+    @Override
+    public BigDecimal getBigDecimal(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+    }
+
+    @Override
+    public Statement getStatement() throws SQLException {
+        return statement;
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public BigDecimal getBigDecimal(final int columnIndex, final int scale) throws SQLException {
+        return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public BigDecimal getBigDecimal(final String columnLabel, final int scale) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (BigDecimal) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, BigDecimal.class), BigDecimal.class);
+    }
+
+    @Override
+    public byte[] getBytes(final int columnIndex) throws SQLException {
+        return (byte[]) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, byte[].class), byte[].class);
+    }
+
+    @Override
+    public byte[] getBytes(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (byte[]) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, byte[].class), byte[].class);
+    }
+
+    @Override
+    public Date getDate(final int columnIndex) throws SQLException {
+        return (Date) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Date.class), Date.class);
+    }
+
+    @Override
+    public Date getDate(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Date) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Date.class), Date.class);
+    }
+
+    @Override
+    public Date getDate(final int columnIndex, final Calendar cal) throws SQLException {
+        return (Date) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Date.class, cal), Date.class);
+    }
+
+    @Override
+    public Date getDate(final String columnLabel, final Calendar cal) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Date) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Date.class, cal), Date.class);
+    }
+
+    @Override
+    public Time getTime(final int columnIndex) throws SQLException {
+        return (Time) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Time.class), Time.class);
+    }
+
+    @Override
+    public Time getTime(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Time) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Time.class), Time.class);
+    }
+
+    @Override
+    public Time getTime(final int columnIndex, final Calendar cal) throws SQLException {
+        return (Time) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Time.class, cal), Time.class);
+    }
+
+    @Override
+    public Time getTime(final String columnLabel, final Calendar cal) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Time) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Time.class, cal), Time.class);
+    }
+
+    @Override
+    public Timestamp getTimestamp(final int columnIndex) throws SQLException {
+        return (Timestamp) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Timestamp.class), Timestamp.class);
+    }
+
+    @Override
+    public Timestamp getTimestamp(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Timestamp) ResultSetUtil.convertValue(mergeResultSet.getValue(columnIndex, Timestamp.class), Timestamp.class);
+    }
+
+    @Override
+    public Timestamp getTimestamp(final int columnIndex, final Calendar cal) throws SQLException {
+        return (Timestamp) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Timestamp.class, cal), Timestamp.class);
+    }
+
+    @Override
+    public Timestamp getTimestamp(final String columnLabel, final Calendar cal) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Timestamp) ResultSetUtil.convertValue(mergeResultSet.getCalendarValue(columnIndex, Timestamp.class, cal), Timestamp.class);
+    }
+
+    @Override
+    public InputStream getAsciiStream(final int columnIndex) throws SQLException {
+        return mergeResultSet.getInputStream(columnIndex, "Ascii");
+    }
+
+    @Override
+    public InputStream getAsciiStream(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return mergeResultSet.getInputStream(columnIndex, "Ascii");
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public InputStream getUnicodeStream(final int columnIndex) throws SQLException {
+        return mergeResultSet.getInputStream(columnIndex, "Unicode");
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public InputStream getUnicodeStream(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return mergeResultSet.getInputStream(columnIndex, "Unicode");
+    }
+
+    @Override
+    public InputStream getBinaryStream(final int columnIndex) throws SQLException {
+        return mergeResultSet.getInputStream(columnIndex, "Binary");
+    }
+
+    @Override
+    public InputStream getBinaryStream(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return mergeResultSet.getInputStream(columnIndex, "Binary");
+    }
+
+    @Override
+    public Reader getCharacterStream(final int columnIndex) throws SQLException {
+        return (Reader) mergeResultSet.getValue(columnIndex, Reader.class);
+    }
+
+    @Override
+    public Reader getCharacterStream(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Reader) mergeResultSet.getValue(columnIndex, Reader.class);
+    }
+
+    @Override
+    public Blob getBlob(final int columnIndex) throws SQLException {
+        return (Blob) mergeResultSet.getValue(columnIndex, Blob.class);
+    }
+
+    @Override
+    public Blob getBlob(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Blob) mergeResultSet.getValue(columnIndex, Blob.class);
+    }
+
+    @Override
+    public Clob getClob(final int columnIndex) throws SQLException {
+        return (Clob) mergeResultSet.getValue(columnIndex, Clob.class);
+    }
+
+    @Override
+    public Clob getClob(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (Clob) mergeResultSet.getValue(columnIndex, Clob.class);
+    }
+
+    @Override
+    public URL getURL(final int columnIndex) throws SQLException {
+        return (URL) mergeResultSet.getValue(columnIndex, URL.class);
+    }
+
+    @Override
+    public URL getURL(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (URL) mergeResultSet.getValue(columnIndex, URL.class);
+    }
+
+    @Override
+    public SQLXML getSQLXML(final int columnIndex) throws SQLException {
+        return (SQLXML) mergeResultSet.getValue(columnIndex, SQLXML.class);
+    }
+
+    @Override
+    public SQLXML getSQLXML(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return (SQLXML) mergeResultSet.getValue(columnIndex, SQLXML.class);
+    }
+
+    @Override
+    public Object getObject(final int columnIndex) throws SQLException {
+        return mergeResultSet.getValue(columnIndex, Object.class);
+    }
+
+    @Override
+    public Object getObject(final String columnLabel) throws SQLException {
+        int columnIndex = columnLabelAndIndexMap.get(columnLabel);
+        return mergeResultSet.getValue(columnIndex, Object.class);
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResultSetMetaData.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResultSetMetaData.java
new file mode 100644
index 0000000..fb775d8
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResultSetMetaData.java
@@ -0,0 +1,146 @@
+package cn.fateverse.query.submeter.result;
+
+import cn.fateverse.query.submeter.adapter.WrapperAdapter;
+import org.apache.shardingsphere.sql.parser.binder.segment.select.projection.Projection;
+import org.apache.shardingsphere.sql.parser.binder.segment.select.projection.impl.ColumnProjection;
+import org.apache.shardingsphere.sql.parser.binder.statement.SQLStatementContext;
+import org.apache.shardingsphere.sql.parser.binder.statement.dml.SelectStatementContext;
+import org.apache.shardingsphere.underlying.common.database.DefaultSchema;
+
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * @author Clay
+ * @date 2024/4/8 14:04
+ */
+public class SubmeterResultSetMetaData extends WrapperAdapter implements ResultSetMetaData {
+
+    private final ResultSetMetaData resultSetMetaData;
+
+    private final SQLStatementContext sqlStatementContext;
+
+    public SubmeterResultSetMetaData(ResultSetMetaData resultSetMetaData, SQLStatementContext sqlStatementContext) {
+        this.resultSetMetaData = resultSetMetaData;
+        this.sqlStatementContext = sqlStatementContext;
+    }
+
+
+    @Override
+    public int getColumnCount() throws SQLException {
+        return sqlStatementContext instanceof SelectStatementContext ? ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().size() : 0;
+    }
+
+
+    @Override
+    public boolean isAutoIncrement(final int column) throws SQLException {
+        return resultSetMetaData.isAutoIncrement(column);
+    }
+
+    @Override
+    public boolean isCaseSensitive(final int column) throws SQLException {
+        return resultSetMetaData.isCaseSensitive(column);
+    }
+
+    @Override
+    public boolean isSearchable(final int column) throws SQLException {
+        return resultSetMetaData.isSearchable(column);
+    }
+
+    @Override
+    public boolean isCurrency(final int column) throws SQLException {
+        return resultSetMetaData.isCurrency(column);
+    }
+
+    @Override
+    public int isNullable(final int column) throws SQLException {
+        return resultSetMetaData.isNullable(column);
+    }
+
+    @Override
+    public boolean isSigned(final int column) throws SQLException {
+        return resultSetMetaData.isSigned(column);
+    }
+
+    @Override
+    public int getColumnDisplaySize(final int column) throws SQLException {
+        return resultSetMetaData.getColumnDisplaySize(column);
+    }
+
+    @Override
+    public String getColumnLabel(final int column) throws SQLException {
+        return resultSetMetaData.getColumnLabel(column);
+    }
+
+    @Override
+    public String getColumnName(final int column) throws SQLException {
+        if (sqlStatementContext instanceof SelectStatementContext) {
+            List<Projection> actualProjections = ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections();
+            if (column > actualProjections.size()) {
+                throw new SQLException("Column index out of range.", "S1002", 0);
+            }
+            Projection projection = ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().get(column - 1);
+            if (projection instanceof ColumnProjection) {
+                return ((ColumnProjection) projection).getName();
+            }
+        }
+        return resultSetMetaData.getColumnName(column);
+    }
+
+    @Override
+    public String getSchemaName(final int column) {
+        return DefaultSchema.LOGIC_NAME;
+    }
+
+    @Override
+    public int getPrecision(final int column) throws SQLException {
+        return resultSetMetaData.getPrecision(column);
+    }
+
+    @Override
+    public int getScale(final int column) throws SQLException {
+        return resultSetMetaData.getScale(column);
+    }
+
+    @Override
+    public String getTableName(final int column) throws SQLException {
+        String actualTableName = resultSetMetaData.getTableName(column);
+        return actualTableName;
+    }
+
+    @Override
+    public String getCatalogName(final int column) {
+        return DefaultSchema.LOGIC_NAME;
+    }
+
+    @Override
+    public int getColumnType(final int column) throws SQLException {
+        return resultSetMetaData.getColumnType(column);
+    }
+
+    @Override
+    public String getColumnTypeName(final int column) throws SQLException {
+        return resultSetMetaData.getColumnTypeName(column);
+    }
+
+    @Override
+    public boolean isReadOnly(final int column) throws SQLException {
+        return resultSetMetaData.isReadOnly(column);
+    }
+
+    @Override
+    public boolean isWritable(final int column) throws SQLException {
+        return resultSetMetaData.isWritable(column);
+    }
+
+    @Override
+    public boolean isDefinitelyWritable(final int column) throws SQLException {
+        return resultSetMetaData.isDefinitelyWritable(column);
+    }
+
+    @Override
+    public String getColumnClassName(final int column) throws SQLException {
+        return resultSetMetaData.getColumnClassName(column);
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedOperationResultSet.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedOperationResultSet.java
new file mode 100644
index 0000000..651fbd3
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedOperationResultSet.java
@@ -0,0 +1,213 @@
+package cn.fateverse.query.submeter.unsupported;
+
+import java.io.Reader;
+import java.sql.*;
+import java.util.Map;
+
+/**
+ * @author Clay
+ * @date 2024/4/7 16:58
+ */
+public abstract class AbstractUnsupportedOperationResultSet extends AbstractUnsupportedUpdateOperationResultSet {
+
+    @Override
+    public boolean previous() throws SQLException {
+        throw new SQLFeatureNotSupportedException("previous");
+    }
+
+    @Override
+    public boolean isBeforeFirst() throws SQLException {
+        throw new SQLFeatureNotSupportedException("isBeforeFirst");
+    }
+
+    @Override
+    public boolean isAfterLast() throws SQLException {
+        throw new SQLFeatureNotSupportedException("isAfterLast");
+    }
+
+    @Override
+    public boolean isFirst() throws SQLException {
+        throw new SQLFeatureNotSupportedException("isFirst");
+    }
+
+    @Override
+    public boolean isLast() throws SQLException {
+        throw new SQLFeatureNotSupportedException("isLast");
+    }
+
+    @Override
+    public void beforeFirst() throws SQLException {
+        throw new SQLFeatureNotSupportedException("beforeFirst");
+    }
+
+    @Override
+    public void afterLast() throws SQLException {
+        throw new SQLFeatureNotSupportedException("afterLast");
+    }
+
+    @Override
+    public boolean first() throws SQLException {
+        throw new SQLFeatureNotSupportedException("first");
+    }
+
+    @Override
+    public boolean last() throws SQLException {
+        throw new SQLFeatureNotSupportedException("last");
+    }
+
+    @Override
+    public boolean absolute(final int row) throws SQLException {
+        throw new SQLFeatureNotSupportedException("absolute");
+    }
+
+    @Override
+    public boolean relative(final int rows) throws SQLException {
+        throw new SQLFeatureNotSupportedException("relative");
+    }
+
+    @Override
+    public int getRow() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getRow");
+    }
+
+    @Override
+    public final void insertRow() throws SQLException {
+        throw new SQLFeatureNotSupportedException("insertRow");
+    }
+
+    @Override
+    public final void updateRow() throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateRow");
+    }
+
+    @Override
+    public final void deleteRow() throws SQLException {
+        throw new SQLFeatureNotSupportedException("deleteRow");
+    }
+
+    @Override
+    public final void refreshRow() throws SQLException {
+        throw new SQLFeatureNotSupportedException("refreshRow");
+    }
+
+    @Override
+    public final void cancelRowUpdates() throws SQLException {
+        throw new SQLFeatureNotSupportedException("cancelRowUpdates");
+    }
+
+    @Override
+    public final void moveToInsertRow() throws SQLException {
+        throw new SQLFeatureNotSupportedException("moveToInsertRow");
+    }
+
+    @Override
+    public final void moveToCurrentRow() throws SQLException {
+        throw new SQLFeatureNotSupportedException("moveToCurrentRow");
+    }
+
+    @Override
+    public final boolean rowInserted() throws SQLException {
+        throw new SQLFeatureNotSupportedException("rowInserted");
+    }
+
+    @Override
+    public final boolean rowUpdated() throws SQLException {
+        throw new SQLFeatureNotSupportedException("rowUpdated");
+    }
+
+    @Override
+    public final boolean rowDeleted() throws SQLException {
+        throw new SQLFeatureNotSupportedException("rowDeleted");
+    }
+
+    @Override
+    public final String getCursorName() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getCursorName");
+    }
+
+    @Override
+    public final int getHoldability() throws SQLException {
+        throw new SQLFeatureNotSupportedException("getHoldability");
+    }
+
+    @Override
+    public final String getNString(final int columnIndex) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getNString");
+    }
+
+    @Override
+    public final String getNString(final String columnLabel) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getNString");
+    }
+
+    @Override
+    public final NClob getNClob(final int columnIndex) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getNClob");
+    }
+
+    @Override
+    public final NClob getNClob(final String columnLabel) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getNClob");
+    }
+
+    @Override
+    public final Reader getNCharacterStream(final int columnIndex) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getNCharacterStream");
+    }
+
+    @Override
+    public final Reader getNCharacterStream(final String columnLabel) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getNCharacterStream");
+    }
+
+    @Override
+    public final Ref getRef(final int columnIndex) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getRef");
+    }
+
+    @Override
+    public final Ref getRef(final String columnLabel) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getRef");
+    }
+
+    @Override
+    public final Array getArray(final int columnIndex) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getArray");
+    }
+
+    @Override
+    public final Array getArray(final String columnLabel) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getArray");
+    }
+
+    @Override
+    public final RowId getRowId(final int columnIndex) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getRowId");
+    }
+
+    @Override
+    public final RowId getRowId(final String columnLabel) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getRowId");
+    }
+
+    @Override
+    public final <T> T getObject(final int columnIndex, final Class<T> type) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getObject with type");
+    }
+
+    @Override
+    public final <T> T getObject(final String columnLabel, final Class<T> type) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getObject with type");
+    }
+
+    @Override
+    public final Object getObject(final String columnLabel, final Map<String, Class<?>> map) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getObject with map");
+    }
+
+    @Override
+    public final Object getObject(final int columnIndex, final Map<String, Class<?>> map) throws SQLException {
+        throw new SQLFeatureNotSupportedException("getObject with map");
+    }
+}
+
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedUpdateOperationResultSet.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedUpdateOperationResultSet.java
new file mode 100644
index 0000000..5d3e7bc
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedUpdateOperationResultSet.java
@@ -0,0 +1,425 @@
+package cn.fateverse.query.submeter.unsupported;
+
+import cn.fateverse.query.submeter.adapter.WrapperAdapter;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.sql.*;
+
+/**
+ * @author Clay
+ * @date 2024/4/7 16:57
+ */
+public abstract class AbstractUnsupportedUpdateOperationResultSet extends WrapperAdapter implements ResultSet {
+
+    @Override
+    public final void updateNull(final int columnIndex) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNull(final String columnLabel) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBoolean(final int columnIndex, final boolean x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBoolean(final String columnLabel, final boolean x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateByte(final int columnIndex, final byte x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateByte(final String columnLabel, final byte x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateShort(final int columnIndex, final short x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateShort(final String columnLabel, final short x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateInt(final int columnIndex, final int x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateInt(final String columnLabel, final int x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateLong(final int columnIndex, final long x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateLong(final String columnLabel, final long x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateFloat(final int columnIndex, final float x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateFloat(final String columnLabel, final float x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateDouble(final int columnIndex, final double x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateDouble(final String columnLabel, final double x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBigDecimal(final int columnIndex, final BigDecimal x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBigDecimal(final String columnLabel, final BigDecimal x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateString(final int columnIndex, final String x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateString(final String columnLabel, final String x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNString(final int columnIndex, final String nString) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNString(final String columnLabel, final String nString) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBytes(final int columnIndex, final byte[] x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBytes(final String columnLabel, final byte[] x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateDate(final int columnIndex, final Date x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateDate(final String columnLabel, final Date x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateTime(final int columnIndex, final Time x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateTime(final String columnLabel, final Time x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateTimestamp(final int columnIndex, final Timestamp x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateTimestamp(final String columnLabel, final Timestamp x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateAsciiStream(final int columnIndex, final InputStream inputStream) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateAsciiStream(final String columnLabel, final InputStream inputStream) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateAsciiStream(final int columnIndex, final InputStream x, final int length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateAsciiStream(final String columnLabel, final InputStream x, final int length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateAsciiStream(final int columnIndex, final InputStream inputStream, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateAsciiStream(final String columnLabel, final InputStream inputStream, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBinaryStream(final int columnIndex, final InputStream x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBinaryStream(final String columnLabel, final InputStream x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBinaryStream(final int columnIndex, final InputStream x, final int length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBinaryStream(final String columnLabel, final InputStream x, final int length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBinaryStream(final int columnIndex, final InputStream x, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBinaryStream(final String columnLabel, final InputStream x, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateCharacterStream(final int columnIndex, final Reader x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateCharacterStream(final String columnLabel, final Reader x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateCharacterStream(final int columnIndex, final Reader x, final int length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateCharacterStream(final String columnLabel, final Reader reader, final int length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateCharacterStream(final int columnIndex, final Reader x, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateCharacterStream(final String columnLabel, final Reader reader, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNCharacterStream(final int columnIndex, final Reader x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNCharacterStream(final String columnLabel, final Reader x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNCharacterStream(final int columnIndex, final Reader x, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNCharacterStream(final String columnLabel, final Reader x, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateObject(final int columnIndex, final Object x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateObject(final String columnLabel, final Object x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateObject(final int columnIndex, final Object x, final int scaleOrLength) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateObject(final String columnLabel, final Object x, final int scaleOrLength) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateRef(final int columnIndex, final Ref x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateRef(final String columnLabel, final Ref x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBlob(final int columnIndex, final Blob x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBlob(final String columnLabel, final Blob x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBlob(final int columnIndex, final InputStream inputStream) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBlob(final String columnLabel, final InputStream inputStream) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBlob(final int columnIndex, final InputStream inputStream, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateBlob(final String columnLabel, final InputStream inputStream, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateClob(final int columnIndex, final Clob x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateClob(final String columnLabel, final Clob x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateClob(final int columnIndex, final Reader reader) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateClob(final String columnLabel, final Reader reader) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateClob(final int columnIndex, final Reader reader, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateClob(final String columnLabel, final Reader reader, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNClob(final int columnIndex, final NClob nClob) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNClob(final String columnLabel, final NClob nClob) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNClob(final int columnIndex, final Reader reader) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNClob(final String columnLabel, final Reader reader) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNClob(final int columnIndex, final Reader reader, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateNClob(final String columnLabel, final Reader reader, final long length) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateArray(final int columnIndex, final Array x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateArray(final String columnLabel, final Array x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateRowId(final int columnIndex, final RowId x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateRowId(final String columnLabel, final RowId x) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateSQLXML(final int columnIndex, final SQLXML xmlObject) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+
+    @Override
+    public final void updateSQLXML(final String columnLabel, final SQLXML xmlObject) throws SQLException {
+        throw new SQLFeatureNotSupportedException("updateXXX");
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/DataSourceUtil.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/DataSourceUtil.java
new file mode 100644
index 0000000..20afaab
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/DataSourceUtil.java
@@ -0,0 +1,67 @@
+package cn.fateverse.query.submeter.util;
+
+import com.google.common.base.CaseFormat;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import javax.sql.DataSource;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class DataSourceUtil {
+    
+    private static final String SET_METHOD_PREFIX = "set";
+    
+    private static Collection<Class<?>> generalClassType;
+    
+    static {
+        generalClassType = new HashSet<>();
+        Collections.addAll(generalClassType,boolean.class, Boolean.class, int.class, Integer.class, long.class, Long.class, String.class);
+    }
+    
+    /**
+     * Get data source.
+     *
+     * @param dataSourceClassName data source class name
+     * @param dataSourceProperties data source properties
+     * @return data source instance
+     * @throws ReflectiveOperationException reflective operation exception
+     */
+    public static DataSource getDataSource(final String dataSourceClassName, final Map<String, Object> dataSourceProperties) throws ReflectiveOperationException {
+        DataSource result = (DataSource) Class.forName(dataSourceClassName).newInstance();
+        for (Entry<String, Object> entry : dataSourceProperties.entrySet()) {
+            callSetterMethod(result, getSetterMethodName(entry.getKey()), null == entry.getValue() ? null : entry.getValue().toString());
+        }
+        return result;
+    }
+    
+    private static String getSetterMethodName(final String propertyName) {
+        if (propertyName.contains("-")) {
+            return CaseFormat.LOWER_HYPHEN.to(CaseFormat.LOWER_CAMEL, SET_METHOD_PREFIX + "-" + propertyName);
+        }
+        return SET_METHOD_PREFIX + String.valueOf(propertyName.charAt(0)).toUpperCase() + propertyName.substring(1, propertyName.length());
+    }
+    
+    private static void callSetterMethod(final DataSource dataSource, final String methodName, final String setterValue) {
+        for (Class<?> each : generalClassType) {
+            try {
+                Method method = dataSource.getClass().getMethod(methodName, each);
+                if (boolean.class == each || Boolean.class == each) {
+                    method.invoke(dataSource, Boolean.valueOf(setterValue));
+                } else if (int.class == each || Integer.class == each) {
+                    method.invoke(dataSource, Integer.parseInt(setterValue));
+                } else if (long.class == each || Long.class == each) {
+                    method.invoke(dataSource, Long.parseLong(setterValue));
+                } else {
+                    method.invoke(dataSource, setterValue);
+                }
+                return;
+            } catch (final ReflectiveOperationException ignored) {
+            }
+        }
+    }
+}
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/PropertyUtil.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/PropertyUtil.java
new file mode 100644
index 0000000..4f9bf70
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/PropertyUtil.java
@@ -0,0 +1,83 @@
+package cn.fateverse.query.submeter.util;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.PropertyResolver;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class PropertyUtil {
+    
+    private static int springBootVersion = 1;
+    
+    static {
+        try {
+            Class.forName("org.springframework.boot.bind.RelaxedPropertyResolver");
+        } catch (ClassNotFoundException ignored) {
+            springBootVersion = 2;
+        }
+    }
+    
+    /**
+     * Spring Boot 1.x is compatible with Spring Boot 2.x by Using Java Reflect.
+     * @param environment : the environment context
+     * @param prefix : the prefix part of property key
+     * @param targetClass : the target class type of result
+     * @param <T> : refer to @param targetClass
+     * @return T
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T handle(final Environment environment, final String prefix, final Class<T> targetClass) {
+        switch (springBootVersion) {
+            case 1:
+                return (T) v1(environment, prefix);
+            default:
+                return (T) v2(environment, prefix, targetClass);
+        }
+    }
+    
+    @SuppressWarnings("unchecked")
+    @SneakyThrows
+    private static Object v1(final Environment environment, final String prefix) {
+        Class<?> resolverClass = Class.forName("org.springframework.boot.bind.RelaxedPropertyResolver");
+        Constructor<?> resolverConstructor = resolverClass.getDeclaredConstructor(PropertyResolver.class);
+        Method getSubPropertiesMethod = resolverClass.getDeclaredMethod("getSubProperties", String.class);
+        Object resolverObject = resolverConstructor.newInstance(environment);
+        String prefixParam = prefix.endsWith(".") ? prefix : prefix + ".";
+        Method getPropertyMethod = resolverClass.getDeclaredMethod("getProperty", String.class);
+        Map<String, Object> dataSourceProps = (Map<String, Object>) getSubPropertiesMethod.invoke(resolverObject, prefixParam);
+        Map<String, Object> propertiesWithPlaceholderResolved = new HashMap<>();
+        for (Map.Entry<String, Object> entry : dataSourceProps.entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            if (value instanceof String && ((String) value).contains(
+                    PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX)) {
+                String resolvedValue = (String) getPropertyMethod.invoke(resolverObject, prefixParam + key);
+                propertiesWithPlaceholderResolved.put(key, resolvedValue);
+            } else {
+                propertiesWithPlaceholderResolved.put(key, value);
+            }
+        }
+        return Collections.unmodifiableMap(propertiesWithPlaceholderResolved);
+    }
+    
+    @SneakyThrows
+    private static Object v2(final Environment environment, final String prefix, final Class<?> targetClass) {
+        Class<?> binderClass = Class.forName("org.springframework.boot.context.properties.bind.Binder");
+        Method getMethod = binderClass.getDeclaredMethod("get", Environment.class);
+        Method bindMethod = binderClass.getDeclaredMethod("bind", String.class, Class.class);
+        Object binderObject = getMethod.invoke(null, environment);
+        String prefixParam = prefix.endsWith(".") ? prefix.substring(0, prefix.length() - 1) : prefix;
+        Object bindResultObject = bindMethod.invoke(binderObject, prefixParam, targetClass);
+        Method resultGetMethod = bindResultObject.getClass().getDeclaredMethod("get");
+        return resultGetMethod.invoke(bindResultObject);
+    }
+}
\ No newline at end of file
diff --git a/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/ResultSetUtil.java b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/ResultSetUtil.java
new file mode 100644
index 0000000..b82c8f1
--- /dev/null
+++ b/custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/ResultSetUtil.java
@@ -0,0 +1,130 @@
+package cn.fateverse.query.submeter.util;
+
+
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import com.google.common.primitives.Shorts;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Date;
+
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ResultSetUtil {
+
+    /**
+     * Convert value via expected class type.
+     *
+     * @param value       original value
+     * @param convertType expected class type
+     * @return converted value
+     */
+    public static Object convertValue(final Object value, final Class<?> convertType) {
+        if (null == value) {
+            return convertNullValue(convertType);
+        }
+        if (value.getClass() == convertType) {
+            return value;
+        }
+        if (value instanceof Number) {
+            return convertNumberValue(value, convertType);
+        }
+        if (value instanceof Date) {
+            return convertDateValue(value, convertType);
+        }
+        if (value instanceof byte[]) {
+            return convertByteArrayValue(value, convertType);
+        }
+        if (String.class.equals(convertType)) {
+            return value.toString();
+        } else {
+            return value;
+        }
+    }
+
+    private static Object convertNullValue(final Class<?> convertType) {
+        switch (convertType.getName()) {
+            case "boolean":
+                return false;
+            case "byte":
+                return (byte) 0;
+            case "short":
+                return (short) 0;
+            case "int":
+                return 0;
+            case "long":
+                return 0L;
+            case "float":
+                return 0F;
+            case "double":
+                return 0D;
+            default:
+                return null;
+        }
+    }
+
+    private static Object convertNumberValue(final Object value, final Class<?> convertType) {
+        Number number = (Number) value;
+        switch (convertType.getName()) {
+            case "boolean":
+                return 0 != number.longValue();
+            case "byte":
+                return number.byteValue();
+            case "short":
+                return number.shortValue();
+            case "int":
+                return number.intValue();
+            case "long":
+                return number.longValue();
+            case "double":
+                return number.doubleValue();
+            case "float":
+                return number.floatValue();
+            case "java.math.BigDecimal":
+                return new BigDecimal(number.toString());
+            case "java.lang.Object":
+                return value;
+            case "java.lang.String":
+                return value.toString();
+            default:
+//                throw new ShardingSphereException("Unsupported data type: %s", convertType);
+                throw new RuntimeException("Unsupported data type: " + convertType);
+        }
+    }
+
+    private static Object convertDateValue(final Object value, final Class<?> convertType) {
+        Date date = (Date) value;
+        switch (convertType.getName()) {
+            case "java.sql.Date":
+                return new java.sql.Date(date.getTime());
+            case "java.sql.Time":
+                return new Time(date.getTime());
+            case "java.sql.Timestamp":
+                return new Timestamp(date.getTime());
+            case "java.lang.String":
+                return date.toString();
+            default:
+//                throw new ShardingSphereException("Unsupported Date type: %s", convertType);
+                throw new RuntimeException("Unsupported data type: " + convertType);
+        }
+    }
+
+    private static Object convertByteArrayValue(final Object value, final Class<?> convertType) {
+        byte[] bytesValue = (byte[]) value;
+        switch (bytesValue.length) {
+            case 1:
+                return convertNumberValue(bytesValue[0], convertType);
+            case Shorts.BYTES:
+                return convertNumberValue(Shorts.fromByteArray(bytesValue), convertType);
+            case Ints.BYTES:
+                return convertNumberValue(Ints.fromByteArray(bytesValue), convertType);
+            case Longs.BYTES:
+                return convertNumberValue(Longs.fromByteArray(bytesValue), convertType);
+            default:
+                return value;
+        }
+    }
+}
diff --git a/custom-query/pom.xml b/custom-query/pom.xml
new file mode 100644
index 0000000..f40b4cc
--- /dev/null
+++ b/custom-query/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>fateverse</artifactId>
+        <groupId>cn.fateverse</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>custom-query</artifactId>
+    <packaging>pom</packaging>
+
+    <description>自定义查询模块</description>
+
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <modules>
+        <module>custom-query-biz</module>
+        <module>custom-query-submter</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/log/log-biz/src/main/resources/bootstrap.yml b/log/log-biz/src/main/resources/bootstrap.yml
index 9ba9ecd..efac4ca 100644
--- a/log/log-biz/src/main/resources/bootstrap.yml
+++ b/log/log-biz/src/main/resources/bootstrap.yml
@@ -34,7 +34,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}
diff --git a/maven.sh b/maven.sh
index 66073ca..9365d4d 100644
--- a/maven.sh
+++ b/maven.sh
@@ -19,13 +19,13 @@ cp docker.sh /app/build/"${batch}"/ # docker 镜像打包脚本
 batchArr=("admin-biz:admin"
           "notice-biz:notice"
           "log-biz:log"
+          "custom-query-biz:custom-query"
+#          "workflow:visual"
           "monitor:visual"
-          "code-gen:visual"
-          "custom-query:visual"
+#          "code-gen:visual"
           "sentinel-dashboard:visual"
           "code-gen-test-mysql:visual"
           "sentinel-dashboard-pro:visual"
-          "workflow:visual"
           "string3:field3")
 batch=${DRONE_COMMIT_BRANCH}
 
diff --git a/notice/notice-biz/src/main/resources/bootstrap.yml b/notice/notice-biz/src/main/resources/bootstrap.yml
index 5500d06..9432ed5 100644
--- a/notice/notice-biz/src/main/resources/bootstrap.yml
+++ b/notice/notice-biz/src/main/resources/bootstrap.yml
@@ -33,7 +33,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}
diff --git a/pom.xml b/pom.xml
index 3248b29..21239f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,9 @@
         <module>visual</module>
         <module>notice</module>
         <module>log</module>
+        <module>code-gen</module>
+        <module>custom-query</module>
+        <module>workflow</module>
     </modules>
 
 
diff --git a/visual/pom.xml b/visual/pom.xml
index 9d93f8a..fdb2ec2 100644
--- a/visual/pom.xml
+++ b/visual/pom.xml
@@ -17,9 +17,6 @@
     </properties>
     <modules>
 <!--        <module>monitor</module>-->
-        <module>custom-query</module>
-        <module>code-gen</module>
-        <module>workflow</module>
         <!--        <module>code-gen-test-oracle</module>-->
         <!--        <module>code-gen-test-mysql</module>-->
 <!--                <module>sentinel-dashboard</module>-->
diff --git a/visual/workflow/pom.xml b/workflow/pom.xml
similarity index 100%
rename from visual/workflow/pom.xml
rename to workflow/pom.xml
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/WorkFlowApplication.java b/workflow/src/main/java/cn/fateverse/workflow/WorkFlowApplication.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/WorkFlowApplication.java
rename to workflow/src/main/java/cn/fateverse/workflow/WorkFlowApplication.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/constant/ProcessConstant.java b/workflow/src/main/java/cn/fateverse/workflow/constant/ProcessConstant.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/constant/ProcessConstant.java
rename to workflow/src/main/java/cn/fateverse/workflow/constant/ProcessConstant.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessDefinitionController.java b/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessDefinitionController.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessDefinitionController.java
rename to workflow/src/main/java/cn/fateverse/workflow/controller/ProcessDefinitionController.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessFileController.java b/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessFileController.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessFileController.java
rename to workflow/src/main/java/cn/fateverse/workflow/controller/ProcessFileController.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessInstanceController.java b/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessInstanceController.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessInstanceController.java
rename to workflow/src/main/java/cn/fateverse/workflow/controller/ProcessInstanceController.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessListenerController.java b/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessListenerController.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessListenerController.java
rename to workflow/src/main/java/cn/fateverse/workflow/controller/ProcessListenerController.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessTaskController.java b/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessTaskController.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/controller/ProcessTaskController.java
rename to workflow/src/main/java/cn/fateverse/workflow/controller/ProcessTaskController.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/FormPerm.java b/workflow/src/main/java/cn/fateverse/workflow/entity/FormPerm.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/FormPerm.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/FormPerm.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/HistoricalOperation.java b/workflow/src/main/java/cn/fateverse/workflow/entity/HistoricalOperation.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/HistoricalOperation.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/HistoricalOperation.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessBusiness.java b/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessBusiness.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessBusiness.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/ProcessBusiness.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessData.java b/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessData.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessData.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/ProcessData.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessFile.java b/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessFile.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessFile.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/ProcessFile.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessListener.java b/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/ProcessListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/ProcessListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/UserInstance.java b/workflow/src/main/java/cn/fateverse/workflow/entity/UserInstance.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/UserInstance.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/UserInstance.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bo/AnalysisProcessBo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bo/AnalysisProcessBo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bo/AnalysisProcessBo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bo/AnalysisProcessBo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bo/VariablesBo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bo/VariablesBo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bo/VariablesBo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bo/VariablesBo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Attachment.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Attachment.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Attachment.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Attachment.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/CommentInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/CommentInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/CommentInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/CommentInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ConditionInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ConditionInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ConditionInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ConditionInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/EmailInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/EmailInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/EmailInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/EmailInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItem.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItem.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItem.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItem.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItemProps.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItemProps.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItemProps.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItemProps.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormOperates.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormOperates.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormOperates.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/FormOperates.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/GroupsInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/GroupsInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/GroupsInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/GroupsInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpParam.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpParam.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpParam.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpParam.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerItem.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerItem.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerItem.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerItem.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/LogoInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/LogoInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/LogoInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/LogoInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyType.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyType.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyType.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyType.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyTypeInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyTypeInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyTypeInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyTypeInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ProcessNode.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ProcessNode.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ProcessNode.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/ProcessNode.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Properties.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Properties.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Properties.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/Properties.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/RoleInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/RoleInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/RoleInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/RoleInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/SettingsInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/SettingsInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/SettingsInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/SettingsInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/UserInfo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/UserInfo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/UserInfo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/bpmn/UserInfo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/FormItemDto.java b/workflow/src/main/java/cn/fateverse/workflow/entity/dto/FormItemDto.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/FormItemDto.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/dto/FormItemDto.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessDto.java b/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessDto.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessDto.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessDto.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessInstanceDto.java b/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessInstanceDto.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessInstanceDto.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessInstanceDto.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java b/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/TaskDto.java b/workflow/src/main/java/cn/fateverse/workflow/entity/dto/TaskDto.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/TaskDto.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/dto/TaskDto.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessListenerQuery.java b/workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessListenerQuery.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessListenerQuery.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessListenerQuery.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessQuery.java b/workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessQuery.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessQuery.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/query/ProcessQuery.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/FormItemData.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/FormItemData.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/FormItemData.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/FormItemData.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/HistoricalOperationVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/HistoricalOperationVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/HistoricalOperationVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/HistoricalOperationVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionHistoryVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionHistoryVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionHistoryVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionHistoryVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionInfoVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionInfoVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionInfoVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionInfoVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceDetailVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceDetailVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceDetailVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceDetailVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessListenerVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessListenerVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessListenerVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/ProcessListenerVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskDetailVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskDetailVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskDetailVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskDetailVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskResultVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskResultVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskResultVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskResultVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskVo.java b/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskVo.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskVo.java
rename to workflow/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskVo.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/enums/AssigneeTypeEnums.java b/workflow/src/main/java/cn/fateverse/workflow/enums/AssigneeTypeEnums.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/enums/AssigneeTypeEnums.java
rename to workflow/src/main/java/cn/fateverse/workflow/enums/AssigneeTypeEnums.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/enums/FormItemEnum.java b/workflow/src/main/java/cn/fateverse/workflow/enums/FormItemEnum.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/enums/FormItemEnum.java
rename to workflow/src/main/java/cn/fateverse/workflow/enums/FormItemEnum.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/enums/FormPermEnum.java b/workflow/src/main/java/cn/fateverse/workflow/enums/FormPermEnum.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/enums/FormPermEnum.java
rename to workflow/src/main/java/cn/fateverse/workflow/enums/FormPermEnum.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/enums/ModeEnums.java b/workflow/src/main/java/cn/fateverse/workflow/enums/ModeEnums.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/enums/ModeEnums.java
rename to workflow/src/main/java/cn/fateverse/workflow/enums/ModeEnums.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/enums/OperationEnums.java b/workflow/src/main/java/cn/fateverse/workflow/enums/OperationEnums.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/enums/OperationEnums.java
rename to workflow/src/main/java/cn/fateverse/workflow/enums/OperationEnums.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/enums/OperationStateEnums.java b/workflow/src/main/java/cn/fateverse/workflow/enums/OperationStateEnums.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/enums/OperationStateEnums.java
rename to workflow/src/main/java/cn/fateverse/workflow/enums/OperationStateEnums.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/enums/ProcessNodeEnum.java b/workflow/src/main/java/cn/fateverse/workflow/enums/ProcessNodeEnum.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/enums/ProcessNodeEnum.java
rename to workflow/src/main/java/cn/fateverse/workflow/enums/ProcessNodeEnum.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/FormItemDataMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/FormItemDataMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/FormItemDataMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/FormItemDataMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/FormPermMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/FormPermMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/FormPermMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/FormPermMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/HisFlowableActinstMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/HisFlowableActinstMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/HisFlowableActinstMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/HisFlowableActinstMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/HistoricalOperationMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/HistoricalOperationMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/HistoricalOperationMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/HistoricalOperationMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessBusinessMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessBusinessMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessBusinessMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessBusinessMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessDataMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessDataMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessDataMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessDataMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessFileMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessFileMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessFileMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessFileMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessListenerMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessListenerMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessListenerMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessListenerMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/ProcessMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/RunFlowableActinstMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/RunFlowableActinstMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/RunFlowableActinstMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/RunFlowableActinstMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/TaskRuntimeMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/TaskRuntimeMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/TaskRuntimeMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/TaskRuntimeMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/mapper/UserInstanceMapper.java b/workflow/src/main/java/cn/fateverse/workflow/mapper/UserInstanceMapper.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/mapper/UserInstanceMapper.java
rename to workflow/src/main/java/cn/fateverse/workflow/mapper/UserInstanceMapper.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/BpmnParseUtil.java b/workflow/src/main/java/cn/fateverse/workflow/process/BpmnParseUtil.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/BpmnParseUtil.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/BpmnParseUtil.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/FormItemParseUtil.java b/workflow/src/main/java/cn/fateverse/workflow/process/FormItemParseUtil.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/FormItemParseUtil.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/FormItemParseUtil.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/ProcessServiceUtils.java b/workflow/src/main/java/cn/fateverse/workflow/process/ProcessServiceUtils.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/ProcessServiceUtils.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/ProcessServiceUtils.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/ProcessUtil.java b/workflow/src/main/java/cn/fateverse/workflow/process/ProcessUtil.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/ProcessUtil.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/ProcessUtil.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/TriggerService.java b/workflow/src/main/java/cn/fateverse/workflow/process/TriggerService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/TriggerService.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/TriggerService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/cmd/RollbackUserTaskCmd.java b/workflow/src/main/java/cn/fateverse/workflow/process/cmd/RollbackUserTaskCmd.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/cmd/RollbackUserTaskCmd.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/cmd/RollbackUserTaskCmd.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/BoundaryEvenListener.java b/workflow/src/main/java/cn/fateverse/workflow/process/listener/BoundaryEvenListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/BoundaryEvenListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/listener/BoundaryEvenListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/CounterSignListener.java b/workflow/src/main/java/cn/fateverse/workflow/process/listener/CounterSignListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/CounterSignListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/listener/CounterSignListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/CreateStartEventListener.java b/workflow/src/main/java/cn/fateverse/workflow/process/listener/CreateStartEventListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/CreateStartEventListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/listener/CreateStartEventListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/IntermediateCatchEventListener.java b/workflow/src/main/java/cn/fateverse/workflow/process/listener/IntermediateCatchEventListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/IntermediateCatchEventListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/listener/IntermediateCatchEventListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/ProcessListener.java b/workflow/src/main/java/cn/fateverse/workflow/process/listener/ProcessListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/ProcessListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/listener/ProcessListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/ServiceListener.java b/workflow/src/main/java/cn/fateverse/workflow/process/listener/ServiceListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/ServiceListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/listener/ServiceListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/TaskCreatedListener.java b/workflow/src/main/java/cn/fateverse/workflow/process/listener/TaskCreatedListener.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/process/listener/TaskCreatedListener.java
rename to workflow/src/main/java/cn/fateverse/workflow/process/listener/TaskCreatedListener.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/NotifyService.java b/workflow/src/main/java/cn/fateverse/workflow/service/NotifyService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/NotifyService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/NotifyService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessDefinitionService.java b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessDefinitionService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessDefinitionService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/ProcessDefinitionService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessFileService.java b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessFileService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessFileService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/ProcessFileService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessInstanceService.java b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessInstanceService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessInstanceService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/ProcessInstanceService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessListenerService.java b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessListenerService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessListenerService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/ProcessListenerService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java
similarity index 73%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java
index bba2ad4..c4ed388 100644
--- a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java
+++ b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java
@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -46,28 +45,16 @@ public class ProcessNodeService {
     private final Map<Long, List<UserVo>> cacheRoleCacheUserMap;
     //部门用户缓存
     private final Map<Long, UserInfo> cacheDeptCacheUserMap;
-    //操作历史缓存
-    private Map<String, List<UserInfo>> userOperationInfoMap;
+
     //用户缓存信息
     private final Map<Long, UserInfo> cacheUserMap;
-    //自选用户信息
-    private JSONObject optionalUser;
 
-    private final List<ProcessNode> result = new ArrayList<>();
-
-    private final List<ProcessNode> temProcess = new ArrayList<>();
-
-    private final Set<Long> userIdSet = new HashSet<>();
-
-    private User user;
-
-    private Boolean isStart;
 
     public ProcessNodeService() {
         executor = new ThreadPoolExecutor(2,
                 4,
                 60,
-                TimeUnit.SECONDS,new LinkedBlockingDeque<>(128),
+                TimeUnit.SECONDS, new LinkedBlockingDeque<>(128),
                 new ThreadFactoryBuilder().setNameFormat("process_%d").build(),
                 new ThreadPoolExecutor.CallerRunsPolicy());
         cacheUserIdMap = new ConcurrentHashMap<>();
@@ -86,18 +73,15 @@ public class ProcessNodeService {
     public List<ProcessNode> getProcessNodes(String processStr, User user, List<HistoricalOperationVo> operationList,
                                              JSONObject optionalUser, Boolean isStart) {
         Date startTime = new Date();
-        this.isStart = isStart;
-        this.optionalUser = optionalUser;
-        userOperationInfoMap = operationList.stream().filter(operation -> null != operation.getUserInfo()).collect(Collectors.toMap(HistoricalOperationVo::getNodeId, HistoricalOperationVo::getUserInfo));
-        this.user = user;
+        Map<String, List<UserInfo>> operationInfoMap = operationList.stream().filter(operation -> null != operation.getUserInfo()).collect(Collectors.toMap(HistoricalOperationVo::getNodeId, HistoricalOperationVo::getUserInfo));
+        ProcessNodeWrapper wrapper = new ProcessNodeWrapper(operationInfoMap, optionalUser, user, isStart);
         //todo 获取到用户信息.将root节点的信息进更改,后期为对所有的节点数据进行处理
         List<ProcessNode> processNodeList = JSON.parseArray(processStr, ProcessNode.class);
-        init();
-        final CountDownLatch countDownLatch = new CountDownLatch(processNodeList.size());
+        CountDownLatch countDownLatch = new CountDownLatch(processNodeList.size());
         for (ProcessNode processNode : processNodeList) {
             executor.submit(() -> {
                 try {
-                    doInitProcessNode(processNode);
+                    doInitProcessNode(processNode, wrapper);
                 } finally {
                     countDownLatch.countDown();
                 }
@@ -108,34 +92,14 @@ public class ProcessNodeService {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
-        if (!temProcess.isEmpty() && !userIdSet.isEmpty()) {
-            Map<Long, UserInfo> userMap = searchUserListByUserIds(new ArrayList<>(userIdSet)).stream().collect(Collectors.toMap(info -> Long.valueOf(info.getId()), Function.identity()));
-            temProcess.forEach(processNode -> {
-                List<Long> list = cacheUserIdMap.get(processNode.getId());
-                List<UserInfo> assignedUser = processNode.getProps().getAssignedUser();
-                if (null == assignedUser) {
-                    assignedUser = new ArrayList<>();
-                }
-                List<UserInfo> newUser = list.stream().map(userMap::get).collect(Collectors.toList());
-                assignedUser.addAll(newUser);
-                processNode.getProps().setAssignedUser(assignedUser);
-                processNode.getProps().setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
-                result.add(processNode);
-            });
-        }
         clearCache();
         System.out.println("用时 :" + (new Date().getTime() - startTime.getTime()));
-        return result;
+        return wrapper.result;
     }
 
     /**
      * 初始化
      */
-    private void init() {
-        result.clear();
-        temProcess.clear();
-        userIdSet.clear();
-    }
 
     /**
      * 清除缓存,当空间大于16时进行清除
@@ -150,8 +114,6 @@ public class ProcessNodeService {
         if (cacheUserMap.size() > 16) {
             cacheUserMap.clear();
         }
-        temProcess.clear();
-        userIdSet.clear();
     }
 
     /**
@@ -239,31 +201,9 @@ public class ProcessNodeService {
      *
      * @param processNode
      */
-    private void setResult(ProcessNode processNode) {
-        synchronized (result) {
-            result.add(processNode);
-        }
-    }
-
-    /**
-     * 设置临时集合
-     *
-     * @param processNode
-     */
-    private void setTemProcess(ProcessNode processNode) {
-        synchronized (temProcess) {
-            temProcess.add(processNode);
-        }
-    }
-
-    /**
-     * 设置用户id集合
-     *
-     * @param userId
-     */
-    private void setUserIdSet(Long userId) {
-        synchronized (userIdSet) {
-            userIdSet.add(userId);
+    private void setResult(ProcessNode processNode, ProcessNodeWrapper wrapper) {
+        synchronized (wrapper.result) {
+            wrapper.result.add(processNode);
         }
     }
 
@@ -272,68 +212,68 @@ public class ProcessNodeService {
      *
      * @param processNode
      */
-    private void doInitProcessNode(ProcessNode processNode) {
+    private void doInitProcessNode(ProcessNode processNode, ProcessNodeWrapper wrapper) {
         if (processNode.getId().equals(ProcessConstant.ROOT_NODE)) {
-            processNodeSelf(processNode);
+            processNodeSelf(processNode, wrapper);
             return;
         }
-        List<UserInfo> operationInfoList = userOperationInfoMap.get(processNode.getId());
+        List<UserInfo> operationInfoList = wrapper.userOperationInfoMap.get(processNode.getId());
         //为空则表示未被激活,激活后的都会在有一条操作记录
         Properties props = processNode.getProps();
         if (null == operationInfoList || operationInfoList.isEmpty()) {
             if (ProcessNodeEnum.APPROVAL.equals(processNode.getType())) {
                 //未获取到用户id则可能是分支节点,获取是未激活的节点(未激活的节点则会有 抄送节点(已选择好人 或者)和审核节点)
                 AssigneeTypeEnums assignedType = props.getAssignedType();
-                if (!isStart) {
+                if (!wrapper.isStart) {
                     props.setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
                 }
                 switch (assignedType) {
                     case SELF:
-                        processNodeSelf(processNode);
+                        processNodeSelf(processNode, wrapper);
                         break;
                     case SELF_SELECT:
-                        processNodeSelfSelect(processNode);
+                        processNodeSelfSelect(processNode, wrapper);
                         break;
                     case ROLE:
-                        processNodeRole(processNode);
+                        processNodeRole(processNode, wrapper);
                         break;
                     case LEADER:
-                        processNodeLeader(processNode);
+                        processNodeLeader(processNode, wrapper);
                         break;
                     case LEADER_TOP:
-                        processNodeLeaderTop(processNode);
+                        processNodeLeaderTop(processNode, wrapper);
                         break;
                     case ASSIGN_USER:
                     default:
-                        setResult(processNode);
+                        setResult(processNode, wrapper);
                         break;
                 }
             } else if (ProcessNodeEnum.CC.equals(processNode.getType())) {
-                processNodeCC(processNode);
+                processNodeCC(processNode, wrapper);
             } else {
-                setResult(processNode);
+                setResult(processNode, wrapper);
             }
         } else {
             props.setAssignedUser(operationInfoList);
-            if (!isStart) {
+            if (!wrapper.isStart) {
                 props.setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
             }
-            setResult(processNode);
+            setResult(processNode, wrapper);
         }
     }
 
-    private void processNodeCC(ProcessNode processNode) {
-        List<UserInfo> userList = optionalUser.getList(processNode.getId(), UserInfo.class);
+    private void processNodeCC(ProcessNode processNode, ProcessNodeWrapper wrapper) {
+        List<UserInfo> userList = wrapper.optionalUser.getList(processNode.getId(), UserInfo.class);
         if (null != userList && !userList.isEmpty()) {
             Properties props = processNode.getProps();
             props.setAssignedUser(userList);
-            if (!isStart) {
+            if (!wrapper.isStart) {
                 props.setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
             } else {
                 processNode.getProps().setAssignedType(null);
             }
         }
-        setResult(processNode);
+        setResult(processNode, wrapper);
     }
 
     /**
@@ -341,26 +281,26 @@ public class ProcessNodeService {
      *
      * @param processNode
      */
-    private void processNodeSelfSelect(ProcessNode processNode) {
-        List<UserInfo> userList = optionalUser.getList(processNode.getId(), UserInfo.class);
+    private void processNodeSelfSelect(ProcessNode processNode, ProcessNodeWrapper wrapper) {
+        List<UserInfo> userList = wrapper.optionalUser.getList(processNode.getId(), UserInfo.class);
         if (null != userList && !userList.isEmpty()) {
             Properties props = processNode.getProps();
             props.setAssignedUser(userList);
-            if (!isStart) {
+            if (!wrapper.isStart) {
                 processNode.getProps().setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
             } else {
                 processNode.getProps().setAssignedType(AssigneeTypeEnums.SELF_SELECT);
             }
         }
-        setResult(processNode);
+        setResult(processNode, wrapper);
     }
 
-    private void processNodeLeaderTop(ProcessNode processNode) {
+    private void processNodeLeaderTop(ProcessNode processNode, ProcessNodeWrapper wrapper) {
         Properties props = processNode.getProps();
         List<UserInfo> assignedUser;
         Map<String, Object> leaderTop = props.getLeaderTop();
         String endCondition = leaderTop.get("endCondition").toString();
-        Dept dept = user.getDept();
+        Dept dept = wrapper.user.getDept();
         List<Long> parentIds = Arrays.stream(dept.getAncestors().split(",")).map(Long::valueOf).collect(Collectors.toList());
         switch (endCondition) {
             case "TOP"://直接到最上层
@@ -369,7 +309,7 @@ public class ProcessNodeService {
             case "LEAVE"://到指定级别
                 int level = Integer.parseInt(leaderTop.get("level").toString());
                 List<Long> leaderDeptIds = null;
-                int length = parentIds.size() - 1;
+                int length = parentIds.size();
                 if (level > length) {
                     leaderDeptIds = parentIds.subList(1, parentIds.size());
                 } else {
@@ -382,16 +322,16 @@ public class ProcessNodeService {
         }
         processNode.getProps().setAssignedUser(assignedUser);
         processNode.getProps().setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
-        setResult(processNode);
+        setResult(processNode, wrapper);
     }
 
-    private void processNodeLeader(ProcessNode processNode) {
+    private void processNodeLeader(ProcessNode processNode, ProcessNodeWrapper wrapper) {
         List<UserInfo> assignedUser;
         Properties props = processNode.getProps();
         int level = Integer.parseInt(props.getLeader().get("level").toString());
-        Dept dept = user.getDept();
+        Dept dept = wrapper.user.getDept();
         if (1 == level) {
-            assignedUser = searchUserListByUserIds(Collections.singletonList(dept.getLeaderId()));
+            assignedUser = searchUserListByUserIds(Collections.singletonList(dept.getDeptId()));
         } else {
             List<Long> parentIds = Arrays.stream(dept.getAncestors().split(",")).map(Long::valueOf).collect(Collectors.toList());
             Long leaderDeptId = null;
@@ -405,7 +345,7 @@ public class ProcessNodeService {
         }
         props.setAssignedUser(assignedUser);
         props.setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
-        setResult(processNode);
+        setResult(processNode, wrapper);
     }
 
     /**
@@ -413,15 +353,15 @@ public class ProcessNodeService {
      *
      * @param processNode 流程节点
      */
-    private void processNodeSelf(ProcessNode processNode) {
+    private void processNodeSelf(ProcessNode processNode, ProcessNodeWrapper wrapper) {
         Properties props = processNode.getProps();
         List<UserInfo> assignedUser;
         assignedUser = new ArrayList<>();
-        UserInfo userInfo = UserInfo.toUserInfo(user, OperationStateEnums.UNACTIVATED);
+        UserInfo userInfo = UserInfo.toUserInfo(wrapper.user, OperationStateEnums.UNACTIVATED);
         assignedUser.add(userInfo);
         props.setAssignedUser(assignedUser);
         props.setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
-        setResult(processNode);
+        setResult(processNode, wrapper);
     }
 
     /**
@@ -429,7 +369,7 @@ public class ProcessNodeService {
      *
      * @param processNode 流程节点
      */
-    private void processNodeRole(ProcessNode processNode) {
+    private void processNodeRole(ProcessNode processNode, ProcessNodeWrapper wrapper) {
         Properties props = processNode.getProps();
         List<UserInfo> assignedUser;
         List<Long> roleIds = props.getRoleList().stream().map(RoleInfo::getRoleId).collect(Collectors.toList());
@@ -437,6 +377,25 @@ public class ProcessNodeService {
         assignedUser = searchUserListByRoleIds(roleIds);
         props.setAssignedUser(assignedUser);
         props.setAssignedType(AssigneeTypeEnums.ASSIGN_USER);
-        setResult(processNode);
+        setResult(processNode, wrapper);
+    }
+
+
+    private static class ProcessNodeWrapper {
+
+        public ProcessNodeWrapper(Map<String, List<UserInfo>> userOperationInfoMap, JSONObject optionalUser, User user, Boolean isStart) {
+            this.userOperationInfoMap = userOperationInfoMap;
+            this.optionalUser = optionalUser;
+            this.user = user;
+            this.isStart = isStart;
+        }
+
+        //操作历史缓存
+        private final Map<String, List<UserInfo>> userOperationInfoMap;
+        //自选用户信息
+        private final JSONObject optionalUser;
+        private final List<ProcessNode> result = new ArrayList<>();
+        private final User user;
+        private final Boolean isStart;
     }
 }
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessService.java b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/ProcessService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessTaskService.java b/workflow/src/main/java/cn/fateverse/workflow/service/ProcessTaskService.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/ProcessTaskService.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/ProcessTaskService.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessDefinitionServiceImpl.java b/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessDefinitionServiceImpl.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessDefinitionServiceImpl.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessDefinitionServiceImpl.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessFileServiceImpl.java b/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessFileServiceImpl.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessFileServiceImpl.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessFileServiceImpl.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessInstanceServiceImpl.java b/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessInstanceServiceImpl.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessInstanceServiceImpl.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessInstanceServiceImpl.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessListenerServiceImpl.java b/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessListenerServiceImpl.java
similarity index 100%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessListenerServiceImpl.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessListenerServiceImpl.java
diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java b/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java
similarity index 99%
rename from visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java
rename to workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java
index 098a8f1..fc7a6e0 100644
--- a/visual/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java
+++ b/workflow/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java
@@ -39,7 +39,6 @@ import org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl;
 import org.flowable.engine.runtime.ActivityInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
diff --git a/visual/workflow/src/main/java/liquibase/database/core/DmDatabase.java b/workflow/src/main/java/liquibase/database/core/DmDatabase.java
similarity index 100%
rename from visual/workflow/src/main/java/liquibase/database/core/DmDatabase.java
rename to workflow/src/main/java/liquibase/database/core/DmDatabase.java
diff --git a/visual/workflow/src/main/java/liquibase/datatype/core/BooleanType.java b/workflow/src/main/java/liquibase/datatype/core/BooleanType.java
similarity index 100%
rename from visual/workflow/src/main/java/liquibase/datatype/core/BooleanType.java
rename to workflow/src/main/java/liquibase/datatype/core/BooleanType.java
diff --git a/visual/workflow/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java b/workflow/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
similarity index 100%
rename from visual/workflow/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
rename to workflow/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java
diff --git a/visual/workflow/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java b/workflow/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java
similarity index 100%
rename from visual/workflow/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java
rename to workflow/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java
diff --git a/visual/workflow/src/main/resources/META-INF/service/liquibase.database.Database b/workflow/src/main/resources/META-INF/service/liquibase.database.Database
similarity index 100%
rename from visual/workflow/src/main/resources/META-INF/service/liquibase.database.Database
rename to workflow/src/main/resources/META-INF/service/liquibase.database.Database
diff --git a/visual/workflow/src/main/resources/bootstrap-pro.yml b/workflow/src/main/resources/bootstrap-pro.yml
similarity index 100%
rename from visual/workflow/src/main/resources/bootstrap-pro.yml
rename to workflow/src/main/resources/bootstrap-pro.yml
diff --git a/visual/workflow/src/main/resources/bootstrap.yml b/workflow/src/main/resources/bootstrap.yml
similarity index 97%
rename from visual/workflow/src/main/resources/bootstrap.yml
rename to workflow/src/main/resources/bootstrap.yml
index d5f36d1..ba8411e 100644
--- a/visual/workflow/src/main/resources/bootstrap.yml
+++ b/workflow/src/main/resources/bootstrap.yml
@@ -52,7 +52,7 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-    serialization: fastjson2
+#    serialization: fastjson2
   registry:
     address: nacos://${spring.cloud.nacos.discovery.server-addr}
     username: ${spring.cloud.nacos.discovery.username}
diff --git a/visual/workflow/src/main/resources/mapper/FormItemDataMapper.xml b/workflow/src/main/resources/mapper/FormItemDataMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/FormItemDataMapper.xml
rename to workflow/src/main/resources/mapper/FormItemDataMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/FormPermMapper.xml b/workflow/src/main/resources/mapper/FormPermMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/FormPermMapper.xml
rename to workflow/src/main/resources/mapper/FormPermMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/HisFlowableActinstMapper.xml b/workflow/src/main/resources/mapper/HisFlowableActinstMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/HisFlowableActinstMapper.xml
rename to workflow/src/main/resources/mapper/HisFlowableActinstMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/HistoricalOperationMapper.xml b/workflow/src/main/resources/mapper/HistoricalOperationMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/HistoricalOperationMapper.xml
rename to workflow/src/main/resources/mapper/HistoricalOperationMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/ProcessBusinessMapper.xml b/workflow/src/main/resources/mapper/ProcessBusinessMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/ProcessBusinessMapper.xml
rename to workflow/src/main/resources/mapper/ProcessBusinessMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/ProcessDataMapper.xml b/workflow/src/main/resources/mapper/ProcessDataMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/ProcessDataMapper.xml
rename to workflow/src/main/resources/mapper/ProcessDataMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/ProcessFileMapper.xml b/workflow/src/main/resources/mapper/ProcessFileMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/ProcessFileMapper.xml
rename to workflow/src/main/resources/mapper/ProcessFileMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/ProcessListenerMapper.xml b/workflow/src/main/resources/mapper/ProcessListenerMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/ProcessListenerMapper.xml
rename to workflow/src/main/resources/mapper/ProcessListenerMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/ProcessMapper.xml b/workflow/src/main/resources/mapper/ProcessMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/ProcessMapper.xml
rename to workflow/src/main/resources/mapper/ProcessMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/RunFlowableActinstMapper.xml b/workflow/src/main/resources/mapper/RunFlowableActinstMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/RunFlowableActinstMapper.xml
rename to workflow/src/main/resources/mapper/RunFlowableActinstMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/TaskRuntimeMapper.xml b/workflow/src/main/resources/mapper/TaskRuntimeMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/TaskRuntimeMapper.xml
rename to workflow/src/main/resources/mapper/TaskRuntimeMapper.xml
diff --git a/visual/workflow/src/main/resources/mapper/UserInstanceMapper.xml b/workflow/src/main/resources/mapper/UserInstanceMapper.xml
similarity index 100%
rename from visual/workflow/src/main/resources/mapper/UserInstanceMapper.xml
rename to workflow/src/main/resources/mapper/UserInstanceMapper.xml
diff --git a/visual/workflow/src/main/resources/org/flowable/dmn/db/liquibase/custom-flowable-dmn-db-changelog.xml b/workflow/src/main/resources/org/flowable/dmn/db/liquibase/custom-flowable-dmn-db-changelog.xml
similarity index 100%
rename from visual/workflow/src/main/resources/org/flowable/dmn/db/liquibase/custom-flowable-dmn-db-changelog.xml
rename to workflow/src/main/resources/org/flowable/dmn/db/liquibase/custom-flowable-dmn-db-changelog.xml
diff --git a/visual/workflow/src/main/resources/security-cloud-workflow.sql b/workflow/src/main/resources/security-cloud-workflow.sql
similarity index 100%
rename from visual/workflow/src/main/resources/security-cloud-workflow.sql
rename to workflow/src/main/resources/security-cloud-workflow.sql