diff --git a/.drone.yml b/.drone.yml index 0a1d109..f1d8d41 100644 --- a/.drone.yml +++ b/.drone.yml @@ -94,7 +94,7 @@ trigger: - log-biz - monitor - code-gen - - custom-query + - custom-query-biz - sentinel-dashboard - workflow 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/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/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 98% rename from visual/code-gen/pom.xml rename to code-gen/pom.xml index 1fc3df3..c30252f 100644 --- a/visual/code-gen/pom.xml +++ b/code-gen/pom.xml @@ -3,7 +3,7 @@ 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 + fateverse cn.fateverse 1.0.0 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/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/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 list = (List) 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 collection = (Collection) 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 children; +} diff --git a/common/common-security/src/main/java/cn/fateverse/common/security/handle/AuthenticationEntryPointImpl.java b/common/common-security/src/main/java/cn/fateverse/common/security/handle/AuthenticationEntryPointImpl.java index 031db47..bf23331 100644 --- a/common/common-security/src/main/java/cn/fateverse/common/security/handle/AuthenticationEntryPointImpl.java +++ b/common/common-security/src/main/java/cn/fateverse/common/security/handle/AuthenticationEntryPointImpl.java @@ -1,5 +1,6 @@ package cn.fateverse.common.security.handle; +import cn.fateverse.common.security.utils.ResponseRender; import cn.hutool.core.text.StrFormatter; import cn.fateverse.common.core.result.Result; import com.alibaba.fastjson2.JSON; @@ -35,24 +36,9 @@ public class AuthenticationEntryPointImpl implements AccessDeniedHandler, Authen public void accessDenied(HttpServletRequest request, HttpServletResponse response) { String msg = StrFormatter.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI()); - renderString(response,Result.unauthorized(msg)); + ResponseRender.renderString(response,Result.unauthorized(msg)); } - /** - * 将字符串渲染到客户端 - * - * @param response 渲染对象 - * @param result 返回的错误对象 - */ - public static void renderString(HttpServletResponse response, Result result) { - try { - response.setStatus(result.getStatus().value()); - response.setContentType("application/json"); - response.setCharacterEncoding("utf-8"); - response.getWriter().print(JSON.toJSONString(result)); - } catch (IOException e) { - e.printStackTrace(); - } - } + } diff --git a/common/common-security/src/main/java/cn/fateverse/common/security/utils/ResponseRender.java b/common/common-security/src/main/java/cn/fateverse/common/security/utils/ResponseRender.java new file mode 100644 index 0000000..fbdc688 --- /dev/null +++ b/common/common-security/src/main/java/cn/fateverse/common/security/utils/ResponseRender.java @@ -0,0 +1,30 @@ +package cn.fateverse.common.security.utils; + +import cn.fateverse.common.core.result.Result; +import com.alibaba.fastjson2.JSON; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author Clay + * @date 2024/4/19 9:09 + */ +public class ResponseRender { + /** + * 将字符串渲染到客户端 + * + * @param response 渲染对象 + * @param result 返回的错误对象 + */ + public static void renderString(HttpServletResponse response, Result result) { + try { + response.setStatus(result.getStatus().value()); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().print(JSON.toJSONString(result)); + } catch (IOException e) { + e.printStackTrace(); + } + } +} 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 @@ + + + + custom-query + cn.fateverse + 1.0.0 + + 4.0.0 + + custom-query-api + + + 11 + 11 + + + + + cn.fateverse + common-dubbo + + + org.apache.dubbo.extensions + dubbo-cluster-specify-address-dubbo3 + 1.0.0 + + + org.apache.dubbo + dubbo + + + + + cn.fateverse + common-dubbo + + + + \ No newline at end of file diff --git a/custom-query/custom-query-api/src/main/java/cn/fateverse/query/dubbo/DubboDispatchServletPublish.java b/custom-query/custom-query-api/src/main/java/cn/fateverse/query/dubbo/DubboDispatchServletPublish.java new file mode 100644 index 0000000..246ca62 --- /dev/null +++ b/custom-query/custom-query-api/src/main/java/cn/fateverse/query/dubbo/DubboDispatchServletPublish.java @@ -0,0 +1,17 @@ +package cn.fateverse.query.dubbo; + + +/** + * @author Clay + * @date 2024/4/19 10:56 + */ +public interface DubboDispatchServletPublish { + + + Boolean publish(String path, String requestMethod); + + + Boolean unpublish(String path, String requestMethod); + + +} diff --git a/custom-query/custom-query-api/src/main/java/cn/fateverse/query/package-info.java b/custom-query/custom-query-api/src/main/java/cn/fateverse/query/package-info.java new file mode 100644 index 0000000..f6acb9f --- /dev/null +++ b/custom-query/custom-query-api/src/main/java/cn/fateverse/query/package-info.java @@ -0,0 +1,5 @@ +/** + * @author Clay + * @date 2024/4/15 11:49 + */ +package cn.fateverse.query; \ No newline at end of file diff --git a/visual/custom-query/pom.xml b/custom-query/custom-query-biz/pom.xml similarity index 82% rename from visual/custom-query/pom.xml rename to custom-query/custom-query-biz/pom.xml index 3ae5af9..f037425 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 @@ -40,9 +49,14 @@ cn.fateverse admin-api + + + + cn.fateverse - common-seata + custom-query-api + 1.0.0 org.mariadb.jdbc @@ -89,4 +103,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 73% 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 index 9f79392..8c07ad9 100644 --- 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 @@ -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/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 89% 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 index d3422a0..f0a9cfd 100644 --- 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 @@ -1,13 +1,15 @@ 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; 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; @@ -39,6 +41,7 @@ public class DataAdapterController { @ApiOperation("获取数据源适配器列表") + @Encrypt @GetMapping @PreAuthorize("@ss.hasPermission('query:adapter:list')") public Result> list(DataAdapterQuery query) { @@ -47,9 +50,10 @@ public class DataAdapterController { } @ApiOperation("获取校验规则option") + @Encrypt @GetMapping("/option") - public Result> option() { - List