update 优化 缩短代码生成模块 包名与模块名

This commit is contained in:
疯狂的狮子Li
2026-03-30 20:02:43 +08:00
parent a6c21ac7d7
commit f1ef471c68
41 changed files with 51 additions and 51 deletions

View File

@@ -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. 再参考当前模块内最近似的标准管理模块。 2. 再参考当前模块内最近似的标准管理模块。
3. 分层保持稳定: 3. 分层保持稳定:
`domain``domain.bo``domain.vo``mapper``service``service.impl``controller` `domain``domain.bo``domain.vo``mapper``service``service.impl``controller`

View File

@@ -29,7 +29,7 @@ description: 在仓库内按代码生成器模板和项目既有约定生成或
## 执行流程 ## 执行流程
1. 先确认目标模块,优先复用同模块中最近似功能的写法。 1. 先确认目标模块,优先复用同模块中最近似功能的写法。
2. 新增标准 CRUD 代码前,先读取 `ruoyi-modules/ruoyi-generator/src/main/resources/vm/` 下的模板。 2. 新增标准 CRUD 代码前,先读取 `ruoyi-modules/ruoyi-gen/src/main/resources/vm/` 下的模板。
3. 命名和分层保持与仓库一致: 3. 命名和分层保持与仓库一致:
`domain` entity、`domain.bo``domain.vo``mapper``service``service.impl``controller` `domain` entity、`domain.bo``domain.vo``mapper``service``service.impl``controller`
4. 优先在生成器结构上扩展,不要自行发明新的分层。 4. 优先在生成器结构上扩展,不要自行发明新的分层。

View File

@@ -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-demo/...`
- `ruoyi-modules/ruoyi-system/...` - `ruoyi-modules/ruoyi-system/...`
- `ruoyi-common/ruoyi-common-mybatis/...` - `ruoyi-common/ruoyi-common-mybatis/...`

View File

@@ -2,8 +2,8 @@
## 优先参考的代码来源 ## 优先参考的代码来源
- `ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/*.vm` - `ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/*.vm`
- `ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/*.vm` - `ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/*.vm`
- 前端工程中与目标模块最接近的现有页面 - 前端工程中与目标模块最接近的现有页面
如果任务涉及前端,先看仓库里实际使用的前端目录和同类页面,不要直接套通用 Vue 习惯。 如果任务涉及前端,先看仓库里实际使用的前端目录和同类页面,不要直接套通用 Vue 习惯。

View File

@@ -343,7 +343,7 @@
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId> <artifactId>ruoyi-gen</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>

View File

@@ -73,7 +73,7 @@
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-generator</artifactId> <artifactId>ruoyi-gen</artifactId>
</dependency> </dependency>
<!-- demo模块 --> <!-- demo模块 -->

View File

@@ -17,7 +17,7 @@
<modules> <modules>
<module>ruoyi-demo</module> <module>ruoyi-demo</module>
<module>ruoyi-generator</module> <module>ruoyi-gen</module>
<module>ruoyi-job</module> <module>ruoyi-job</module>
<module>ruoyi-system</module> <module>ruoyi-system</module>
<module>ruoyi-workflow</module> <module>ruoyi-workflow</module>

View File

@@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-generator</artifactId> <artifactId>ruoyi-gen</artifactId>
<description> <description>
generator 代码生成 generator 代码生成

View File

@@ -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.DynamicRoutingDataSource;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;

View File

@@ -1,4 +1,4 @@
package org.dromara.generator.config.properties; package org.dromara.gen.config.properties;
import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateConfig;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package org.dromara.generator.constant; package org.dromara.gen.constant;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;

View File

@@ -1,4 +1,4 @@
package org.dromara.generator.controller; package org.dromara.gen.controller;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.convert.Convert; 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.core.domain.PageResult;
import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.mybatis.helper.DataBaseHelper;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.generator.domain.GenTable; import org.dromara.gen.domain.GenTable;
import org.dromara.generator.domain.GenTableColumn; import org.dromara.gen.domain.GenTableColumn;
import org.dromara.generator.service.IGenTableService; import org.dromara.gen.service.IGenTableService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

View File

@@ -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.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.domain.BaseEntity; 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.Valid;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

View File

@@ -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.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

View File

@@ -1,8 +1,8 @@
package org.dromara.generator.mapper; package org.dromara.gen.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.generator.domain.GenTableColumn; import org.dromara.gen.domain.GenTableColumn;
/** /**
* 业务字段 数据层 * 业务字段 数据层

View File

@@ -1,9 +1,9 @@
package org.dromara.generator.mapper; package org.dromara.gen.mapper;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.generator.domain.GenTable; import org.dromara.gen.domain.GenTable;
import java.util.List; import java.util.List;

View File

@@ -1,4 +1,4 @@
package org.dromara.generator.service; package org.dromara.gen.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil; 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.json.utils.JsonUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.utils.IdGeneratorUtil; import org.dromara.common.mybatis.utils.IdGeneratorUtil;
import org.dromara.generator.constant.GenConstants; import org.dromara.gen.constant.GenConstants;
import org.dromara.generator.domain.GenTable; import org.dromara.gen.domain.GenTable;
import org.dromara.generator.domain.GenTableColumn; import org.dromara.gen.domain.GenTableColumn;
import org.dromara.generator.mapper.GenTableColumnMapper; import org.dromara.gen.mapper.GenTableColumnMapper;
import org.dromara.generator.mapper.GenTableMapper; import org.dromara.gen.mapper.GenTableMapper;
import org.dromara.generator.util.GenUtils; import org.dromara.gen.util.GenUtils;
import org.dromara.generator.util.TemplateEngineUtils; import org.dromara.gen.util.TemplateEngineUtils;
import org.dromara.generator.util.template.PathNamedTemplate; import org.dromara.gen.util.template.PathNamedTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;

View File

@@ -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.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.domain.PageResult;
import org.dromara.generator.domain.GenTable; import org.dromara.gen.domain.GenTable;
import org.dromara.generator.domain.GenTableColumn; import org.dromara.gen.domain.GenTableColumn;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

View File

@@ -1,14 +1,14 @@
package org.dromara.generator.util; package org.dromara.gen.util;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.RegExUtils;
import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.generator.config.properties.GenProperties; import org.dromara.gen.config.properties.GenProperties;
import org.dromara.generator.constant.GenConstants; import org.dromara.gen.constant.GenConstants;
import org.dromara.generator.domain.GenTable; import org.dromara.gen.domain.GenTable;
import org.dromara.generator.domain.GenTableColumn; import org.dromara.gen.domain.GenTableColumn;
import java.util.Arrays; import java.util.Arrays;

View File

@@ -1,4 +1,4 @@
package org.dromara.generator.util; package org.dromara.gen.util;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; 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.json.utils.JsonUtils;
import org.dromara.common.mybatis.enums.DataBaseType; import org.dromara.common.mybatis.enums.DataBaseType;
import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.mybatis.helper.DataBaseHelper;
import org.dromara.generator.config.properties.GenProperties; import org.dromara.gen.config.properties.GenProperties;
import org.dromara.generator.constant.GenConstants; import org.dromara.gen.constant.GenConstants;
import org.dromara.generator.domain.GenTable; import org.dromara.gen.domain.GenTable;
import org.dromara.generator.domain.GenTableColumn; import org.dromara.gen.domain.GenTableColumn;
import org.dromara.generator.util.template.PathNamedTemplate; import org.dromara.gen.util.template.PathNamedTemplate;
import java.util.*; import java.util.*;
import java.util.function.Consumer; 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;
/** /**
* 模板引擎工具 * 模板引擎工具

View File

@@ -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.Template;
import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateEngine;

View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.generator.mapper.GenTableColumnMapper"> <mapper namespace="org.dromara.gen.mapper.GenTableColumnMapper">
<resultMap type="org.dromara.generator.domain.GenTableColumn" id="GenTableColumnResult"> <resultMap type="org.dromara.gen.domain.GenTableColumn" id="GenTableColumnResult">
</resultMap> </resultMap>
</mapper> </mapper>

View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.generator.mapper.GenTableMapper"> <mapper namespace="org.dromara.gen.mapper.GenTableMapper">
<select id="selectTableNameList" resultType="java.lang.String"> <select id="selectTableNameList" resultType="java.lang.String">
select table_name from gen_table where data_name = #{dataName,jdbcType=VARCHAR} select table_name from gen_table where data_name = #{dataName,jdbcType=VARCHAR}
</select> </select>