From f1ef471c684db4c5c299c40b44b9c98697a674f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 30 Mar 2026 20:02:43 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E7=BC=A9?= =?UTF-8?q?=E7=9F=AD=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=20=E5=8C=85=E5=90=8D=E4=B8=8E=E6=A8=A1=E5=9D=97=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/agents/backend-crud.md | 2 +- .codex/skills/ruoyi-plus-ai-coding/SKILL.md | 2 +- .../ruoyi-plus-ai-coding/references/backend.md | 2 +- .../references/frontend.md | 4 ++-- pom.xml | 2 +- ruoyi-admin/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- .../{ruoyi-generator => ruoyi-gen}/pom.xml | 2 +- .../gen}/config/MyBatisDataSourceMonitor.java | 2 +- .../gen}/config/properties/GenProperties.java | 2 +- .../dromara/gen}/constant/GenConstants.java | 2 +- .../dromara/gen}/controller/GenController.java | 8 ++++---- .../java/org/dromara/gen}/domain/GenTable.java | 4 ++-- .../dromara/gen}/domain/GenTableColumn.java | 2 +- .../gen}/mapper/GenTableColumnMapper.java | 4 ++-- .../dromara/gen}/mapper/GenTableMapper.java | 4 ++-- .../gen}/service/GenTableServiceImpl.java | 18 +++++++++--------- .../dromara/gen}/service/IGenTableService.java | 6 +++--- .../java/org/dromara/gen}/util/GenUtils.java | 10 +++++----- .../dromara/gen}/util/TemplateEngineUtils.java | 14 +++++++------- .../gen}/util/template/PathNamedTemplate.java | 2 +- .../src/main/resources/generator.yml | 0 .../mapper/gen}/GenTableColumnMapper.xml | 4 ++-- .../resources/mapper/gen}/GenTableMapper.xml | 2 +- .../src/main/resources/mapper/package-info.md | 0 .../src/main/resources/vm/java/bo.java.vm | 0 .../main/resources/vm/java/controller.java.vm | 0 .../src/main/resources/vm/java/domain.java.vm | 0 .../src/main/resources/vm/java/mapper.java.vm | 0 .../src/main/resources/vm/java/service.java.vm | 0 .../main/resources/vm/java/serviceImpl.java.vm | 0 .../src/main/resources/vm/java/vo.java.vm | 0 .../src/main/resources/vm/sql/mysql.sql.vm | 0 .../src/main/resources/vm/sql/oracle.sql.vm | 0 .../src/main/resources/vm/sql/postgres.sql.vm | 0 .../src/main/resources/vm/sql/sqlserver.sql.vm | 0 .../src/main/resources/vm/ts/api.ts.vm | 0 .../src/main/resources/vm/ts/types.ts.vm | 0 .../main/resources/vm/vue/index-tree.vue.vm | 0 .../src/main/resources/vm/vue/index.vue.vm | 0 .../src/main/resources/vm/xml/mapper.xml.vm | 0 41 files changed, 51 insertions(+), 51 deletions(-) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/pom.xml (98%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/config/MyBatisDataSourceMonitor.java (99%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/config/properties/GenProperties.java (95%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/constant/GenConstants.java (99%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/controller/GenController.java (97%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/domain/GenTable.java (98%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/domain/GenTableColumn.java (99%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/mapper/GenTableColumnMapper.java (79%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/mapper/GenTableMapper.java (89%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/service/GenTableServiceImpl.java (98%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/service/IGenTableService.java (95%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/util/GenUtils.java (97%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/util/TemplateEngineUtils.java (97%) rename ruoyi-modules/{ruoyi-generator/src/main/java/org/dromara/generator => ruoyi-gen/src/main/java/org/dromara/gen}/util/template/PathNamedTemplate.java (97%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/generator.yml (100%) rename ruoyi-modules/{ruoyi-generator/src/main/resources/mapper/generator => ruoyi-gen/src/main/resources/mapper/gen}/GenTableColumnMapper.xml (51%) rename ruoyi-modules/{ruoyi-generator/src/main/resources/mapper/generator => ruoyi-gen/src/main/resources/mapper/gen}/GenTableMapper.xml (83%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/mapper/package-info.md (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/java/bo.java.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/java/controller.java.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/java/domain.java.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/java/mapper.java.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/java/service.java.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/java/serviceImpl.java.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/java/vo.java.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/sql/mysql.sql.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/sql/oracle.sql.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/sql/postgres.sql.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/sql/sqlserver.sql.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/ts/api.ts.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/ts/types.ts.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/vue/index-tree.vue.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/vue/index.vue.vm (100%) rename ruoyi-modules/{ruoyi-generator => ruoyi-gen}/src/main/resources/vm/xml/mapper.xml.vm (100%) diff --git a/.claude/agents/backend-crud.md b/.claude/agents/backend-crud.md index 5bd8e28b5..0dc8b334c 100644 --- a/.claude/agents/backend-crud.md +++ b/.claude/agents/backend-crud.md @@ -7,7 +7,7 @@ description: 标准后端 CRUD 专家。用于当前项目中的新增单表 CRU ## 核心原则 -1. 先参考 `ruoyi-modules/ruoyi-generator/src/main/resources/vm/` 下的模板。 +1. 先参考 `ruoyi-modules/ruoyi-gen/src/main/resources/vm/` 下的模板。 2. 再参考当前模块内最近似的标准管理模块。 3. 分层保持稳定： `domain`、`domain.bo`、`domain.vo`、`mapper`、`service`、`service.impl`、`controller` diff --git a/.codex/skills/ruoyi-plus-ai-coding/SKILL.md b/.codex/skills/ruoyi-plus-ai-coding/SKILL.md index a1d9f84a7..cea7f02d7 100644 --- a/.codex/skills/ruoyi-plus-ai-coding/SKILL.md +++ b/.codex/skills/ruoyi-plus-ai-coding/SKILL.md @@ -29,7 +29,7 @@ description: 在仓库内按代码生成器模板和项目既有约定生成或 ## 执行流程 1. 先确认目标模块，优先复用同模块中最近似功能的写法。 -2. 新增标准 CRUD 代码前，先读取 `ruoyi-modules/ruoyi-generator/src/main/resources/vm/` 下的模板。 +2. 新增标准 CRUD 代码前，先读取 `ruoyi-modules/ruoyi-gen/src/main/resources/vm/` 下的模板。 3. 命名和分层保持与仓库一致： `domain` entity、`domain.bo`、`domain.vo`、`mapper`、`service`、`service.impl`、`controller`。 4. 优先在生成器结构上扩展，不要自行发明新的分层。 diff --git a/.codex/skills/ruoyi-plus-ai-coding/references/backend.md b/.codex/skills/ruoyi-plus-ai-coding/references/backend.md index 8bd91e531..061361d4f 100644 --- a/.codex/skills/ruoyi-plus-ai-coding/references/backend.md +++ b/.codex/skills/ruoyi-plus-ai-coding/references/backend.md @@ -2,7 +2,7 @@ ## 优先参考的代码来源 -- `ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/*.vm` +- `ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/*.vm` - `ruoyi-modules/ruoyi-demo/...` - `ruoyi-modules/ruoyi-system/...` - `ruoyi-common/ruoyi-common-mybatis/...` diff --git a/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md b/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md index 609e105da..f77a22653 100644 --- a/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md +++ b/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md @@ -2,8 +2,8 @@ ## 优先参考的代码来源 -- `ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/*.vm` -- `ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/*.vm` +- `ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/*.vm` +- `ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/*.vm` - 前端工程中与目标模块最接近的现有页面 如果任务涉及前端，先看仓库里实际使用的前端目录和同类页面，不要直接套通用 Vue 习惯。 diff --git a/pom.xml b/pom.xml index 8b589aa5d..9046f1c70 100644 --- a/pom.xml +++ b/pom.xml @@ -343,7 +343,7 @@ org.dromara - ruoyi-generator + ruoyi-gen ${revision} diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 30e10dda0..68d158772 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -73,7 +73,7 @@ org.dromara - ruoyi-generator + ruoyi-gen diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index b326ebc66..971929a54 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -17,7 +17,7 @@ ruoyi-demo - ruoyi-generator + ruoyi-gen ruoyi-job ruoyi-system ruoyi-workflow diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml similarity index 98% rename from ruoyi-modules/ruoyi-generator/pom.xml rename to ruoyi-modules/ruoyi-gen/pom.xml index 49060292f..b5c29d7c9 100644 --- a/ruoyi-modules/ruoyi-generator/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - ruoyi-generator + ruoyi-gen generator 代码生成 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java similarity index 99% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java index 3e35bdc6b..6ddcc8985 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java @@ -1,4 +1,4 @@ -package org.dromara.generator.config; +package org.dromara.gen.config; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/properties/GenProperties.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/properties/GenProperties.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/properties/GenProperties.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/properties/GenProperties.java index 60071a303..9e911c2c5 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/properties/GenProperties.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/properties/GenProperties.java @@ -1,4 +1,4 @@ -package org.dromara.generator.config.properties; +package org.dromara.gen.config.properties; import cn.hutool.extra.template.TemplateConfig; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java similarity index 99% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java index 5c7ac3e81..e7c897b88 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java @@ -1,4 +1,4 @@ -package org.dromara.generator.constant; +package org.dromara.gen.constant; import cn.hutool.core.collection.CollUtil; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java index d37248d24..c349b745a 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java @@ -1,4 +1,4 @@ -package org.dromara.generator.controller; +package org.dromara.gen.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; @@ -14,9 +14,9 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.web.core.BaseController; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.service.IGenTableService; +import org.dromara.gen.domain.GenTable; +import org.dromara.gen.domain.GenTableColumn; +import org.dromara.gen.service.IGenTableService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java similarity index 98% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java index 1ee32e64f..097145b8c 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java @@ -1,4 +1,4 @@ -package org.dromara.generator.domain; +package org.dromara.gen.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.generator.constant.GenConstants; +import org.dromara.gen.constant.GenConstants; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java similarity index 99% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java index f0caa5b21..eed90061f 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java @@ -1,4 +1,4 @@ -package org.dromara.generator.domain; +package org.dromara.gen.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java similarity index 79% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java index ed8ed2038..eee041a27 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java @@ -1,8 +1,8 @@ -package org.dromara.generator.mapper; +package org.dromara.gen.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTableColumn; +import org.dromara.gen.domain.GenTableColumn; /** * 业务字段 数据层 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java similarity index 89% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java index 802d9ade5..d74050ed3 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package org.dromara.generator.mapper; +package org.dromara.gen.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.generator.domain.GenTable; +import org.dromara.gen.domain.GenTable; import java.util.List; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java index a1bcd29ea..1572b8cfe 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.generator.service; +package org.dromara.gen.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -24,14 +24,14 @@ import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.utils.IdGeneratorUtil; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.mapper.GenTableColumnMapper; -import org.dromara.generator.mapper.GenTableMapper; -import org.dromara.generator.util.GenUtils; -import org.dromara.generator.util.TemplateEngineUtils; -import org.dromara.generator.util.template.PathNamedTemplate; +import org.dromara.gen.constant.GenConstants; +import org.dromara.gen.domain.GenTable; +import org.dromara.gen.domain.GenTableColumn; +import org.dromara.gen.mapper.GenTableColumnMapper; +import org.dromara.gen.mapper.GenTableMapper; +import org.dromara.gen.util.GenUtils; +import org.dromara.gen.util.TemplateEngineUtils; +import org.dromara.gen.util.template.PathNamedTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java similarity index 95% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java index 18f03c977..39ff6ffe5 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java @@ -1,9 +1,9 @@ -package org.dromara.generator.service; +package org.dromara.gen.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.PageResult; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import org.dromara.gen.domain.GenTable; +import org.dromara.gen.domain.GenTableColumn; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java index cc047c146..c389ac757 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java @@ -1,14 +1,14 @@ -package org.dromara.generator.util; +package org.dromara.gen.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.RegExUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.generator.config.properties.GenProperties; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; +import org.dromara.gen.config.properties.GenProperties; +import org.dromara.gen.constant.GenConstants; +import org.dromara.gen.domain.GenTable; +import org.dromara.gen.domain.GenTableColumn; import java.util.Arrays; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/TemplateEngineUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/TemplateEngineUtils.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java index bbda0a6e5..b9d0f39b8 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/TemplateEngineUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java @@ -1,4 +1,4 @@ -package org.dromara.generator.util; +package org.dromara.gen.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -14,16 +14,16 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.enums.DataBaseType; import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.generator.config.properties.GenProperties; -import org.dromara.generator.constant.GenConstants; -import org.dromara.generator.domain.GenTable; -import org.dromara.generator.domain.GenTableColumn; -import org.dromara.generator.util.template.PathNamedTemplate; +import org.dromara.gen.config.properties.GenProperties; +import org.dromara.gen.constant.GenConstants; +import org.dromara.gen.domain.GenTable; +import org.dromara.gen.domain.GenTableColumn; +import org.dromara.gen.util.template.PathNamedTemplate; import java.util.*; import java.util.function.Consumer; -import static org.dromara.generator.constant.GenConstants.TS_TYPES_TEMPLATE_PATH; +import static org.dromara.gen.constant.GenConstants.TS_TYPES_TEMPLATE_PATH; /** * 模板引擎工具 diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/template/PathNamedTemplate.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/template/PathNamedTemplate.java similarity index 97% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/template/PathNamedTemplate.java rename to ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/template/PathNamedTemplate.java index aa74fe997..e16548213 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/template/PathNamedTemplate.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/template/PathNamedTemplate.java @@ -1,4 +1,4 @@ -package org.dromara.generator.util.template; +package org.dromara.gen.util.template; import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateEngine; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/generator.yml similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml rename to ruoyi-modules/ruoyi-gen/src/main/resources/generator.yml diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableColumnMapper.xml similarity index 51% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableColumnMapper.xml index fc1c6104b..f48af47f9 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableColumnMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableMapper.xml similarity index 83% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableMapper.xml index 0a08ad15e..0e5ce4d86 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md rename to ruoyi-modules/ruoyi-gen/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/mysql.sql.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/mysql.sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/mysql.sql.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/mysql.sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle.sql.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/oracle.sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle.sql.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/oracle.sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres.sql.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/postgres.sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres.sql.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/postgres.sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver.sql.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sqlserver.sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver.sql.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sqlserver.sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/types.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/types.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm