若依 3.0

ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java → ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

-package com.ruoyi.project.tool.gen.controller;
+package com.ruoyi.generator.controller;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.tool.gen.domain.GenTable;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
-import com.ruoyi.project.tool.gen.service.IGenTableColumnService;
-import com.ruoyi.project.tool.gen.service.IGenTableService;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.service.IGenTableColumnService;
+import com.ruoyi.generator.service.IGenTableService;
 
 /**
  * 代码生成 操作处理
@@ -183,4 +183,4 @@ public class GenController extends BaseController
         response.setContentType("application/octet-stream; charset=UTF-8");
         IOUtils.write(data, response.getOutputStream());
     }
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java → ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

-package com.ruoyi.project.tool.gen.domain;
+package com.ruoyi.generator.domain;
 
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.BaseEntity;
 
 /**
  * 业务表 gen_table
@@ -268,4 +268,4 @@ public class GenTable extends BaseEntity
         }
         return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
     }
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java → ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

-package com.ruoyi.project.tool.gen.domain;
+package com.ruoyi.generator.domain;
 
 import javax.validation.constraints.NotBlank;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.BaseEntity;
 
 /**
  * 代码生成业务字段表 gen_table_column
@@ -365,4 +365,4 @@ public class GenTableColumn extends BaseEntity
             return this.columnComment;
         }
     }
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java → ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java

-package com.ruoyi.project.tool.gen.mapper;
+package com.ruoyi.generator.mapper;
 
 import java.util.List;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 业务字段 数据层
@@ -49,4 +49,4 @@ public interface GenTableColumnMapper
      * @return 结果
      */
     public int deleteGenTableColumnByIds(Long[] ids);
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java → ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

-package com.ruoyi.project.tool.gen.mapper;
+package com.ruoyi.generator.mapper;
 
 import java.util.List;
-import com.ruoyi.project.tool.gen.domain.GenTable;
+import com.ruoyi.generator.domain.GenTable;
 
 /**
  * 业务 数据层
@@ -73,4 +73,4 @@ public interface GenTableMapper
      * @return 结果
      */
     public int deleteGenTableByIds(Long[] ids);
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java

-package com.ruoyi.project.tool.gen.service;
+package com.ruoyi.generator.service;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
-import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.mapper.GenTableColumnMapper;
 
 /**
  * 业务字段 服务层实现
@@ -65,4 +65,4 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService
 	{
 		return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
 	}
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

-package com.ruoyi.project.tool.gen.service;
+package com.ruoyi.generator.service;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -24,13 +24,13 @@ import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.tool.gen.domain.GenTable;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
-import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper;
-import com.ruoyi.project.tool.gen.mapper.GenTableMapper;
-import com.ruoyi.project.tool.gen.util.GenUtils;
-import com.ruoyi.project.tool.gen.util.VelocityInitializer;
-import com.ruoyi.project.tool.gen.util.VelocityUtils;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.mapper.GenTableColumnMapper;
+import com.ruoyi.generator.mapper.GenTableMapper;
+import com.ruoyi.generator.util.GenUtils;
+import com.ruoyi.generator.util.VelocityInitializer;
+import com.ruoyi.generator.util.VelocityUtils;
 
 /**
  * 业务 服务层实现
@@ -342,4 +342,4 @@ public class GenTableServiceImpl implements IGenTableService
             genTable.setTreeName(treeName);
         }
     }
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java

-package com.ruoyi.project.tool.gen.service;
+package com.ruoyi.generator.service;
 
 import java.util.List;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 业务字段 服务层

ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

-package com.ruoyi.project.tool.gen.service;
+package com.ruoyi.generator.service;
 
 import java.util.List;
 import java.util.Map;
-import com.ruoyi.project.tool.gen.domain.GenTable;
+import com.ruoyi.generator.domain.GenTable;
 
 /**
  * 业务 服务层

ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

-package com.ruoyi.project.tool.gen.util;
+package com.ruoyi.generator.util;
 
 import java.util.Arrays;
 import org.apache.commons.lang3.RegExUtils;
 import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.GenConfig;
-import com.ruoyi.project.tool.gen.domain.GenTable;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.generator.config.GenConfig;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 代码生成器 工具类
@@ -239,4 +239,4 @@ public class GenUtils
             return 0;
         }
     }
-}
+}
\ No newline at end of file

ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

-package com.ruoyi.project.tool.gen.util;
+package com.ruoyi.generator.util;
 
 import java.util.Properties;
 import org.apache.velocity.app.Velocity;

ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

-package com.ruoyi.project.tool.gen.util;
+package com.ruoyi.generator.util;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -8,16 +8,21 @@ import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.tool.gen.domain.GenTable;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
 
+/**
+ * 代码生成模板处理
+ * 
+ * @author ruoyi
+ */
 public class VelocityUtils
 {
     /** 项目空间路径 */
     private static final String PROJECT_PATH = "main/java";
 
     /** mybatis空间路径 */
-    private static final String MYBATIS_PATH = "main/resources/mybatis";
+    private static final String MYBATIS_PATH = "main/resources/mapper";
 
     /**
      * 设置模板变量信息
@@ -290,4 +295,4 @@ public class VelocityUtils
         }
         return num;
     }
-}
+}
\ No newline at end of file

ruoyi-generator/src/main/resources/generator.yml

+# 代码生成
+gen: 
+  # 作者
+  author: ruoyi
+  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
+  packageName: com.ruoyi.system
+  # 自动去除表前缀，默认是false
+  autoRemovePre: false
+  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
+  tablePrefix: sys_
\ No newline at end of file

ruoyi/src/main/resources/mybatis/tool/GenTableColumnMapper.xml → ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.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="com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper">
+<mapper namespace="com.ruoyi.generator.mapper.GenTableColumnMapper">
     
     <resultMap type="GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />

ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml → ruoyi-generator/src/main/resources/mapper/generator/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="com.ruoyi.project.tool.gen.mapper.GenTableMapper">
+<mapper namespace="com.ruoyi.generator.mapper.GenTableMapper">
 
 	<resultMap type="GenTable" id="GenTableResult">
 	    <id     property="tableId"        column="table_id"        />

ruoyi/src/main/resources/vm/java/controller.java.vm → ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 #if($table.crud)
-import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableDataInfo;
 #elseif($table.tree)
 #end
 

ruoyi/src/main/resources/vm/java/domain.java.vm → ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -5,11 +5,11 @@ import ${import};
 #end
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.common.annotation.Excel;
 #if($table.crud)
-import com.ruoyi.framework.web.domain.BaseEntity;
+import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
-import com.ruoyi.framework.web.domain.TreeEntity;
+import com.ruoyi.common.core.domain.TreeEntity;
 #end
 
 /**