自动生成代码逻辑调整

ruoyi-generator/src/main/java/com/slibra/generator/config/GenConfig.java → ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java

@@ -1,4 +1,4 @@
-package com.slibra.generator.config;
+package com.ruoyi.generator.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;

ruoyi-generator/src/main/java/com/slibra/generator/controller/GenController.java → ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -1,4 +1,4 @@
-package com.slibra.generator.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.slibra.common.annotation.Log;
-import com.slibra.common.core.controller.BaseController;
-import com.slibra.common.core.domain.AjaxResult;
-import com.slibra.common.core.page.TableDataInfo;
-import com.slibra.common.core.text.Convert;
-import com.slibra.common.enums.BusinessType;
-import com.slibra.generator.domain.GenTable;
-import com.slibra.generator.domain.GenTableColumn;
-import com.slibra.generator.service.IGenTableColumnService;
-import com.slibra.generator.service.IGenTableService;
+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.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;
 
 /**
  * 代码生成 操作处理

ruoyi-generator/src/main/java/com/slibra/generator/domain/GenTable.java → ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -1,12 +1,12 @@
-package com.slibra.generator.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.slibra.common.constant.GenConstants;
-import com.slibra.common.core.domain.BaseEntity;
-import com.slibra.common.utils.StringUtils;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 业务表 gen_table

ruoyi-generator/src/main/java/com/slibra/generator/domain/GenTableColumn.java → ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

@@ -1,8 +1,8 @@
-package com.slibra.generator.domain;
+package com.ruoyi.generator.domain;
 
 import javax.validation.constraints.NotBlank;
-import com.slibra.common.core.domain.BaseEntity;
-import com.slibra.common.utils.StringUtils;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 代码生成业务字段表 gen_table_column

ruoyi-generator/src/main/java/com/slibra/generator/mapper/GenTableColumnMapper.java → ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java

@@ -1,7 +1,8 @@
-package com.slibra.generator.mapper;
+package com.ruoyi.generator.mapper;
 
 import java.util.List;
-import com.slibra.generator.domain.GenTableColumn;
+
+import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 业务字段 数据层

ruoyi-generator/src/main/java/com/slibra/generator/mapper/GenTableMapper.java → ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

@@ -1,7 +1,8 @@
-package com.slibra.generator.mapper;
+package com.ruoyi.generator.mapper;
 
 import java.util.List;
-import com.slibra.generator.domain.GenTable;
+
+import com.ruoyi.generator.domain.GenTable;
 
 /**
  * 业务 数据层

ruoyi-generator/src/main/java/com/slibra/generator/service/GenTableColumnServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java

@@ -1,11 +1,11 @@
-package com.slibra.generator.service;
+package com.ruoyi.generator.service;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.slibra.common.core.text.Convert;
-import com.slibra.generator.domain.GenTableColumn;
-import com.slibra.generator.mapper.GenTableColumnMapper;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.mapper.GenTableColumnMapper;
 
 /**
  * 业务字段 服务层实现

ruoyi-generator/src/main/java/com/slibra/generator/service/GenTableServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -1,4 +1,4 @@
-package com.slibra.generator.service;
+package com.ruoyi.generator.service;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -23,19 +23,19 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.slibra.common.constant.Constants;
-import com.slibra.common.constant.GenConstants;
-import com.slibra.common.core.text.CharsetKit;
-import com.slibra.common.exception.ServiceException;
-import com.slibra.common.utils.SecurityUtils;
-import com.slibra.common.utils.StringUtils;
-import com.slibra.generator.domain.GenTable;
-import com.slibra.generator.domain.GenTableColumn;
-import com.slibra.generator.mapper.GenTableColumnMapper;
-import com.slibra.generator.mapper.GenTableMapper;
-import com.slibra.generator.util.GenUtils;
-import com.slibra.generator.util.VelocityInitializer;
-import com.slibra.generator.util.VelocityUtils;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.core.text.CharsetKit;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+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;
 
 /**
  * 业务 服务层实现

ruoyi-generator/src/main/java/com/slibra/generator/service/IGenTableColumnService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java

@@ -1,7 +1,8 @@
-package com.slibra.generator.service;
+package com.ruoyi.generator.service;
 
 import java.util.List;
-import com.slibra.generator.domain.GenTableColumn;
+
+import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 业务字段 服务层

ruoyi-generator/src/main/java/com/slibra/generator/service/IGenTableService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

@@ -1,8 +1,9 @@
-package com.slibra.generator.service;
+package com.ruoyi.generator.service;
 
 import java.util.List;
 import java.util.Map;
-import com.slibra.generator.domain.GenTable;
+
+import com.ruoyi.generator.domain.GenTable;
 
 /**
  * 业务 服务层

ruoyi-generator/src/main/java/com/slibra/generator/util/GenUtils.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

@@ -1,12 +1,12 @@
-package com.slibra.generator.util;
+package com.ruoyi.generator.util;
 
 import java.util.Arrays;
 import org.apache.commons.lang3.RegExUtils;
-import com.slibra.common.constant.GenConstants;
-import com.slibra.common.utils.StringUtils;
-import com.slibra.generator.config.GenConfig;
-import com.slibra.generator.domain.GenTable;
-import com.slibra.generator.domain.GenTableColumn;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.generator.config.GenConfig;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 代码生成器 工具类

ruoyi-generator/src/main/java/com/slibra/generator/util/VelocityInitializer.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java

@@ -1,8 +1,8 @@
-package com.slibra.generator.util;
+package com.ruoyi.generator.util;
 
 import java.util.Properties;
 import org.apache.velocity.app.Velocity;
-import com.slibra.common.constant.Constants;
+import com.ruoyi.common.constant.Constants;
 
 /**
  * VelocityEngine工厂

ruoyi-generator/src/main/java/com/slibra/generator/util/VelocityUtils.java → ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -1,4 +1,4 @@
-package com.slibra.generator.util;
+package com.ruoyi.generator.util;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -7,11 +7,11 @@ import java.util.Set;
 import org.apache.velocity.VelocityContext;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.slibra.common.constant.GenConstants;
-import com.slibra.common.utils.DateUtils;
-import com.slibra.common.utils.StringUtils;
-import com.slibra.generator.domain.GenTable;
-import com.slibra.generator.domain.GenTableColumn;
+import com.ruoyi.common.constant.GenConstants;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 模板处理工具类

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.slibra.generator.mapper.GenTableColumnMapper">
+<mapper namespace="com.ruoyi.generator.mapper.GenTableColumnMapper">
 
     <resultMap type="GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />

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.slibra.generator.mapper.GenTableMapper">
+<mapper namespace="com.ruoyi.generator.mapper.GenTableMapper">
 
 	<resultMap type="GenTable" id="GenTableResult">
 	    <id     property="tableId"        column="table_id"          />