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

ruoyi-modules/pom.xml

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

ruoyi-modules/ruoyi-gen/pom.xml

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

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;

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;

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;
 

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.*;
 

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;

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;

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;
 
 /**
  * 业务字段 数据层

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;
 

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;
 

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;

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;
 

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;
 
 /**
  * 模板引擎工具

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;

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableColumnMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "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>
 
 </mapper>

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/gen/GenTableMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "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 table_name from gen_table where data_name = #{dataName,jdbcType=VARCHAR}
     </select>