From 492f01a0418da5b247dfd23cb48357b2fbfb6ef4 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Mon, 25 Mar 2024 19:51:01 +0800 Subject: [PATCH 01/12] =?UTF-8?q?build=20:=20=E5=BC=80=E6=94=BE=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9F=A5=E8=AF=A2=E5=92=8C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +++++++++ .../cn/fateverse/notice/handler/ChannelHandlerPool.java | 1 + visual/pom.xml | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 872deba..446a9c8 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,15 @@ ## 快速开始 +### 相关地址 +- 演示地址: + 1. vue版本 [http://vue.fateverse.cn/](http://vue.fateverse.cn/) +- 项目地址: + - 前端gitee地址: [https://gitee.com/fateverse/fateverse-vue](https://gitee.com/fateverse/fateverse-vue) + - 后端gitee地址: [https://gitee.com/fateverse/fateverse](https://gitee.com/fateverse/fateverse) + - 前端github地址: [https://github.com/fateverse/fateverse-vue](https://github.com/fateverse/fateverse-vue) + - 后端github地址: [https://github.com/fateverse/fateverse](https://github.com/fateverse/fateverse) + ### 核心依赖 | 依赖 | 版本 | diff --git a/notice/notice-biz/src/main/java/cn/fateverse/notice/handler/ChannelHandlerPool.java b/notice/notice-biz/src/main/java/cn/fateverse/notice/handler/ChannelHandlerPool.java index 8cb2fae..87449e9 100644 --- a/notice/notice-biz/src/main/java/cn/fateverse/notice/handler/ChannelHandlerPool.java +++ b/notice/notice-biz/src/main/java/cn/fateverse/notice/handler/ChannelHandlerPool.java @@ -14,6 +14,7 @@ import io.netty.util.AttributeKey; import io.netty.util.concurrent.GlobalEventExecutor; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; diff --git a/visual/pom.xml b/visual/pom.xml index c573828..9d93f8a 100644 --- a/visual/pom.xml +++ b/visual/pom.xml @@ -17,8 +17,8 @@ - - + custom-query + code-gen workflow From a910a70c853a50a563dfccd5e3db4530be69662d Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Mon, 25 Mar 2024 20:02:47 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat=20:=20=E5=B0=86=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E7=AE=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/admin-api/pom.xml | 5 -- .../controller/MapperSwitchController.java | 2 +- .../admin/entity}/dto/MappingSwitchDto.java | 2 +- .../admin/service/MappingSwitchService.java | 2 +- .../impl/MappingSwitchServiceImpl.java | 6 +-- .../fateverse/auth/config/CaptchaConfig.java | 2 +- sql/log.sql | 51 +++++++------------ 7 files changed, 23 insertions(+), 47 deletions(-) rename admin/{admin-api/src/main/java/cn/fateverse/admin => admin-biz/src/main/java/cn/fateverse/admin/entity}/dto/MappingSwitchDto.java (95%) diff --git a/admin/admin-api/pom.xml b/admin/admin-api/pom.xml index b2f0df0..99fdf4a 100644 --- a/admin/admin-api/pom.xml +++ b/admin/admin-api/pom.xml @@ -25,10 +25,5 @@ common-swagger true - - cn.fateverse - common-decrypt - - \ No newline at end of file diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java index 3b348f3..15630a1 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MapperSwitchController.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.controller; -import cn.fateverse.admin.dto.MappingSwitchDto; +import cn.fateverse.admin.entity.dto.MappingSwitchDto; import cn.fateverse.admin.entity.vo.MappingSwitchVo; import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.admin.service.MappingSwitchService; diff --git a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MappingSwitchDto.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/dto/MappingSwitchDto.java similarity index 95% rename from admin/admin-api/src/main/java/cn/fateverse/admin/dto/MappingSwitchDto.java rename to admin/admin-biz/src/main/java/cn/fateverse/admin/entity/dto/MappingSwitchDto.java index 475fd56..5f9005e 100644 --- a/admin/admin-api/src/main/java/cn/fateverse/admin/dto/MappingSwitchDto.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/dto/MappingSwitchDto.java @@ -1,4 +1,4 @@ -package cn.fateverse.admin.dto; +package cn.fateverse.admin.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java index 8941c93..bc549d9 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/MappingSwitchService.java @@ -1,6 +1,6 @@ package cn.fateverse.admin.service; -import cn.fateverse.admin.dto.MappingSwitchDto; +import cn.fateverse.admin.entity.dto.MappingSwitchDto; import cn.fateverse.admin.entity.vo.MappingSwitchVo; import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.common.core.result.page.TableDataInfo; diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java index e144027..38c83fc 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MappingSwitchServiceImpl.java @@ -1,16 +1,13 @@ package cn.fateverse.admin.service.impl; -import cn.fateverse.admin.dto.MappingSwitchDto; +import cn.fateverse.admin.entity.dto.MappingSwitchDto; import cn.fateverse.admin.entity.vo.MappingSwitchVo; import cn.fateverse.admin.query.MappingSwitchQuery; import cn.fateverse.admin.service.MappingSwitchService; -import cn.fateverse.common.core.constant.UserConstants; import cn.fateverse.common.core.entity.PageInfo; import cn.fateverse.common.core.exception.CustomException; import cn.fateverse.common.core.result.page.TableDataInfo; -import cn.fateverse.common.core.utils.ReflectUserUtils; import cn.fateverse.common.core.utils.TableSupport; -import cn.fateverse.common.log.enums.OperateType; import cn.fateverse.common.mybatis.utils.PageUtils; import cn.fateverse.common.security.entity.MappingSwitchInfo; import cn.fateverse.common.security.utils.SecurityUtils; @@ -19,7 +16,6 @@ import org.jetbrains.annotations.NotNull; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ScanOptions; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; 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 be546d2..fd78645 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,"123456789#$@&%"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_STRING,"1234567890"); properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); Config config = new Config(properties); diff --git a/sql/log.sql b/sql/log.sql index 5f3110b..c6c1f37 100644 --- a/sql/log.sql +++ b/sql/log.sql @@ -1,39 +1,22 @@ /* Navicat Premium Data Transfer - Source Server : fateverse-demo + Source Server : fateverse Source Server Type : MySQL Source Server Version : 80036 - Source Host : 10.7.127.184:3307 - Source Schema : fateverse_demo_log + Source Host : 10.7.127.184:3306 + Source Schema : fateverse_log Target Server Type : MySQL Target Server Version : 80036 File Encoding : 65001 - Date: 01/02/2024 11:33:29 + Date: 25/03/2024 14:34:46 */ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; --- ---------------------------- --- Table structure for sys_login_infor --- ---------------------------- -DROP TABLE IF EXISTS `sys_login_infor`; -CREATE TABLE `sys_login_infor` ( - `info_id` bigint NOT NULL COMMENT '访问ID', - `user_name` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '用户账号', - `ipaddr` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '登录IP地址', - `login_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '登录地点', - `browser` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '浏览器类型', - `os` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作系统', - `state` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '0' COMMENT '登录状态（0成功 1失败）', - `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息', - `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', - PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; - -- ---------------------------- -- Table structure for sys_login_infor_1 -- ---------------------------- @@ -49,7 +32,7 @@ CREATE TABLE `sys_login_infor_1` ( `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息', `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for sys_login_infor_2 @@ -66,7 +49,7 @@ CREATE TABLE `sys_login_infor_2` ( `msg` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '提示消息', `login_time` datetime NULL DEFAULT NULL COMMENT '访问时间', PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for sys_operation_log_1 @@ -75,6 +58,7 @@ DROP TABLE IF EXISTS `sys_operation_log_1`; CREATE TABLE `sys_operation_log_1` ( `oper_id` bigint NOT NULL COMMENT '日志主键', `title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '模块标题', + `application_name` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '应用名称', `business_type` int NULL DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）', `method` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '方法名称', `request_method` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求方式', @@ -84,15 +68,15 @@ CREATE TABLE `sys_operation_log_1` ( `oper_url` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求URL', `oper_ip` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '主机地址', `oper_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作地点', - `oper_param` longblob NULL COMMENT '请求参数', - `json_result` longblob NULL COMMENT '返回参数', + `oper_param` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '请求参数', + `json_result` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '返回参数', `state` int NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）', - `error_msg` longblob NULL COMMENT '错误消息', - `error_stack_trace` longblob NULL COMMENT '错误异常栈', + `error_msg` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误消息', + `error_stack_trace` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误异常栈', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间', `consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间', PRIMARY KEY (`oper_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for sys_operation_log_2 @@ -101,6 +85,7 @@ DROP TABLE IF EXISTS `sys_operation_log_2`; CREATE TABLE `sys_operation_log_2` ( `oper_id` bigint NOT NULL COMMENT '日志主键', `title` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '模块标题', + `application_name` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '应用名称', `business_type` int NULL DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）', `method` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '方法名称', `request_method` varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求方式', @@ -110,14 +95,14 @@ CREATE TABLE `sys_operation_log_2` ( `oper_url` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '请求URL', `oper_ip` varchar(50) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '主机地址', `oper_location` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '操作地点', - `oper_param` longblob NULL COMMENT '请求参数', - `json_result` longblob NULL COMMENT '返回参数', + `oper_param` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '请求参数', + `json_result` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '返回参数', `state` int NULL DEFAULT 0 COMMENT '操作状态（0正常 1异常）', - `error_msg` longblob NULL COMMENT '错误消息', + `error_msg` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误消息', + `error_stack_trace` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '错误异常栈', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间', `consume_time` bigint NULL DEFAULT NULL COMMENT '消耗时间', - `error_stack_trace` longblob NULL COMMENT '错误异常栈', PRIMARY KEY (`oper_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC; SET FOREIGN_KEY_CHECKS = 1; From cde8e3a928d7b23c6269b8a9b58b38a1da3e8bcd Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Wed, 10 Apr 2024 14:31:08 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat=20:=20=E6=A8=A1=E5=9D=97=E6=8A=BD?= =?UTF-8?q?=E7=A6=BB=20+=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9F=A5=E5=88=86?= =?UTF-8?q?=E8=A1=A8=E6=A8=A1=E5=9D=97=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 2 +- .../fateverse/auth/config/CaptchaConfig.java | 2 +- auth/src/main/resources/bootstrap.yml | 2 +- {visual/code-gen => code-gen}/pom.xml | 0 .../cn/fateverse/code/CodeGenApplication.java | 0 .../code/aspect/DynamicTableAspect.java | 0 .../fateverse/code/config/CodeGenConfig.java | 0 .../code/controller/DataSourceController.java | 0 .../controller/DynamicTableController.java | 0 .../code/controller/RegularController.java | 0 .../code/controller/TableController.java | 0 .../cn/fateverse/code/entity/ApiClass.java | 0 .../fateverse/code/entity/CodeDataSource.java | 0 .../cn/fateverse/code/entity/DynamicPage.java | 0 .../cn/fateverse/code/entity/InterTable.java | 0 .../java/cn/fateverse/code/entity/Module.java | 0 .../cn/fateverse/code/entity/OptionInfo.java | 0 .../cn/fateverse/code/entity/Regular.java | 0 .../cn/fateverse/code/entity/RelTable.java | 0 .../fateverse/code/entity/RelTableColumn.java | 0 .../java/cn/fateverse/code/entity/Table.java | 0 .../cn/fateverse/code/entity/TableColumn.java | 1 - .../fateverse/code/entity/bo/TableGenBo.java | 0 .../code/entity/dto/DataSourceDto.java | 0 .../fateverse/code/entity/dto/ImportDto.java | 0 .../fateverse/code/entity/dto/RegularDto.java | 0 .../fateverse/code/entity/dto/TableDto.java | 0 .../code/entity/query/DataSourceQuery.java | 0 .../code/entity/query/DynamicTable.java | 0 .../code/entity/query/RegularQuery.java | 0 .../code/entity/query/TableQuery.java | 0 .../code/entity/vo/DataSourceVo.java | 0 .../fateverse/code/entity/vo/RegularVo.java | 0 .../fateverse/code/entity/vo/TableInfoVo.java | 0 .../cn/fateverse/code/entity/vo/TableVo.java | 0 .../code/enums/BackTemplateEnum.java | 0 .../code/enums/DynamicSourceEnum.java | 0 .../code/enums/FrontTemplateEnum.java | 0 .../factory/DynamicDataSourceService.java | 0 .../code/factory/DynamicTableService.java | 0 .../impl/AbstractDynamicTableService.java | 0 .../impl/MySQLDynamicTableService.java | 0 .../impl/OracleDynamicTableService.java | 0 .../code/mapper/DataSourceMapper.java | 0 .../fateverse/code/mapper/RegularMapper.java | 0 .../code/mapper/TableColumnMapper.java | 0 .../cn/fateverse/code/mapper/TableMapper.java | 0 .../mapper/dynamic/DynamicTableMapper.java | 0 .../dynamic/MySqlDynamicTableMapper.java | 0 .../dynamic/OracleDynamicTableMapper.java | 0 .../code/service/DataSourceService.java | 0 .../service/DynamicTableMetadataService.java | 0 .../code/service/RegularService.java | 0 .../fateverse/code/service/TableService.java | 0 .../service/impl/DataSourceServiceImpl.java | 0 .../impl/DynamicTableMetadataServiceImpl.java | 0 .../code/service/impl/RegularServiceImpl.java | 0 .../code/service/impl/TableServiceImpl.java | 0 .../code/util/constant/CodeGenConstants.java | 0 .../util/velocity/VelocityInitializer.java | 0 .../code/util/velocity/VelocityUtils.java | 0 .../src/main/resources/bootstrap-pro.yml | 0 .../src/main/resources/bootstrap.yml | 2 +- .../resources/mapper/DataSourceMapper.xml | 0 .../main/resources/mapper/RegularMapper.xml | 0 .../resources/mapper/TableColumnMapper.xml | 0 .../src/main/resources/mapper/TableMapper.xml | 0 .../mapper/dynamic/DynamicTableMapper.xml | 0 .../dynamic/MySqlDynamicTableMapper.xml | 0 .../dynamic/OracleDynamicTableMapper.xml | 0 .../main/resources/vm/java/controller.java.vm | 0 .../src/main/resources/vm/java/entity.java.vm | 0 .../main/resources/vm/java/entityDto.java.vm | 0 .../resources/vm/java/entityQuery.java.vm | 0 .../main/resources/vm/java/entityVo.java.vm | 0 .../resources/vm/java/mybatis/mapper.java.vm | 0 .../vm/java/mybatis/serviceImpl.java.vm | 0 .../vm/java/mybatisplus/mapper.java.vm | 0 .../vm/java/mybatisplus/serviceImpl.java.vm | 0 .../main/resources/vm/java/service.java.vm | 0 .../src/main/resources/vm/react/api.ts.vm | 0 .../src/main/resources/vm/react/type.ts.vm | 0 .../src/main/resources/vm/react/view.tsx.vm | 4 +- .../src/main/resources/vm/vue/api.js.vm | 0 .../src/main/resources/vm/vue/index.vue.vm | 0 .../main/resources/vm/xml/mapperMySql.xml.vm | 0 .../main/resources/vm/xml/mapperOracle.xml.vm | 0 .../custom-query-biz}/pom.xml | 16 +- .../query/CustomQueryApplication.java | 0 .../query/aspect/DynamicDataSourceAspect.java | 0 .../query/constant/QueryConstant.java | 0 .../controller/DataAdapterController.java | 0 .../DataSourceManageController.java | 0 .../DynamicDataSourceTableController.java | 0 .../controller/DynamicEchartsController.java | 0 .../query/controller/PageController.java | 0 .../query/controller/SqlSearchController.java | 0 .../controller/SqlUniQueryController.java | 0 .../query/controller/TableController.java | 0 .../controller/TopoUniQueryController.java | 0 .../controller/TopologySearchController.java | 0 .../fateverse/query/entity/DataAdapter.java | 0 .../query/entity/DataSourceManage.java | 0 .../query/entity/DataSourceManageCount.java | 0 .../query/entity/DynamicEcharts.java | 0 .../fateverse/query/entity/DynamicPage.java | 0 .../fateverse/query/entity/DynamicTable.java | 0 .../java/cn/fateverse/query/entity/Table.java | 0 .../fateverse/query/entity/TableColumn.java | 0 .../cn/fateverse/query/entity/TableInfo.java | 0 .../query/entity/TableRelationalMapping.java | 0 .../cn/fateverse/query/entity/TableRole.java | 0 .../cn/fateverse/query/entity/UniColumn.java | 0 .../cn/fateverse/query/entity/UniCon.java | 0 .../cn/fateverse/query/entity/UniQuery.java | 0 .../fateverse/query/entity/bo/SqlSelect.java | 0 .../cn/fateverse/query/entity/bo/TableBo.java | 0 .../query/entity/bo/TopologySelect.java | 0 .../query/entity/dto/DataAdapterDto.java | 0 .../query/entity/dto/DataSourceManageDto.java | 0 .../query/entity/dto/DynamicEchartsDto.java | 0 .../fateverse/query/entity/dto/ImportDto.java | 0 .../query/entity/dto/SearchInfo.java | 0 .../cn/fateverse/query/entity/dto/SqlDto.java | 0 .../query/entity/dto/TableColumnDto.java | 0 .../fateverse/query/entity/dto/TableDto.java | 0 .../entity/dto/TableRelationalMappingDto.java | 0 .../fateverse/query/entity/dto/TopoDto.java | 0 .../fateverse/query/entity/dto/UniConDto.java | 0 .../query/entity/dto/UniQueryDto.java | 0 .../query/entity/query/DataAdapterQuery.java | 0 .../entity/query/DataSourceManageQuery.java | 0 .../entity/query/DynamicEchartsQuery.java | 0 .../query/entity/query/DynamicTableQuery.java | 0 .../query/entity/query/TableQuery.java | 0 .../query/entity/query/UniQueryQuery.java | 0 .../fateverse/query/entity/topology/Edge.java | 0 .../query/entity/topology/EdgeConfig.java | 0 .../fateverse/query/entity/topology/Node.java | 0 .../query/entity/topology/NodeColumn.java | 0 .../query/entity/topology/TopologyBo.java | 0 .../query/entity/vo/CustomQueryResult.java | 0 .../query/entity/vo/DataAdapterVo.java | 0 .../query/entity/vo/DataSourceManageVo.java | 0 .../query/entity/vo/DynamicEchartsVo.java | 0 .../fateverse/query/entity/vo/SqlInfoVo.java | 0 .../query/entity/vo/TableColumnVo.java | 0 .../query/entity/vo/TableTopoVo.java | 0 .../cn/fateverse/query/entity/vo/TableVo.java | 0 .../cn/fateverse/query/entity/vo/TopoVo.java | 0 .../fateverse/query/entity/vo/UniConVo.java | 0 .../fateverse/query/entity/vo/UniQueryVo.java | 0 .../query/enums/DataAdapterSource.java | 0 .../query/enums/DataAdapterType.java | 0 .../query/enums/DynamicSourceEnum.java | 0 .../factory/DynamicDataSourceFactory.java | 0 .../factory/DynamicDataSourceService.java | 1 - .../AbstractDynamicDataSourceFactory.java | 3 + .../impl/MariaDynamicDataSourceFactory.java | 0 .../impl/MySqlDynamicDataSourceFactory.java | 0 .../impl/OracleDynamicDataSourceFactory.java | 0 .../PostgresDynamicDataSourceFactory.java | 0 .../handler/adapter/DataAdapterHandler.java | 0 .../impl/CustomQueryDataAdapterHandler.java | 0 .../handler/engine/EngineExecuteHandler.java | 0 .../engine/impl/JavaEngineExecuteHandler.java | 0 .../impl/JavaScriptEngineExecuteHandler.java | 0 .../reader/DataAdapterHandlerReader.java | 0 .../reader/EngineExecuteHandlerReader.java | 2 - .../query/mapper/DataAdapterMapper.java | 0 .../query/mapper/DataSourceManageMapper.java | 0 .../query/mapper/DynamicDataSourceMapper.java | 0 .../query/mapper/DynamicEchartsMapper.java | 0 .../query/mapper/TableColumnMapper.java | 0 .../fateverse/query/mapper/TableMapper.java | 0 .../mapper/TableRelationalMappingMapper.java | 0 .../query/mapper/TableRoleMapper.java | 0 .../query/mapper/UniColumnMapper.java | 0 .../fateverse/query/mapper/UniConMapper.java | 0 .../query/mapper/UniQueryMapper.java | 0 .../dynamic/MariaDynamicDataSourceMapper.java | 0 .../dynamic/MySqlDynamicDataSourceMapper.java | 0 .../OracleDynamicDataSourceMapper.java | 0 .../PostgresDynamicDataSourceMapper.java | 0 .../query/service/DataAdapterService.java | 0 .../service/DataSourceManageService.java | 0 .../service/DynamicDataSearchService.java | 0 .../DynamicDataSourceTableService.java | 1 - .../query/service/DynamicEchartsService.java | 0 .../fateverse/query/service/PageService.java | 0 .../query/service/SearchService.java | 0 .../query/service/SqlSearchService.java | 0 .../fateverse/query/service/TableService.java | 0 .../query/service/TopologyAnalyzeService.java | 0 .../query/service/TopologySearchService.java | 0 .../query/service/UniQueryService.java | 0 .../service/impl/AbstractUniQueryService.java | 0 .../service/impl/DataAdapterServiceImpl.java | 1 - .../impl/DataSourceManageServiceImpl.java | 0 .../impl/DynamicEchartsServiceImpl.java | 2 - .../query/service/impl/PageServiceImpl.java | 0 .../service/impl/SqlSearchServiceImpl.java | 0 .../service/impl/SqlUniQueryServiceImpl.java | 0 .../query/service/impl/TableServiceImpl.java | 1 - .../service/impl/TopoUniQueryServiceImpl.java | 0 .../impl/TopologySearchServiceImpl.java | 0 .../query/utils/MyBatisResourceUtils.java | 0 .../src/main/resources/bootstrap-pro.yml | 0 .../src/main/resources/bootstrap.yml | 2 +- .../resources/mapper/DataAdapterMapper.xml | 0 .../mapper/DataSourceManageMapper.xml | 0 .../resources/mapper/DynamicEchartsMapper.xml | 0 .../resources/mapper/TableColumnMapper.xml | 0 .../src/main/resources/mapper/TableMapper.xml | 0 .../mapper/TableRelationalMappingMapper.xml | 0 .../main/resources/mapper/TableRoleMapper.xml | 0 .../main/resources/mapper/UniColumnMapper.xml | 0 .../main/resources/mapper/UniConMapper.xml | 0 .../main/resources/mapper/UniQueryMapper.xml | 0 .../dynamic/DynamicDataSourceMapper.xml | 0 .../dynamic/MariaDynamicDataSourceMapper.xml | 0 .../dynamic/MySqlDynamicDataSourceMapper.xml | 4 +- .../dynamic/OracleDynamicDataSourceMapper.xml | 0 .../PostgresDynamicDataSourceMapper.xml | 0 custom-query/custom-query-submter/pom.xml | 66 +++ .../submeter/adapter/WrapperAdapter.java | 43 ++ .../connection/AbstractConnectionAdapter.java | 161 +++++++ ...bstractUnsupportedOperationConnection.java | 151 +++++++ .../connection/SubmeterConnection.java | 85 ++++ .../datasource/AbstractDataSourceAdapter.java | 51 +++ ...bstractUnsupportedOperationDataSource.java | 21 + .../datasource/SubmeterDataSource.java | 25 ++ .../datasource/SubmeterDataSourceFactory.java | 4 + .../executor/ForceExecuteCallback.java | 14 + .../executor/ForceExecuteTemplate.java | 38 ++ .../invocation/JdbcMethodInvocation.java | 27 ++ .../SetParameterMethodInvocation.java | 29 ++ .../AbstractStatementAdapter.java | 233 ++++++++++ ...tractSubmeterPreparedStatementAdapter.java | 256 +++++++++++ ...UnsupportedOperationPreparedStatement.java | 112 +++++ ...AbstractUnsupportedOperationStatement.java | 51 +++ .../SubmeterPreparedStatement.java | 244 ++++++++++ .../result/AbstractResultSetAdapter.java | 98 ++++ .../query/submeter/result/SubmeterResult.java | 350 +++++++++++++++ .../result/SubmeterResultSetMetaData.java | 146 ++++++ ...AbstractUnsupportedOperationResultSet.java | 213 +++++++++ ...ctUnsupportedUpdateOperationResultSet.java | 425 ++++++++++++++++++ .../query/submeter/util/DataSourceUtil.java | 67 +++ .../query/submeter/util/PropertyUtil.java | 83 ++++ .../query/submeter/util/ResultSetUtil.java | 130 ++++++ custom-query/pom.xml | 28 ++ log/log-biz/src/main/resources/bootstrap.yml | 2 +- maven.sh | 6 +- .../src/main/resources/bootstrap.yml | 2 +- pom.xml | 3 + visual/pom.xml | 3 - {visual/workflow => workflow}/pom.xml | 0 .../workflow/WorkFlowApplication.java | 0 .../workflow/constant/ProcessConstant.java | 0 .../ProcessDefinitionController.java | 0 .../controller/ProcessFileController.java | 0 .../controller/ProcessInstanceController.java | 0 .../controller/ProcessListenerController.java | 0 .../controller/ProcessTaskController.java | 0 .../fateverse/workflow/entity/FormPerm.java | 0 .../workflow/entity/HistoricalOperation.java | 0 .../workflow/entity/ProcessBusiness.java | 0 .../workflow/entity/ProcessData.java | 0 .../workflow/entity/ProcessFile.java | 0 .../workflow/entity/ProcessListener.java | 0 .../workflow/entity/UserInstance.java | 0 .../workflow/entity/bo/AnalysisProcessBo.java | 0 .../workflow/entity/bo/VariablesBo.java | 0 .../workflow/entity/bpmn/Attachment.java | 0 .../workflow/entity/bpmn/CommentInfo.java | 0 .../workflow/entity/bpmn/ConditionInfo.java | 0 .../workflow/entity/bpmn/EmailInfo.java | 0 .../workflow/entity/bpmn/FormItem.java | 0 .../workflow/entity/bpmn/FormItemProps.java | 0 .../workflow/entity/bpmn/FormOperates.java | 0 .../workflow/entity/bpmn/GroupsInfo.java | 0 .../workflow/entity/bpmn/HttpInfo.java | 0 .../workflow/entity/bpmn/HttpParam.java | 0 .../workflow/entity/bpmn/ListenerInfo.java | 0 .../workflow/entity/bpmn/ListenerItem.java | 0 .../workflow/entity/bpmn/LogoInfo.java | 0 .../workflow/entity/bpmn/NotifyType.java | 0 .../workflow/entity/bpmn/NotifyTypeInfo.java | 0 .../workflow/entity/bpmn/ProcessNode.java | 0 .../workflow/entity/bpmn/Properties.java | 0 .../workflow/entity/bpmn/RoleInfo.java | 0 .../workflow/entity/bpmn/SettingsInfo.java | 0 .../workflow/entity/bpmn/UserInfo.java | 0 .../workflow/entity/dto/FormItemDto.java | 0 .../workflow/entity/dto/ProcessDto.java | 0 .../entity/dto/ProcessInstanceDto.java | 0 .../entity/dto/ProcessListenerDto.java | 0 .../workflow/entity/dto/TaskDto.java | 0 .../entity/query/ProcessListenerQuery.java | 0 .../workflow/entity/query/ProcessQuery.java | 0 .../workflow/entity/vo/FormItemData.java | 0 .../entity/vo/HistoricalOperationVo.java | 0 .../entity/vo/ProcessDefinitionHistoryVo.java | 0 .../entity/vo/ProcessDefinitionInfoVo.java | 0 .../entity/vo/ProcessDefinitionVo.java | 0 .../entity/vo/ProcessInstanceDetailVo.java | 0 .../workflow/entity/vo/ProcessInstanceVo.java | 0 .../workflow/entity/vo/ProcessListenerVo.java | 0 .../workflow/entity/vo/task/TaskDetailVo.java | 0 .../workflow/entity/vo/task/TaskResultVo.java | 0 .../workflow/entity/vo/task/TaskVo.java | 0 .../workflow/enums/AssigneeTypeEnums.java | 0 .../workflow/enums/FormItemEnum.java | 0 .../workflow/enums/FormPermEnum.java | 0 .../fateverse/workflow/enums/ModeEnums.java | 0 .../workflow/enums/OperationEnums.java | 0 .../workflow/enums/OperationStateEnums.java | 0 .../workflow/enums/ProcessNodeEnum.java | 0 .../workflow/mapper/FormItemDataMapper.java | 0 .../workflow/mapper/FormPermMapper.java | 0 .../mapper/HisFlowableActinstMapper.java | 0 .../mapper/HistoricalOperationMapper.java | 0 .../mapper/ProcessBusinessMapper.java | 0 .../workflow/mapper/ProcessDataMapper.java | 0 .../workflow/mapper/ProcessFileMapper.java | 0 .../mapper/ProcessListenerMapper.java | 0 .../workflow/mapper/ProcessMapper.java | 0 .../mapper/RunFlowableActinstMapper.java | 0 .../workflow/mapper/TaskRuntimeMapper.java | 0 .../workflow/mapper/UserInstanceMapper.java | 0 .../workflow/process/BpmnParseUtil.java | 0 .../workflow/process/FormItemParseUtil.java | 0 .../workflow/process/ProcessServiceUtils.java | 0 .../workflow/process/ProcessUtil.java | 0 .../workflow/process/TriggerService.java | 0 .../process/cmd/RollbackUserTaskCmd.java | 0 .../listener/BoundaryEvenListener.java | 0 .../process/listener/CounterSignListener.java | 0 .../listener/CreateStartEventListener.java | 0 .../IntermediateCatchEventListener.java | 0 .../process/listener/ProcessListener.java | 0 .../process/listener/ServiceListener.java | 0 .../process/listener/TaskCreatedListener.java | 0 .../workflow/service/NotifyService.java | 0 .../service/ProcessDefinitionService.java | 0 .../workflow/service/ProcessFileService.java | 0 .../service/ProcessInstanceService.java | 0 .../service/ProcessListenerService.java | 0 .../workflow/service/ProcessNodeService.java | 169 +++---- .../workflow/service/ProcessService.java | 0 .../workflow/service/ProcessTaskService.java | 0 .../impl/ProcessDefinitionServiceImpl.java | 0 .../service/impl/ProcessFileServiceImpl.java | 0 .../impl/ProcessInstanceServiceImpl.java | 0 .../impl/ProcessListenerServiceImpl.java | 0 .../service/impl/ProcessTaskServiceImpl.java | 1 - .../liquibase/database/core/DmDatabase.java | 0 .../liquibase/datatype/core/BooleanType.java | 0 .../impl/AbstractEngineConfiguration.java | 0 .../engine/impl/db/DmnDbSchemaManager.java | 0 .../service/liquibase.database.Database | 0 .../src/main/resources/bootstrap-pro.yml | 0 .../src/main/resources/bootstrap.yml | 2 +- .../resources/mapper/FormItemDataMapper.xml | 0 .../main/resources/mapper/FormPermMapper.xml | 0 .../mapper/HisFlowableActinstMapper.xml | 0 .../mapper/HistoricalOperationMapper.xml | 0 .../mapper/ProcessBusinessMapper.xml | 0 .../resources/mapper/ProcessDataMapper.xml | 0 .../resources/mapper/ProcessFileMapper.xml | 0 .../mapper/ProcessListenerMapper.xml | 0 .../main/resources/mapper/ProcessMapper.xml | 0 .../mapper/RunFlowableActinstMapper.xml | 0 .../resources/mapper/TaskRuntimeMapper.xml | 0 .../resources/mapper/UserInstanceMapper.xml | 0 .../custom-flowable-dmn-db-changelog.xml | 0 .../resources/security-cloud-workflow.sql | 0 377 files changed, 3249 insertions(+), 136 deletions(-) rename {visual/code-gen => code-gen}/pom.xml (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/CodeGenApplication.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/aspect/DynamicTableAspect.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/config/CodeGenConfig.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/controller/DataSourceController.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/controller/DynamicTableController.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/controller/RegularController.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/controller/TableController.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/ApiClass.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/CodeDataSource.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/DynamicPage.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/InterTable.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/Module.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/OptionInfo.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/Regular.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/RelTable.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/RelTableColumn.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/Table.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/TableColumn.java (99%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/bo/TableGenBo.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/dto/DataSourceDto.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/dto/ImportDto.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/dto/RegularDto.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/dto/TableDto.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/query/DataSourceQuery.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/query/DynamicTable.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/query/RegularQuery.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/query/TableQuery.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/vo/DataSourceVo.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/vo/RegularVo.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/vo/TableInfoVo.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/entity/vo/TableVo.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/enums/BackTemplateEnum.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/enums/DynamicSourceEnum.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/enums/FrontTemplateEnum.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/factory/DynamicDataSourceService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/factory/DynamicTableService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/factory/impl/AbstractDynamicTableService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/factory/impl/MySQLDynamicTableService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/factory/impl/OracleDynamicTableService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/mapper/DataSourceMapper.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/mapper/RegularMapper.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/mapper/TableColumnMapper.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/mapper/TableMapper.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/mapper/dynamic/DynamicTableMapper.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/mapper/dynamic/MySqlDynamicTableMapper.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/mapper/dynamic/OracleDynamicTableMapper.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/DataSourceService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/DynamicTableMetadataService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/RegularService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/TableService.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/impl/DataSourceServiceImpl.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/impl/DynamicTableMetadataServiceImpl.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/impl/RegularServiceImpl.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/service/impl/TableServiceImpl.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/util/constant/CodeGenConstants.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/util/velocity/VelocityInitializer.java (100%) rename {visual/code-gen => code-gen}/src/main/java/cn/fateverse/code/util/velocity/VelocityUtils.java (100%) rename {visual/code-gen => code-gen}/src/main/resources/bootstrap-pro.yml (100%) rename {visual/code-gen => code-gen}/src/main/resources/bootstrap.yml (97%) rename {visual/code-gen => code-gen}/src/main/resources/mapper/DataSourceMapper.xml (100%) rename {visual/code-gen => code-gen}/src/main/resources/mapper/RegularMapper.xml (100%) rename {visual/code-gen => code-gen}/src/main/resources/mapper/TableColumnMapper.xml (100%) rename {visual/code-gen => code-gen}/src/main/resources/mapper/TableMapper.xml (100%) rename {visual/code-gen => code-gen}/src/main/resources/mapper/dynamic/DynamicTableMapper.xml (100%) rename {visual/code-gen => code-gen}/src/main/resources/mapper/dynamic/MySqlDynamicTableMapper.xml (100%) rename {visual/code-gen => code-gen}/src/main/resources/mapper/dynamic/OracleDynamicTableMapper.xml (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/controller.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/entity.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/entityDto.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/entityQuery.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/entityVo.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/mybatis/mapper.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/mybatis/serviceImpl.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/mybatisplus/mapper.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/mybatisplus/serviceImpl.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/java/service.java.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/react/api.ts.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/react/type.ts.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/react/view.tsx.vm (99%) rename {visual/code-gen => code-gen}/src/main/resources/vm/vue/api.js.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/vue/index.vue.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/xml/mapperMySql.xml.vm (100%) rename {visual/code-gen => code-gen}/src/main/resources/vm/xml/mapperOracle.xml.vm (100%) rename {visual/custom-query => custom-query/custom-query-biz}/pom.xml (88%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/CustomQueryApplication.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/aspect/DynamicDataSourceAspect.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/constant/QueryConstant.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/DataAdapterController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/DataSourceManageController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/DynamicDataSourceTableController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/DynamicEchartsController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/PageController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/SqlSearchController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/SqlUniQueryController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/TableController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/TopoUniQueryController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/controller/TopologySearchController.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/DataAdapter.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/DataSourceManage.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/DataSourceManageCount.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/DynamicEcharts.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/DynamicPage.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/DynamicTable.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/Table.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/TableColumn.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/TableInfo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/TableRelationalMapping.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/TableRole.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/UniColumn.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/UniCon.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/UniQuery.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/bo/SqlSelect.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/bo/TableBo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/bo/TopologySelect.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/DataAdapterDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/DataSourceManageDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/DynamicEchartsDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/ImportDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/SearchInfo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/SqlDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/TableColumnDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/TableDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/TableRelationalMappingDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/TopoDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/UniConDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/dto/UniQueryDto.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/query/DataAdapterQuery.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/query/DataSourceManageQuery.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/query/DynamicEchartsQuery.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/query/DynamicTableQuery.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/query/TableQuery.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/query/UniQueryQuery.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/topology/Edge.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/topology/EdgeConfig.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/topology/Node.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/topology/NodeColumn.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/topology/TopologyBo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/CustomQueryResult.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/DataAdapterVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/DataSourceManageVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/DynamicEchartsVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/SqlInfoVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/TableColumnVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/TableTopoVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/TableVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/TopoVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/UniConVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/entity/vo/UniQueryVo.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/enums/DataAdapterSource.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/enums/DataAdapterType.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/enums/DynamicSourceEnum.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/factory/DynamicDataSourceFactory.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/factory/DynamicDataSourceService.java (97%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/factory/impl/AbstractDynamicDataSourceFactory.java (93%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/factory/impl/MariaDynamicDataSourceFactory.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/factory/impl/MySqlDynamicDataSourceFactory.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/factory/impl/OracleDynamicDataSourceFactory.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/factory/impl/PostgresDynamicDataSourceFactory.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/handler/adapter/DataAdapterHandler.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/handler/adapter/impl/CustomQueryDataAdapterHandler.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/handler/engine/EngineExecuteHandler.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/handler/engine/impl/JavaEngineExecuteHandler.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/handler/engine/impl/JavaScriptEngineExecuteHandler.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/handler/reader/DataAdapterHandlerReader.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/handler/reader/EngineExecuteHandlerReader.java (95%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/DataSourceManageMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/DynamicDataSourceMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/DynamicEchartsMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/TableColumnMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/TableMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/TableRelationalMappingMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/TableRoleMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/UniColumnMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/UniConMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/dynamic/MariaDynamicDataSourceMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/dynamic/MySqlDynamicDataSourceMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/dynamic/OracleDynamicDataSourceMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/mapper/dynamic/PostgresDynamicDataSourceMapper.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/DataAdapterService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/DataSourceManageService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/DynamicDataSearchService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/DynamicDataSourceTableService.java (99%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/DynamicEchartsService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/PageService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/SearchService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/SqlSearchService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/TableService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/TopologyAnalyzeService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/TopologySearchService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/UniQueryService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/AbstractUniQueryService.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/DataAdapterServiceImpl.java (98%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/DataSourceManageServiceImpl.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/DynamicEchartsServiceImpl.java (96%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/PageServiceImpl.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/SqlSearchServiceImpl.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/SqlUniQueryServiceImpl.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/TableServiceImpl.java (99%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/TopoUniQueryServiceImpl.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/service/impl/TopologySearchServiceImpl.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/java/cn/fateverse/query/utils/MyBatisResourceUtils.java (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/bootstrap-pro.yml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/bootstrap.yml (98%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/DataAdapterMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/DataSourceManageMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/DynamicEchartsMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/TableColumnMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/TableMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/TableRelationalMappingMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/TableRoleMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/UniColumnMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/UniConMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/UniQueryMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/dynamic/DynamicDataSourceMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/dynamic/MariaDynamicDataSourceMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/dynamic/MySqlDynamicDataSourceMapper.xml (98%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/dynamic/OracleDynamicDataSourceMapper.xml (100%) rename {visual/custom-query => custom-query/custom-query-biz}/src/main/resources/mapper/dynamic/PostgresDynamicDataSourceMapper.xml (100%) create mode 100644 custom-query/custom-query-submter/pom.xml create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/adapter/WrapperAdapter.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractConnectionAdapter.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/AbstractUnsupportedOperationConnection.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/connection/SubmeterConnection.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractDataSourceAdapter.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/AbstractUnsupportedOperationDataSource.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSource.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/datasource/SubmeterDataSourceFactory.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteCallback.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/executor/ForceExecuteTemplate.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/JdbcMethodInvocation.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/invocation/SetParameterMethodInvocation.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractStatementAdapter.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractSubmeterPreparedStatementAdapter.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationPreparedStatement.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/AbstractUnsupportedOperationStatement.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/preparestatement/SubmeterPreparedStatement.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/AbstractResultSetAdapter.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResult.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/result/SubmeterResultSetMetaData.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedOperationResultSet.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/unsupported/AbstractUnsupportedUpdateOperationResultSet.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/DataSourceUtil.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/PropertyUtil.java create mode 100644 custom-query/custom-query-submter/src/main/java/cn/fateverse/query/submeter/util/ResultSetUtil.java create mode 100644 custom-query/pom.xml rename {visual/workflow => workflow}/pom.xml (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/WorkFlowApplication.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/constant/ProcessConstant.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/controller/ProcessDefinitionController.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/controller/ProcessFileController.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/controller/ProcessInstanceController.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/controller/ProcessListenerController.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/controller/ProcessTaskController.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/FormPerm.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/HistoricalOperation.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/ProcessBusiness.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/ProcessData.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/ProcessFile.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/ProcessListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/UserInstance.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bo/AnalysisProcessBo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bo/VariablesBo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/Attachment.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/CommentInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/ConditionInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/EmailInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItem.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/FormItemProps.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/FormOperates.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/GroupsInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/HttpParam.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/ListenerItem.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/LogoInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyType.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/NotifyTypeInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/ProcessNode.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/Properties.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/RoleInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/SettingsInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/bpmn/UserInfo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/dto/FormItemDto.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/dto/ProcessDto.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/dto/ProcessInstanceDto.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/dto/TaskDto.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/query/ProcessListenerQuery.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/query/ProcessQuery.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/FormItemData.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/HistoricalOperationVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionHistoryVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionInfoVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/ProcessDefinitionVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceDetailVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/ProcessInstanceVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/ProcessListenerVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskDetailVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskResultVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/entity/vo/task/TaskVo.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/enums/AssigneeTypeEnums.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/enums/FormItemEnum.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/enums/FormPermEnum.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/enums/ModeEnums.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/enums/OperationEnums.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/enums/OperationStateEnums.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/enums/ProcessNodeEnum.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/FormItemDataMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/FormPermMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/HisFlowableActinstMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/HistoricalOperationMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/ProcessBusinessMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/ProcessDataMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/ProcessFileMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/ProcessListenerMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/ProcessMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/RunFlowableActinstMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/TaskRuntimeMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/mapper/UserInstanceMapper.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/BpmnParseUtil.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/FormItemParseUtil.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/ProcessServiceUtils.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/ProcessUtil.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/TriggerService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/cmd/RollbackUserTaskCmd.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/listener/BoundaryEvenListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/listener/CounterSignListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/listener/CreateStartEventListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/listener/IntermediateCatchEventListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/listener/ProcessListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/listener/ServiceListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/process/listener/TaskCreatedListener.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/NotifyService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/ProcessDefinitionService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/ProcessFileService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/ProcessInstanceService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/ProcessListenerService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/ProcessNodeService.java (73%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/ProcessService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/ProcessTaskService.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/impl/ProcessDefinitionServiceImpl.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/impl/ProcessFileServiceImpl.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/impl/ProcessInstanceServiceImpl.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/impl/ProcessListenerServiceImpl.java (100%) rename {visual/workflow => workflow}/src/main/java/cn/fateverse/workflow/service/impl/ProcessTaskServiceImpl.java (99%) rename {visual/workflow => workflow}/src/main/java/liquibase/database/core/DmDatabase.java (100%) rename {visual/workflow => workflow}/src/main/java/liquibase/datatype/core/BooleanType.java (100%) rename {visual/workflow => workflow}/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java (100%) rename {visual/workflow => workflow}/src/main/java/org/flowable/dmn/engine/impl/db/DmnDbSchemaManager.java (100%) rename {visual/workflow => workflow}/src/main/resources/META-INF/service/liquibase.database.Database (100%) rename {visual/workflow => workflow}/src/main/resources/bootstrap-pro.yml (100%) rename {visual/workflow => workflow}/src/main/resources/bootstrap.yml (97%) rename {visual/workflow => workflow}/src/main/resources/mapper/FormItemDataMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/FormPermMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/HisFlowableActinstMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/HistoricalOperationMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/ProcessBusinessMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/ProcessDataMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/ProcessFileMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/ProcessListenerMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/ProcessMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/RunFlowableActinstMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/TaskRuntimeMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/mapper/UserInstanceMapper.xml (100%) rename {visual/workflow => workflow}/src/main/resources/org/flowable/dmn/db/liquibase/custom-flowable-dmn-db-changelog.xml (100%) rename {visual/workflow => workflow}/src/main/resources/security-cloud-workflow.sql (100%) 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 be546d2..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,"123456789#$@&%"); + 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"> - visual + custom-query cn.fateverse 1.0.0 4.0.0 - custom-query - 自定义查询模块 + custom-query-biz + + 11 + 11 true + + + + cn.fateverse + custom-query-submter + 1.0.0 + cn.fateverse common-security @@ -89,4 +98,5 @@ + \ 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 @@ + + insert into data_adapter diff --git a/custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml new file mode 100644 index 0000000..fd11644 --- /dev/null +++ b/custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml @@ -0,0 +1,62 @@ + + + + + + select portal_id, + query_id, + adapter_id, + portal_name, + anonymity, + type, + path, + header, + params, + body, + url, + api_header, + api_params, + api_body, + state, + create_by, + create_time, + update_by, + update_time, + remark + from portal + + + + select portal_id, + query_id, + adapter_id, + portal_name, + anonymity, + type, + path, + url, + state, + create_time, + update_time, + remark + from portal + + + + + + + \ No newline at end of file diff --git a/custom-query/custom-query-biz/src/main/resources/mapper/PortalMappingMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/PortalMappingMapper.xml new file mode 100644 index 0000000..74b8462 --- /dev/null +++ b/custom-query/custom-query-biz/src/main/resources/mapper/PortalMappingMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + insert into portal_mapping (portal_id, mapping_key, data_type, mapping_value) + values + + (#{item.portalId}, #{item.mappingKey}, #{item.dataType}, #{item.mappingValue}) + + + + + delete + from portal_mapping + where portal_id = #{portalId} + + + \ No newline at end of file diff --git a/custom-query/custom-query-biz/src/main/resources/mapper/UniQueryMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/UniQueryMapper.xml index 08170da..b9a7b8b 100644 --- a/custom-query/custom-query-biz/src/main/resources/mapper/UniQueryMapper.xml +++ b/custom-query/custom-query-biz/src/main/resources/mapper/UniQueryMapper.xml @@ -52,6 +52,15 @@ where id = #{id} + + insert into uni_query diff --git a/custom-query/custom-query-biz/src/test/java/cn/fateverse/query/DataAdapter.java b/custom-query/custom-query-biz/src/test/java/cn/fateverse/query/DataAdapter.java new file mode 100644 index 0000000..2d5ab74 --- /dev/null +++ b/custom-query/custom-query-biz/src/test/java/cn/fateverse/query/DataAdapter.java @@ -0,0 +1,14 @@ +package cn.fateverse.query; + +import java.util.*; +import java.util.stream.*; + +public class DataAdapter { + + public static Object execute(List> data) { + for (Map objectMap : data) { + objectMap.remove("oper_location"); + } + return data; + } +} \ No newline at end of file diff --git a/custom-query/pom.xml b/custom-query/pom.xml index f40b4cc..9a37c78 100644 --- a/custom-query/pom.xml +++ b/custom-query/pom.xml @@ -23,6 +23,7 @@ custom-query-biz custom-query-submter + custom-query-api \ No newline at end of file diff --git a/gateway/src/main/resources/bootstrap.yml b/gateway/src/main/resources/bootstrap.yml index d9b413f..bf25e51 100644 --- a/gateway/src/main/resources/bootstrap.yml +++ b/gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8001 + port: 8000 swagger: enabled: true From ab8e2f7b8780418b17735b267da692a29b82e2c1 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Thu, 18 Apr 2024 23:29:47 +0800 Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/code/engine/JavaCodeEngine.java | 20 +++ .../query/constant/QueryConstant.java | 2 + .../controller/DataAdapterController.java | 1 - .../query/controller/PortalController.java | 24 ++- .../query/controller/QueryToolController.java | 29 +++- .../query/controller/SqlSearchController.java | 2 +- .../query/controller/TestController.java | 11 +- .../controller/TopologySearchController.java | 2 +- .../fateverse/query/entity/DataAdapter.java | 38 +++-- .../cn/fateverse/query/entity/Portal.java | 46 ++---- .../fateverse/query/entity/PortalMapping.java | 12 +- .../query/entity/dto/DataAdapterDto.java | 7 - .../fateverse/query/entity/dto/PortalDto.java | 90 +++++------ .../query/entity/dto/SearchInfo.java | 2 +- .../query/entity/query/DataAdapterQuery.java | 9 +- .../query/entity/vo/DataAdapterVo.java | 8 - .../fateverse/query/entity/vo/PortalVo.java | 5 +- .../query/entity/vo/SimplePortalVo.java | 2 +- .../handler/adapter/DataAdapterHandler.java | 7 +- ...dler.java => LocalDataAdapterHandler.java} | 21 +-- .../handler/engine/EngineExecuteHandler.java | 6 + .../engine/impl/JavaEngineExecuteHandler.java | 14 +- .../impl/JavaScriptEngineExecuteHandler.java | 9 +- .../reader/DataAdapterHandlerReader.java | 9 +- .../reader/EngineExecuteHandlerReader.java | 14 ++ .../fateverse/query/mapper/PortalMapper.java | 19 +++ .../query/mapper/PortalMappingMapper.java | 18 +++ .../query/mapper/UniQueryMapper.java | 2 + .../query/portal/PortalDispatchServlet.java | 83 +++++++++++ .../config/HandlerMethodService.java} | 22 +-- .../query/service/PortalService.java | 10 +- .../query/service/QueryToolService.java | 9 ++ .../service/impl/DataAdapterServiceImpl.java | 8 +- .../query/service/impl/PageServiceImpl.java | 4 +- .../query/service/impl/PortalServiceImpl.java | 141 +++++++++++++++++- .../service/impl/QueryToolServiceImpl.java | 51 ++++++- .../resources/mapper/DataAdapterMapper.xml | 33 ++-- .../main/resources/mapper/PortalMapper.xml | 72 +++++---- .../resources/mapper/PortalMappingMapper.xml | 6 +- 39 files changed, 645 insertions(+), 223 deletions(-) rename custom-query/custom-query-biz/src/main/java/cn/fateverse/query/handler/adapter/impl/{CustomQueryDataAdapterHandler.java => LocalDataAdapterHandler.java} (72%) create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/portal/PortalDispatchServlet.java rename custom-query/custom-query-biz/src/main/java/cn/fateverse/query/{config/HandlerMethodConfiguration.java => portal/config/HandlerMethodService.java} (80%) diff --git a/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java b/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java index 68a17af..180e34e 100644 --- a/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java +++ b/common/common-code/src/main/java/cn/fateverse/common/code/engine/JavaCodeEngine.java @@ -228,4 +228,24 @@ public class JavaCodeEngine { throw new RuntimeException(e); } } + + /** + * 删除类 + * @param className 删除类 + * @return 删除结果 + */ + public Boolean remove(String className) { + return SegmentLock.lock(className, () -> { + classCache.remove(className); + File javaFile = new File(CLASS_PATH + className + JAVA_SUFFIX); + if (javaFile.exists()) { + javaFile.delete(); + } + File classFile = new File(CLASS_PATH + className + CLASS_SUFFIX); + if (classFile.exists()) { + classFile.delete(); + } + return true; + }); + } } diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/constant/QueryConstant.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/constant/QueryConstant.java index 9f79392..8c07ad9 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/constant/QueryConstant.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/constant/QueryConstant.java @@ -9,4 +9,6 @@ public class QueryConstant { public static final String PERMISSIONS_KEY = "custom:query:online:"; + public static final String PORTAL_KEY = "custom:query:portal:"; + } diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataAdapterController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataAdapterController.java index 3d344bf..f0a9cfd 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataAdapterController.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/DataAdapterController.java @@ -10,7 +10,6 @@ import cn.fateverse.query.entity.query.DataAdapterQuery; import cn.fateverse.query.entity.vo.DataAdapterVo; import cn.fateverse.query.service.DataAdapterService; import cn.fateverse.common.core.result.Result; -import cn.fateverse.common.core.entity.Option; import cn.fateverse.common.core.result.page.TableDataInfo; import cn.fateverse.common.core.utils.ObjectUtils; import cn.fateverse.common.log.annotation.Log; diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PortalController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PortalController.java index 0021c4e..4c7f9c1 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PortalController.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PortalController.java @@ -5,6 +5,7 @@ import cn.fateverse.common.core.result.page.TableDataInfo; import cn.fateverse.common.core.utils.ObjectUtils; import cn.fateverse.common.decrypt.annotation.Encrypt; import cn.fateverse.common.decrypt.annotation.EncryptField; +import cn.fateverse.query.entity.dto.PortalDto; import cn.fateverse.query.entity.query.PortalQuery; import cn.fateverse.query.entity.vo.PortalVo; import cn.fateverse.query.entity.vo.SimplePortalVo; @@ -12,10 +13,8 @@ import cn.fateverse.query.service.PortalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * 接口管理表(portal 传送门 接口作为入口 传送到其他类型) Controller @@ -56,5 +55,22 @@ public class PortalController { return Result.ok(dataInfo); } + @ApiOperation("新增接口") + @PostMapping + @PreAuthorize("@ss.hasPermission('query:portal:add')") + public Result add(@RequestBody @Validated PortalDto portalDto) { + portalService.save(portalDto); + return Result.ok(); + } + + @ApiOperation("修改接口") + @PutMapping + @PreAuthorize("@ss.hasPermission('query:portal:edit')") + public Result edit(@RequestBody @Validated PortalDto portalDto) { + ObjectUtils.checkPk(portalDto.getPortalId()); + portalService.edit(portalDto); + return Result.ok(); + } + } diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/QueryToolController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/QueryToolController.java index 66ec017..9ab6258 100644 --- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/QueryToolController.java +++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/QueryToolController.java @@ -1,17 +1,25 @@ package cn.fateverse.query.controller; +import cn.fateverse.common.core.entity.Option; +import cn.fateverse.common.core.result.Result; +import cn.fateverse.query.entity.vo.UniConVo; import cn.fateverse.query.service.QueryToolService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author Clay * @date 2024/4/16 16:10 */ @Api(tags = "自定义查询工具接口管理") @RestController -@RequestMapping("/query/tool") +@RequestMapping("/tool") public class QueryToolController { @@ -22,9 +30,26 @@ public class QueryToolController { this.queryToolService = queryToolService; } + @ApiOperation("根据查询类型获取自定义查询") + @GetMapping("/option/{type}") + public Result> option(@PathVariable Integer type) { + if (type == null) { + return Result.error("查询类型不能为空"); + } + List