From 7f8ceb3e2533fbc5d9d0d78b34daac2c22ed7a78 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Thu, 18 Apr 2024 15:29:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E5=99=A8=E5=92=8C=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/decrypt/aspect/EncryptAspect.java  |  14 +-
 .../common/decrypt/entity/EncryptOption.java  |  29 ++++
 .../decrypt/entity/EncryptOptionTree.java     |  38 +++++
 custom-query/custom-query-api/pom.xml         |  41 +++++
 custom-query/custom-query-biz/pom.xml         |   7 +-
 .../config/HandlerMethodConfiguration.java    |  93 +++++++++++
 .../controller/DataAdapterController.java     |  15 +-
 .../query/controller/PortalController.java    |  60 +++++++
 .../query/controller/QueryToolController.java |  30 ++++
 .../query/controller/TestController.java      |  47 ++++++
 .../cn/fateverse/query/entity/Portal.java     | 100 ++++++++++++
 .../fateverse/query/entity/PortalMapping.java |  46 ++++++
 .../fateverse/query/entity/dto/PortalDto.java | 137 ++++++++++++++++
 .../query/entity/query/PortalQuery.java       |  45 ++++++
 .../query/entity/vo/PortalMappingVo.java      |  34 ++++
 .../fateverse/query/entity/vo/PortalVo.java   |  40 +++++
 .../query/entity/vo/SimplePortalVo.java       | 148 ++++++++++++++++++
 .../cn/fateverse/query/enums/PortalEnum.java  |  23 +++
 .../impl/JavaScriptEngineExecuteHandler.java  |   3 +
 .../query/mapper/DataAdapterMapper.java       |   5 +-
 .../fateverse/query/mapper/PortalMapper.java  |  32 ++++
 .../query/mapper/PortalMappingMapper.java     |  20 +++
 .../query/mapper/UniQueryMapper.java          |   4 +
 .../query/service/DataAdapterService.java     |   3 +-
 .../query/service/PortalService.java          |  21 +++
 .../query/service/QueryToolService.java       |   8 +
 .../query/service/SearchService.java          |   4 +-
 .../service/impl/DataAdapterServiceImpl.java  |   7 +-
 .../query/service/impl/PortalServiceImpl.java |  97 ++++++++++++
 .../service/impl/QueryToolServiceImpl.java    |  29 ++++
 .../service/impl/SqlSearchServiceImpl.java    |   4 +-
 .../impl/TopologySearchServiceImpl.java       |   4 +-
 .../resources/mapper/DataAdapterMapper.xml    |   8 +
 .../main/resources/mapper/PortalMapper.xml    |  62 ++++++++
 .../resources/mapper/PortalMappingMapper.xml  |  28 ++++
 .../main/resources/mapper/UniQueryMapper.xml  |   9 ++
 .../java/cn/fateverse/query/DataAdapter.java  |  14 ++
 custom-query/pom.xml                          |   1 +
 gateway/src/main/resources/bootstrap.yml      |   2 +-
 39 files changed, 1288 insertions(+), 24 deletions(-)
 create mode 100644 common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOption.java
 create mode 100644 common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOptionTree.java
 create mode 100644 custom-query/custom-query-api/pom.xml
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/config/HandlerMethodConfiguration.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PortalController.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/QueryToolController.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TestController.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/PortalMapping.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalMappingVo.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalVo.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/PortalEnum.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMapper.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMappingMapper.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/PortalService.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/QueryToolService.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java
 create mode 100644 custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/QueryToolServiceImpl.java
 create mode 100644 custom-query/custom-query-biz/src/main/resources/mapper/PortalMapper.xml
 create mode 100644 custom-query/custom-query-biz/src/main/resources/mapper/PortalMappingMapper.xml
 create mode 100644 custom-query/custom-query-biz/src/test/java/cn/fateverse/query/DataAdapter.java

diff --git a/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/aspect/EncryptAspect.java b/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/aspect/EncryptAspect.java
index c48d920..e72f998 100644
--- a/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/aspect/EncryptAspect.java
+++ b/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/aspect/EncryptAspect.java
@@ -59,11 +59,7 @@ public class EncryptAspect {
                 } else if (arg instanceof List) {
                     try {
                         List<String> list = (List<String>) arg;
-                        for (int j = 0; j < list.size(); j++) {
-                            String ciphertext = list.get(j);
-                            String decrypt = encryptService.decrypt(ciphertext);
-                            list.set(j, decrypt);
-                        }
+                        list.replaceAll(encryptService::decrypt);
                         args[i] = list;
                     } catch (Exception e) {
                         throw new CustomException("接受参数类型错误,请使用String类型的泛型参数");
@@ -117,7 +113,9 @@ public class EncryptAspect {
                     String decrypt = encryptService.encrypt((String) value);
                     ReflectionUtils.setField(field, data, decrypt);
                 } else if (field.getType().getName().startsWith(BASE_PACKAGE)) {
-                    encrypt(value);
+                    if (!value.getClass().isEnum()){
+                        encrypt(value);
+                    }
                 } else if (value instanceof Collection) {
                     Collection<Object> collection = (Collection<Object>) value;
                     for (Object item : collection) {
@@ -148,7 +146,9 @@ public class EncryptAspect {
                 String decrypt = encryptService.decrypt((String) value);
                 ReflectionUtils.setField(field, arg, decrypt);
             } else if (field.getType().getName().startsWith(BASE_PACKAGE)) {
-                decrypt(value);
+                if (!value.getClass().isEnum()){
+                    decrypt(value);
+                }
             }
         }
     }
diff --git a/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOption.java b/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOption.java
new file mode 100644
index 0000000..eb62525
--- /dev/null
+++ b/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOption.java
@@ -0,0 +1,29 @@
+package cn.fateverse.common.decrypt.entity;
+
+import cn.fateverse.common.decrypt.annotation.EncryptField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 12:23
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EncryptOption {
+
+    /**
+     * 节点ID
+     */
+    @EncryptField
+    private String value;
+
+    /**
+     * 节点名称
+     */
+    private String label;
+}
diff --git a/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOptionTree.java b/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOptionTree.java
new file mode 100644
index 0000000..91fcf85
--- /dev/null
+++ b/common/common-decrypt/src/main/java/cn/fateverse/common/decrypt/entity/EncryptOptionTree.java
@@ -0,0 +1,38 @@
+package cn.fateverse.common.decrypt.entity;
+
+import cn.fateverse.common.core.entity.OptionTree;
+import cn.fateverse.common.decrypt.annotation.EncryptField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 12:23
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EncryptOptionTree {
+    /**
+     * 节点ID
+     */
+    @EncryptField
+    private String value;
+
+    /**
+     * 节点名称
+     */
+    private Object label;
+
+    /**
+     * 子节点
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<OptionTree> children;
+}
diff --git a/custom-query/custom-query-api/pom.xml b/custom-query/custom-query-api/pom.xml
new file mode 100644
index 0000000..ba95ad8
--- /dev/null
+++ b/custom-query/custom-query-api/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>custom-query</artifactId>
+        <groupId>cn.fateverse</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>custom-query-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>common-dubbo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo.extensions</groupId>
+            <artifactId>dubbo-cluster-specify-address-dubbo3</artifactId>
+            <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.dubbo</groupId>
+                    <artifactId>dubbo</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>cn.fateverse</groupId>
+            <artifactId>common-dubbo</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/custom-query/custom-query-biz/pom.xml b/custom-query/custom-query-biz/pom.xml
index 9fa810b..f037425 100644
--- a/custom-query/custom-query-biz/pom.xml
+++ b/custom-query/custom-query-biz/pom.xml
@@ -49,9 +49,14 @@
             <groupId>cn.fateverse</groupId>
             <artifactId>admin-api</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.fateverse</groupId>-->
+<!--            <artifactId>common-seata</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>cn.fateverse</groupId>
-            <artifactId>common-seata</artifactId>
+            <artifactId>custom-query-api</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/config/HandlerMethodConfiguration.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/config/HandlerMethodConfiguration.java
new file mode 100644
index 0000000..7866153
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/config/HandlerMethodConfiguration.java
@@ -0,0 +1,93 @@
+package cn.fateverse.query.config;
+
+import cn.fateverse.common.core.exception.CustomException;
+import cn.fateverse.query.controller.TestController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * @author Clay
+ * @date 2024/4/12 16:56
+ */
+@Slf4j
+@Configuration
+public class HandlerMethodConfiguration implements ApplicationContextAware {
+
+
+    public static final String CUSTOM_INTERFACE = "customInterface:";
+    private RequestMappingHandlerMapping mapping;
+    private Method mappingMethod;
+
+
+    public HandlerMethodConfiguration() {
+        Class<TestController> testControllerClass = TestController.class;
+        Method[] declaredMethods = testControllerClass.getDeclaredMethods();
+        for (Method declaredMethod : declaredMethods) {
+            if ("mapping".equals(declaredMethod.getName())) {
+                mappingMethod = declaredMethod;
+            }
+        }
+        if (mappingMethod == null) {
+            log.error("mappingMethod is null");
+        }
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        mapping = (RequestMappingHandlerMapping) applicationContext.getBean("requestMappingHandlerMapping");
+    }
+
+    /**
+     * 注册映射接口
+     *
+     * @param path          接口路径
+     * @param requestMethod 请求方法
+     */
+    public void registerMapping(String path, RequestMethod requestMethod) {
+        String[] empty = {};
+        RequestMappingInfo.Builder builder = RequestMappingInfo
+                .paths(path)
+                .methods(requestMethod)
+                .params(empty)
+                .headers(empty)
+                .consumes(empty)
+                .produces(empty)
+                .mappingName(CUSTOM_INTERFACE + path);
+        RequestMappingInfo requestMappingInfo = builder.options(mapping.getBuilderConfiguration()).build();
+        Map<RequestMappingInfo, HandlerMethod> handlerMethods = mapping.getHandlerMethods();
+        if (handlerMethods.containsKey(requestMappingInfo)) {
+            throw new CustomException("path is exist");
+        }
+        mapping.registerMapping(requestMappingInfo, "testController", mappingMethod);
+    }
+
+    /**
+     * 卸载映射接口
+     *
+     * @param path          接口路径
+     * @param requestMethod 请求类型
+     */
+    public void unregisterMapping(String path, RequestMethod requestMethod) {
+        Map<RequestMappingInfo, HandlerMethod> handlerMethods = mapping.getHandlerMethods();
+        for (RequestMappingInfo mappingInfo : handlerMethods.keySet()) {
+            if (!ObjectUtils.isEmpty(mappingInfo.getName())
+                    && (CUSTOM_INTERFACE + path).equals(mappingInfo.getName())
+                    && mappingInfo.getMethodsCondition().getMethods().contains(requestMethod)) {
+                mapping.unregisterMapping(mappingInfo);
+            }
+        }
+    }
+
+
+}
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 d3422a0..3d344bf 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
@@ -1,6 +1,9 @@
 package cn.fateverse.query.controller;
 
 import cn.fateverse.common.core.exception.CustomException;
+import cn.fateverse.common.decrypt.annotation.Encrypt;
+import cn.fateverse.common.decrypt.annotation.EncryptField;
+import cn.fateverse.common.decrypt.entity.EncryptOption;
 import cn.fateverse.common.excel.utils.ExcelUtil;
 import cn.fateverse.query.entity.dto.DataAdapterDto;
 import cn.fateverse.query.entity.query.DataAdapterQuery;
@@ -39,6 +42,7 @@ public class DataAdapterController {
 
 
     @ApiOperation("获取数据源适配器列表")
+    @Encrypt
     @GetMapping
     @PreAuthorize("@ss.hasPermission('query:adapter:list')")
     public Result<TableDataInfo<DataAdapterVo>> list(DataAdapterQuery query) {
@@ -47,9 +51,10 @@ public class DataAdapterController {
     }
 
     @ApiOperation("获取校验规则option")
+    @Encrypt
     @GetMapping("/option")
-    public Result<List<Option>> option() {
-        List<Option> options = dataAdapterService.searchOptionList();
+    public Result<List<EncryptOption>> option() {
+        List<EncryptOption> options = dataAdapterService.searchOptionList();
         return Result.ok(options);
     }
 
@@ -62,11 +67,13 @@ public class DataAdapterController {
     }
 
     @ApiOperation("获取数据源适配器详细信息")
+    @Encrypt
     @GetMapping("/{adapterId}")
     @PreAuthorize("@ss.hasPermission('query:adapter:info')")
-    public Result<DataAdapterVo> info(@PathVariable Long adapterId) {
+    public Result<DataAdapterVo> info(@PathVariable @EncryptField String adapterId) {
         ObjectUtils.checkPk(adapterId);
-        DataAdapterVo dataAdapter = dataAdapterService.searchById(adapterId);
+        Long id = Long.valueOf(adapterId);
+        DataAdapterVo dataAdapter = dataAdapterService.searchById(id);
         return Result.ok(dataAdapter);
     }
 
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
new file mode 100644
index 0000000..0021c4e
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/PortalController.java
@@ -0,0 +1,60 @@
+package cn.fateverse.query.controller;
+
+import cn.fateverse.common.core.result.Result;
+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.query.PortalQuery;
+import cn.fateverse.query.entity.vo.PortalVo;
+import cn.fateverse.query.entity.vo.SimplePortalVo;
+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;
+
+/**
+ * 接口管理表(portal 传送门  接口作为入口 传送到其他类型) Controller
+ *
+ * @author clay
+ * @date 2024-04-15
+ */
+@Api(value = "接口管理表", tags = "接口管理表")
+@RestController
+@RequestMapping("/portal")
+public class PortalController {
+
+    private final PortalService portalService;
+
+
+    public PortalController(PortalService portalService) {
+        this.portalService = portalService;
+    }
+
+    @ApiOperation("获取接口管理表详细信息")
+    @Encrypt
+    @GetMapping("/{portalId}")
+    @PreAuthorize("@ss.hasPermission('query:portal:info')")
+    public Result<PortalVo> info(@PathVariable @EncryptField String portalId) {
+        ObjectUtils.checkPk(portalId);
+        Long value = Long.valueOf(portalId);
+        PortalVo portal = portalService.searchById(value);
+        return Result.ok(portal);
+    }
+
+
+    @ApiOperation("获取接口管理表列表")
+    @GetMapping
+    @Encrypt
+    @PreAuthorize("@ss.hasPermission('query:portal:list')")
+    public Result<TableDataInfo<SimplePortalVo>> list(PortalQuery query) {
+        TableDataInfo<SimplePortalVo> dataInfo = portalService.searchList(query);
+        return Result.ok(dataInfo);
+    }
+
+
+}
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
new file mode 100644
index 0000000..66ec017
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/QueryToolController.java
@@ -0,0 +1,30 @@
+package cn.fateverse.query.controller;
+
+import cn.fateverse.query.service.QueryToolService;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Clay
+ * @date 2024/4/16 16:10
+ */
+@Api(tags = "自定义查询工具接口管理")
+@RestController
+@RequestMapping("/query/tool")
+public class QueryToolController {
+
+
+    private final QueryToolService queryToolService;
+
+
+    public QueryToolController(QueryToolService queryToolService) {
+        this.queryToolService = queryToolService;
+    }
+
+
+
+
+
+
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TestController.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TestController.java
new file mode 100644
index 0000000..5a454b8
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/controller/TestController.java
@@ -0,0 +1,47 @@
+package cn.fateverse.query.controller;
+
+import cn.fateverse.common.security.annotation.Anonymity;
+import cn.fateverse.common.security.configure.properties.PermitAllUrlProperties;
+import cn.fateverse.query.config.HandlerMethodConfiguration;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+
+/**
+ * @author Clay
+ * @date 2024/4/12 14:18
+ */
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+    @Resource
+    private HandlerMethodConfiguration configuration;
+
+    @Anonymity
+    @GetMapping("/1")
+    public String test1() {
+        configuration.registerMapping("/anonymity/mapping", RequestMethod.GET);
+        return "1";
+    }
+
+    @Anonymity
+    @GetMapping("/2")
+    public String test2() {
+        configuration.unregisterMapping("/anonymity/mapping", RequestMethod.GET);
+        return "2";
+    }
+
+
+    public String mapping(HttpServletRequest request) {
+        return "mapping";
+    }
+
+
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java
new file mode 100644
index 0000000..5b2c4de
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/Portal.java
@@ -0,0 +1,100 @@
+package  cn.fateverse.query.entity;
+
+import cn.fateverse.common.core.annotaion.EnableAutoField;
+import cn.fateverse.common.core.entity.BaseEntity;
+import cn.fateverse.query.enums.PortalEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 接口管理表(portal 传送门  接口作为入口 传送到其他类型)对象 portal
+ *
+ * @author clay
+ * @date 2024-04-15
+ */
+@Data
+@Builder
+@EnableAutoField
+@AllArgsConstructor
+@NoArgsConstructor
+public class Portal extends BaseEntity{
+
+    /**
+     * 主键id
+     */
+    private Long portalId;
+
+    /**
+     * 自定义查询id
+     */
+    private Long queryId;
+
+    /**
+     * 数据适配器id
+     */
+    private Long adapterId;
+
+    /**
+     * 接口名称
+     */
+    private String portalName;
+
+    /**
+     * 是否匿名
+     */
+    private Boolean anonymity;
+
+    /**
+     * 接口类型
+     */
+    private PortalEnum type;
+
+    /**
+     * 系统暴露地址
+     */
+    private String path;
+
+    /**
+     * 请求头
+     */
+    private String header;
+
+    /**
+     * 请求参数
+     */
+    private String params;
+
+    /**
+     * 请求体
+     */
+    private String body;
+
+    /**
+     * 第三方接口地址
+     */
+    private String url;
+
+    /**
+     * 第三方接口请求头
+     */
+    private String apiHeader;
+
+    /**
+     * 第三方接口请求参数
+     */
+    private String apiParams;
+
+    /**
+     * 第三方接口请求体
+     */
+    private String apiBody;
+
+    /**
+     * 状态
+     */
+    private Long state;
+
+}
\ No newline at end of file
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/PortalMapping.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/PortalMapping.java
new file mode 100644
index 0000000..e6ff42d
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/PortalMapping.java
@@ -0,0 +1,46 @@
+package cn.fateverse.query.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 接口映射表对象 portal_mapping
+ *
+ * @author clay
+ * @date 2024-04-15
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class PortalMapping {
+
+    /**
+     * 条件id
+     */
+    private Long mappingId;
+
+    /**
+     * 自定义接口id
+     */
+    private Long portalId;
+
+    /**
+     * 字段
+     */
+    private String mappingKey;
+
+    /**
+     * 数据类型, 0 param, 1 header, 2 body
+     */
+    private Integer dataType;
+
+    /**
+     * 映射值 自定义查询映射值为查询条件的id 第三方接口则为接口查询的key
+     */
+    private String mappingValue;
+
+}
\ No newline at end of file
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java
new file mode 100644
index 0000000..aa1e3f8
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/dto/PortalDto.java
@@ -0,0 +1,137 @@
+package cn.fateverse.query.entity.dto;
+
+import cn.fateverse.query.entity.Portal;
+import cn.fateverse.query.enums.PortalEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 接口管理表(portal 传送门  接口作为入口 传送到其他类型)对象 portal
+ *
+ * @author clay
+ * @date 2024-04-15
+ */
+@Data
+@ApiModel("接口管理表(portal 传送门  接口作为入口 传送到其他类型)Dto")
+public class PortalDto {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty("主键id")
+    private String portalId;
+
+    /**
+     * 自定义查询id
+     */
+    @ApiModelProperty("自定义查询id")
+    private Long queryId;
+
+    /**
+     * 数据适配器id
+     */
+    @ApiModelProperty("数据适配器id")
+    private Long adapterId;
+
+    /**
+     * 接口名称
+     */
+    @ApiModelProperty("接口名称")
+    private String portalName;
+
+    /**
+     * 是否匿名
+     */
+    @ApiModelProperty("是否匿名")
+    private Boolean anonymity;
+
+    /**
+     * 接口类型
+     */
+    @ApiModelProperty("接口类型")
+    private PortalEnum type;
+
+    /**
+     * 系统暴露地址
+     */
+    @ApiModelProperty("系统暴露地址")
+    private String path;
+
+    /**
+     * 请求头
+     */
+    @ApiModelProperty("请求头")
+    private String header;
+
+    /**
+     * 请求参数
+     */
+    @ApiModelProperty("请求参数")
+    private String params;
+
+    /**
+     * 请求体
+     */
+    @ApiModelProperty("请求体")
+    private String body;
+
+    /**
+     * 第三方接口地址
+     */
+    @ApiModelProperty("第三方接口地址")
+    private String url;
+
+    /**
+     * 第三方接口请求头
+     */
+    @ApiModelProperty("第三方接口请求头")
+    private String apiHeader;
+
+    /**
+     * 第三方接口请求参数
+     */
+    @ApiModelProperty("第三方接口请求参数")
+    private String apiParams;
+
+    /**
+     * 第三方接口请求体
+     */
+    @ApiModelProperty("第三方接口请求体")
+    private String apiBody;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private Long state;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+    public Portal toPortal() {
+        Portal portal = Portal.builder()
+                .queryId(queryId)
+                .adapterId(adapterId)
+                .portalName(portalName)
+                .anonymity(anonymity)
+                .type(type)
+                .path(path)
+                .header(header)
+                .params(params)
+                .body(body)
+                .url(url)
+                .apiHeader(apiHeader)
+                .apiParams(apiParams)
+                .apiBody(apiBody)
+                .state(state)
+                .build();
+        portal.setPortalId(Long.valueOf(portalId));
+        portal.setRemark(remark);
+        return portal;
+    }
+}
\ No newline at end of file
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java
new file mode 100644
index 0000000..41b6a27
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/query/PortalQuery.java
@@ -0,0 +1,45 @@
+package  cn.fateverse.query.entity.query;
+
+import cn.fateverse.query.enums.PortalEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 接口管理表(portal 传送门  接口作为入口 传送到其他类型)对象 portal
+ *
+ * @author clay
+ * @date 2024-04-15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("接口管理表(portal 传送门  接口作为入口 传送到其他类型)Query")
+public class PortalQuery {
+
+    /**
+     * 接口名称
+     */
+    @ApiModelProperty("接口名称")
+    private String portalName;
+
+    /**
+     * 是否匿名
+     */
+    @ApiModelProperty("是否匿名")
+    private Boolean anonymity;
+
+    /**
+     * 接口类型
+     */
+    @ApiModelProperty("接口类型")
+    private PortalEnum type;
+
+    /**
+     * 系统暴露地址
+     */
+    @ApiModelProperty("系统暴露地址")
+    private String path;
+}
\ No newline at end of file
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalMappingVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalMappingVo.java
new file mode 100644
index 0000000..9aba054
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalMappingVo.java
@@ -0,0 +1,34 @@
+package cn.fateverse.query.entity.vo;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 16:44
+ */
+@Data
+@Builder
+public class PortalMappingVo {
+
+    /**
+     * 条件id
+     */
+    private Long mappingId;
+
+    /**
+     * 字段
+     */
+    private String mappingKey;
+
+    /**
+     * 数据类型, 0 param, 1 header, 2 body
+     */
+    private Integer dataType;
+
+    /**
+     * 映射值 自定义查询映射值为查询条件的id 第三方接口则为接口查询的key
+     */
+    private String mappingValue;
+
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalVo.java
new file mode 100644
index 0000000..9579297
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/PortalVo.java
@@ -0,0 +1,40 @@
+package cn.fateverse.query.entity.vo;
+
+import cn.fateverse.query.entity.Portal;
+import cn.fateverse.query.entity.PortalMapping;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
+
+/**
+ * 接口管理表(portal 传送门  接口作为入口 传送到其他类型)对象 portal
+ *
+ * @author clay
+ * @date 2024-04-15
+ */
+@Data
+@ApiModel("接口详细管理表Vo")
+public class PortalVo extends SimplePortalVo {
+
+    private List<PortalMapping> mappings;
+
+
+    public static PortalVo toPortalVo(Portal portal) {
+        return toPortalVo(portal, null);
+    }
+
+    public static PortalVo toPortalVo(Portal portal, List<PortalMapping> mappings) {
+        SimplePortalVo simplePortalVo = SimplePortalVo.toPortalVo(portal);
+        PortalVo portalVo = new PortalVo();
+        BeanUtils.copyProperties(simplePortalVo, portalVo);
+        if (!ObjectUtils.isEmpty(mappings)) {
+            portalVo.setMappings(mappings);
+        }
+        return portalVo;
+    }
+
+}
\ No newline at end of file
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java
new file mode 100644
index 0000000..023ace4
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/entity/vo/SimplePortalVo.java
@@ -0,0 +1,148 @@
+package cn.fateverse.query.entity.vo;
+
+import cn.fateverse.common.core.annotaion.Excel;
+import cn.fateverse.common.decrypt.annotation.EncryptField;
+import cn.fateverse.query.entity.Portal;
+import cn.fateverse.query.enums.PortalEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 10:28
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("简单接口管理表")
+public class SimplePortalVo {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty("主键id")
+    @EncryptField
+    private String portalId;
+
+
+    /**
+     * 自定义查询id
+     */
+    @ApiModelProperty("自定义查询id")
+    @EncryptField
+    private String queryId;
+
+
+    /**
+     * 数据适配器id
+     */
+    @ApiModelProperty("数据适配器id")
+    @EncryptField
+    private String adapterId;
+
+    /**
+     * 接口名称
+     */
+    @ApiModelProperty("接口名称")
+    @Excel("接口名称")
+    private String portalName;
+
+    /**
+     * 自定查询名称
+     */
+    @ApiModelProperty("自定查询名称")
+    @Excel("自定查询名称")
+    private String queryName;
+
+    @ApiModelProperty("自定查询类型  1:sql 2:topo图")
+    private Integer queryType;
+
+    /**
+     * 数据适配器名称
+     */
+    @ApiModelProperty("数据适配器名称")
+    @Excel("数据适配器名称")
+    private String adapterName;
+
+
+    /**
+     * 是否匿名
+     */
+    @ApiModelProperty("是否匿名")
+    @Excel("是否匿名")
+    private Boolean anonymity;
+
+    /**
+     * 接口类型
+     */
+    @ApiModelProperty("接口类型")
+    @Excel("接口类型")
+    private PortalEnum type;
+
+    /**
+     * 系统暴露地址
+     */
+    @ApiModelProperty("系统暴露地址")
+    @Excel("系统暴露地址")
+    private String path;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态 0: 创建 1: 发布 2:内部使用(例如提供echarts单独使用)")
+    @Excel("状态")
+    private Long state;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @Excel("创建时间")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @ApiModelProperty("更新时间")
+    @Excel("更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Excel("备注")
+    private String remark;
+
+    public static SimplePortalVo toPortalVo(Portal portal) {
+        SimplePortalVo portalVo = SimplePortalVo.builder()
+                .portalId(String.valueOf(portal.getPortalId()))
+                .portalName(portal.getPortalName())
+                .anonymity(portal.getAnonymity())
+                .type(portal.getType())
+                .path(portal.getPath())
+                .state(portal.getState())
+                .createTime(portal.getCreateTime())
+                .updateTime(portal.getUpdateTime())
+                .remark(portal.getRemark())
+                .build();
+        portalVo.setCreateTime(portal.getCreateTime());
+        portalVo.setUpdateTime(portal.getUpdateTime());
+        if (!ObjectUtils.isEmpty(portal.getQueryId())) {
+            portalVo.setQueryId(String.valueOf(portal.getQueryId()));
+        }
+        if (!ObjectUtils.isEmpty(portal.getAdapterId())) {
+            portalVo.setAdapterId(String.valueOf(portal.getAdapterId()));
+        }
+        return portalVo;
+    }
+
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/PortalEnum.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/PortalEnum.java
new file mode 100644
index 0000000..c9e7c2d
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/enums/PortalEnum.java
@@ -0,0 +1,23 @@
+package cn.fateverse.query.enums;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 11:23
+ */
+public enum PortalEnum {
+
+    LOCAL("local"),
+    EXTERNAL("external")
+    ;
+
+    private final String type;
+
+    PortalEnum(String type) {
+        this.type = type;
+    }
+
+
+    public String getType() {
+        return type;
+    }
+}
diff --git a/custom-query/custom-query-biz/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
index 48b4b50..65d9380 100644
--- a/custom-query/custom-query-biz/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
@@ -27,6 +27,9 @@ public class JavaScriptEngineExecuteHandler implements EngineExecuteHandler {
 
     @Override
     public Boolean preconditioning(DataAdapter dataAdapter) {
+        if (DataAdapterType.JAVA_SCRIPT.equals(dataAdapter.getType())){
+            return Boolean.TRUE;
+        }
         return Boolean.FALSE;
     }
 }
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java
index e0588d6..02e293d 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/DataAdapterMapper.java
@@ -29,6 +29,9 @@ public interface DataAdapterMapper {
      */
     List<DataAdapter> selectList(DataAdapterQuery query);
 
+
+    List<DataAdapter> selectListByIds(List<Long> adapterIds);
+
     /**
      * 新增数据源适配器
      *
@@ -60,5 +63,5 @@ public interface DataAdapterMapper {
      * @return 结果
      */
     int deleteBatchByIdList(List<Long> adapterIdList);
-    
+
 }
\ No newline at end of file
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMapper.java
new file mode 100644
index 0000000..6f8e2e2
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMapper.java
@@ -0,0 +1,32 @@
+package cn.fateverse.query.mapper;
+
+import cn.fateverse.query.entity.Portal;
+import cn.fateverse.query.entity.query.PortalQuery;
+
+import java.util.List;
+
+/**
+ * 接口管理表
+ *
+ * @author Clay
+ * @date 2024/4/15 10:32
+ */
+public interface PortalMapper {
+
+
+    /**
+     * 查询接口管理表
+     *
+     * @param portalId 接口管理表Id
+     * @return 接口管理表
+     */
+    Portal selectById(Long portalId);
+
+    /**
+     * 查询接口管理表列表
+     *
+     * @param query 接口管理表查询
+     * @return 接口管理表集合
+     */
+    List<Portal> selectList(PortalQuery query);
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMappingMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMappingMapper.java
new file mode 100644
index 0000000..8574427
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/PortalMappingMapper.java
@@ -0,0 +1,20 @@
+package cn.fateverse.query.mapper;
+
+import cn.fateverse.query.entity.PortalMapping;
+
+import java.util.List;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 15:20
+ */
+public interface PortalMappingMapper {
+
+    List<PortalMapping> selectByPortalId(Long portalId);
+
+    Integer insertBatch(List<PortalMapping> list);
+
+    Integer deleteByPortalId(Long portalId);
+
+
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java
index c925f04..864114a 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/mapper/UniQueryMapper.java
@@ -29,6 +29,9 @@ public interface UniQueryMapper {
      */
     UniQuery selectSampleById(Long id);
 
+
+    List<UniQuery> selectListByIds(List<Long> queryIds);
+
     /**
      * 查询万能查询列表
      *
@@ -69,4 +72,5 @@ public interface UniQueryMapper {
      */
     int deleteBatchByIdList(List<Long> idList);
 
+
 }
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataAdapterService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataAdapterService.java
index 98dcb6c..13d52ca 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataAdapterService.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/DataAdapterService.java
@@ -1,5 +1,6 @@
 package cn.fateverse.query.service;
 
+import cn.fateverse.common.decrypt.entity.EncryptOption;
 import cn.fateverse.query.entity.dto.DataAdapterDto;
 import cn.fateverse.query.entity.vo.DataAdapterVo;
 import cn.fateverse.query.entity.query.DataAdapterQuery;
@@ -37,7 +38,7 @@ public interface DataAdapterService {
      *
      * @return 选项集合
      */
-    List<Option> searchOptionList();
+    List<EncryptOption> searchOptionList();
 
     /**
      * 导出数据源适配器列表
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/PortalService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/PortalService.java
new file mode 100644
index 0000000..301c6d8
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/PortalService.java
@@ -0,0 +1,21 @@
+package cn.fateverse.query.service;
+
+import cn.fateverse.common.core.result.page.TableDataInfo;
+import cn.fateverse.query.entity.query.PortalQuery;
+import cn.fateverse.query.entity.vo.PortalVo;
+import cn.fateverse.query.entity.vo.SimplePortalVo;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 10:26
+ */
+public interface PortalService {
+
+
+    PortalVo searchById(Long portalId);
+
+
+    TableDataInfo<SimplePortalVo> searchList(PortalQuery query);
+
+
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/QueryToolService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/QueryToolService.java
new file mode 100644
index 0000000..1268b47
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/QueryToolService.java
@@ -0,0 +1,8 @@
+package cn.fateverse.query.service;
+
+/**
+ * @author Clay
+ * @date 2024/4/16 16:17
+ */
+public interface QueryToolService {
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SearchService.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SearchService.java
index 7a2c712..2c069af 100644
--- a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SearchService.java
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/SearchService.java
@@ -19,7 +19,7 @@ import cn.fateverse.query.mapper.UniColumnMapper;
 import cn.fateverse.query.mapper.UniConMapper;
 import cn.fateverse.query.mapper.UniQueryMapper;
 import cn.fateverse.query.service.impl.SqlSearchServiceImpl;
-import io.seata.spring.annotation.GlobalTransactional;
+//import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.dubbo.config.annotation.DubboReference;
 
 import java.util.ArrayList;
@@ -115,7 +115,7 @@ public class SearchService {
      *
      * @param queryId 自定义查询id
      */
-    @GlobalTransactional
+//    @GlobalTransactional
     public void cancel(Long queryId) {
         UniQuery sample = uniQueryMapper.selectSampleById(queryId);
         if (!sample.getPublish()) {
diff --git a/custom-query/custom-query-biz/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
index f729233..f671857 100644
--- a/custom-query/custom-query-biz/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
@@ -1,5 +1,6 @@
 package cn.fateverse.query.service.impl;
 
+import cn.fateverse.common.decrypt.entity.EncryptOption;
 import cn.fateverse.query.entity.DataAdapter;
 import cn.fateverse.query.entity.dto.DataAdapterDto;
 import cn.fateverse.query.entity.dto.SearchInfo;
@@ -53,11 +54,11 @@ public class DataAdapterServiceImpl implements DataAdapterService {
     }
 
     @Override
-    public List<Option> searchOptionList() {
+    public List<EncryptOption> searchOptionList() {
         DataAdapterQuery query = new DataAdapterQuery();
         List<DataAdapter> list = dataAdapterMapper.selectList(query);
-        return list.stream().map(item -> Option.builder()
-                .value(item.getAdapterId())
+        return list.stream().map(item -> EncryptOption.builder()
+                .value(String.valueOf(item.getAdapterId()))
                 .label(item.getAdapterName())
                 .build()).collect(Collectors.toList());
     }
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java
new file mode 100644
index 0000000..3abf801
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/PortalServiceImpl.java
@@ -0,0 +1,97 @@
+package cn.fateverse.query.service.impl;
+
+import cn.fateverse.common.core.result.page.TableDataInfo;
+import cn.fateverse.common.mybatis.utils.PageUtils;
+import cn.fateverse.query.entity.DataAdapter;
+import cn.fateverse.query.entity.Portal;
+import cn.fateverse.query.entity.UniQuery;
+import cn.fateverse.query.entity.query.PortalQuery;
+import cn.fateverse.query.entity.vo.PortalVo;
+import cn.fateverse.query.entity.vo.SimplePortalVo;
+import cn.fateverse.query.mapper.DataAdapterMapper;
+import cn.fateverse.query.mapper.PortalMapper;
+import cn.fateverse.query.mapper.UniQueryMapper;
+import cn.fateverse.query.service.PortalService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Clay
+ * @date 2024/4/15 10:31
+ */
+@Slf4j
+@Service
+public class PortalServiceImpl implements PortalService {
+
+    private final PortalMapper portalMapper;
+
+    private final UniQueryMapper queryMapper;
+
+    private final DataAdapterMapper adapterMapper;
+
+    public PortalServiceImpl(PortalMapper portalMapper,
+                             UniQueryMapper queryMapper,
+                             DataAdapterMapper adapterMapper) {
+        this.portalMapper = portalMapper;
+        this.queryMapper = queryMapper;
+        this.adapterMapper = adapterMapper;
+    }
+
+    @Override
+    public PortalVo searchById(Long portalId) {
+        Portal portal = portalMapper.selectById(portalId);
+        PortalVo vo = PortalVo.toPortalVo(portal);
+
+//        return PortalVo.toPortalVo(portal);
+        return null;
+    }
+
+    @Override
+    public TableDataInfo<SimplePortalVo> searchList(PortalQuery query) {
+        PageUtils.startPage();
+        List<Portal> list = portalMapper.selectList(query);
+        if (ObjectUtils.isEmpty(list)) {
+            return PageUtils.convertDataTable(null, 0L);
+        }
+        List<Long> queryIds = new ArrayList<>();
+        List<Long> adapterIds = new ArrayList<>();
+        list.forEach(portal -> {
+            if (!ObjectUtils.isEmpty(portal.getQueryId())) {
+                queryIds.add(portal.getQueryId());
+            }
+            if (!ObjectUtils.isEmpty(portal.getAdapterId())) {
+                adapterIds.add(portal.getAdapterId());
+            }
+        });
+        Map<Long, UniQuery> queryMap = new HashMap<>();
+        if (!ObjectUtils.isEmpty(queryIds)) {
+            List<UniQuery> queryList = queryMapper.selectListByIds(queryIds);
+            for (UniQuery uniQuery : queryList) {
+                queryMap.put(uniQuery.getId(), uniQuery);
+            }
+        }
+        Map<Long, String> adapterMap = new HashMap<>();
+        if (!ObjectUtils.isEmpty(adapterIds)) {
+            List<DataAdapter> adapterList = adapterMapper.selectListByIds(adapterIds);
+            for (DataAdapter adapter : adapterList) {
+                adapterMap.put(adapter.getAdapterId(), adapter.getAdapterName());
+            }
+        }
+        return PageUtils.convertDataTable(list, portal -> {
+            SimplePortalVo simplePortalVo = SimplePortalVo.toPortalVo(portal);
+            UniQuery uniQuery = queryMap.getOrDefault(portal.getQueryId(), null);
+            if (!ObjectUtils.isEmpty(uniQuery)) {
+                simplePortalVo.setQueryName(uniQuery.getUqName());
+                simplePortalVo.setQueryType(uniQuery.getType());
+            }
+            simplePortalVo.setAdapterName(adapterMap.getOrDefault(portal.getAdapterId(), null));
+            return simplePortalVo;
+        });
+    }
+}
diff --git a/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/QueryToolServiceImpl.java b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/QueryToolServiceImpl.java
new file mode 100644
index 0000000..a58c518
--- /dev/null
+++ b/custom-query/custom-query-biz/src/main/java/cn/fateverse/query/service/impl/QueryToolServiceImpl.java
@@ -0,0 +1,29 @@
+package cn.fateverse.query.service.impl;
+
+import cn.fateverse.query.mapper.UniColumnMapper;
+import cn.fateverse.query.mapper.UniConMapper;
+import cn.fateverse.query.service.QueryToolService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Clay
+ * @date 2024/4/16 16:18
+ */
+@Slf4j
+@Service
+public class QueryToolServiceImpl implements QueryToolService {
+
+    private final UniConMapper uniConMapper;
+
+    private final UniColumnMapper uniColumnMapper;
+
+
+    public QueryToolServiceImpl(UniConMapper uniConMapper,
+                                UniColumnMapper uniColumnMapper) {
+        this.uniConMapper = uniConMapper;
+        this.uniColumnMapper = uniColumnMapper;
+    }
+
+
+}
diff --git a/custom-query/custom-query-biz/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
index 1f8fbac..90bd512 100644
--- a/custom-query/custom-query-biz/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
@@ -19,7 +19,7 @@ import cn.fateverse.query.service.DynamicDataSearchService;
 import cn.fateverse.query.service.DynamicDataSourceTableService;
 import cn.fateverse.query.service.SearchService;
 import cn.fateverse.query.service.SqlSearchService;
-import io.seata.spring.annotation.GlobalTransactional;
+//import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -121,7 +121,7 @@ public class SqlSearchServiceImpl extends SearchService implements SqlSearchServ
     }
 
     @Override
-    @GlobalTransactional
+//    @GlobalTransactional
     public void publish(SqlDto sqlDto) {
         UniQuery query = uniQueryMapper.selectSampleById(sqlDto.getLongQueryId());
         if (query.getPublish()) {
diff --git a/custom-query/custom-query-biz/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
index 5571a6a..de3a610 100644
--- a/custom-query/custom-query-biz/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
@@ -14,7 +14,7 @@ import cn.fateverse.query.entity.dto.TopoDto;
 import cn.fateverse.query.entity.dto.UniConDto;
 import cn.fateverse.query.entity.topology.TopologyBo;
 import com.alibaba.fastjson2.JSON;
-import io.seata.spring.annotation.GlobalTransactional;
+//import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -131,7 +131,7 @@ public class TopologySearchServiceImpl extends SearchService implements Topology
     }
 
     @Override
-    @GlobalTransactional
+//    @GlobalTransactional
     public void publish(TopoDto topo) {
         UniQuery query = uniQueryMapper.selectSampleById(topo.getLongQueryId());
         if (query.getPublish()) {
diff --git a/custom-query/custom-query-biz/src/main/resources/mapper/DataAdapterMapper.xml b/custom-query/custom-query-biz/src/main/resources/mapper/DataAdapterMapper.xml
index 18050aa..1b7ae33 100644
--- a/custom-query/custom-query-biz/src/main/resources/mapper/DataAdapterMapper.xml
+++ b/custom-query/custom-query-biz/src/main/resources/mapper/DataAdapterMapper.xml
@@ -38,6 +38,14 @@
         where adapter_id = #{adapterId}
     </select>
 
+    <select id="selectListByIds" resultType="cn.fateverse.query.entity.DataAdapter">
+        <include refid="selectDataAdapterVo"/>
+        where adapter_id in
+        <foreach collection="list" item="adapterId" open="(" close=")" separator=",">
+            #{adapterId}
+        </foreach>
+    </select>
+
     <insert id="insert" >
         insert into data_adapter
         <trim prefix="(" suffix=")" suffixOverrides=",">
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 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.fateverse.query.mapper.PortalMapper">
+
+    <sql id="selectVo">
+        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
+    </sql>
+
+    <sql id="selectSimpleVo">
+        select portal_id,
+               query_id,
+               adapter_id,
+               portal_name,
+               anonymity,
+               type,
+               path,
+               url,
+               state,
+               create_time,
+               update_time,
+               remark
+        from portal
+    </sql>
+
+
+    <select id="selectById" resultType="cn.fateverse.query.entity.Portal">
+        <include refid="selectVo"/>
+        where portal_id = #{portalId}
+    </select>
+
+    <select id="selectList" resultType="cn.fateverse.query.entity.Portal">
+        <include refid="selectSimpleVo"/>
+        <where>
+            <if test="portalName != null  and portalName != ''"> and portal_name like concat('%', #{portalName}, '%')</if>
+            <if test="anonymity != null "> and anonymity = #{anonymity}</if>
+            <if test="type != null"> and type = #{type}</if>
+            <if test="path != null  and path != ''"> and path like concat('%', #{path}, '%')</if>
+        </where>
+    </select>
+</mapper>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.fateverse.query.mapper.PortalMappingMapper">
+
+    <select id="selectByPortalId" resultType="cn.fateverse.query.entity.PortalMapping">
+        select mapping_id, portal_id, mapping_key, data_type, mapping_value
+        from portal_mapping
+        where portal_id = #{portalId}
+    </select>
+
+
+    <insert id="insertBatch">
+        insert into portal_mapping (portal_id, mapping_key, data_type, mapping_value)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.portalId}, #{item.mappingKey}, #{item.dataType}, #{item.mappingValue})
+        </foreach>
+    </insert>
+
+    <delete id="deleteByPortalId">
+        delete
+        from portal_mapping
+        where portal_id = #{portalId}
+    </delete>
+
+</mapper>
\ 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}
     </select>
 
+    <select id="selectListByIds" resultType="cn.fateverse.query.entity.UniQuery">
+        select id, data_source_id,  uq_name, publish, single, preview, type, create_by, create_time, update_by, update_time
+        from uni_query
+        where id in
+        <foreach collection="list" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <insert id="insert" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         insert into uni_query
         <trim prefix="(" suffix=")" suffixOverrides=",">
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<Map<String, Object>> data) {
+        for (Map<String, Object> 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 @@
     <modules>
         <module>custom-query-biz</module>
         <module>custom-query-submter</module>
+        <module>custom-query-api</module>
     </modules>
 
 </project>
\ 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