diff --git a/server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java similarity index 100% rename from server/like-generator/src/main/java/com/hxkj/admin/config/GenConfig.java rename to server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java diff --git a/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java rename to server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index 92df954f..815698ed 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -1,14 +1,14 @@ -package com.hxkj.admin.controller; +package com.hxkj.generator.controller; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; -import com.hxkj.admin.service.IGenerateService; -import com.hxkj.admin.validate.GenParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.DbTableVo; -import com.hxkj.admin.vo.GenTableVo; +import com.hxkj.generator.service.IGenerateService; +import com.hxkj.generator.validate.GenParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java rename to server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java index 137d44b9..4c848652 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTable.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTable.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.entity; +package com.hxkj.generator.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java similarity index 96% rename from server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java rename to server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java index 7f2fac31..1b39cc4a 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/entity/GenTableColumn.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/entity/GenTableColumn.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.entity; +package com.hxkj.generator.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java similarity index 71% rename from server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java rename to server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java index d217a96e..218db9e2 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableColumnMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.hxkj.admin.mapper; +package com.hxkj.generator.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.generator.entity.GenTableColumn; import org.apache.ibatis.annotations.Mapper; /** diff --git a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java rename to server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java index dcfff793..52f6a924 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package com.hxkj.admin.mapper; +package com.hxkj.generator.mapper; import com.hxkj.common.core.basics.IBaseMapper; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; -import com.hxkj.admin.vo.DbTableVo; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.generator.vo.DbTableVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java similarity index 87% rename from server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java rename to server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index e34daae4..7c049ca1 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -1,10 +1,10 @@ -package com.hxkj.admin.service; +package com.hxkj.generator.service; import com.hxkj.common.core.PageResult; -import com.hxkj.admin.validate.GenParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.DbTableVo; -import com.hxkj.admin.vo.GenTableVo; +import com.hxkj.generator.validate.GenParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenTableVo; import java.util.Map; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java rename to server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index b1ebaca2..e43ab672 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.service.impl; +package com.hxkj.generator.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,18 +10,18 @@ import com.hxkj.common.core.PageResult; import com.hxkj.common.exception.OperateException; import com.hxkj.common.utils.StringUtil; import com.hxkj.common.utils.TimeUtil; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; -import com.hxkj.admin.mapper.GenTableColumnMapper; -import com.hxkj.admin.mapper.GenTableMapper; -import com.hxkj.admin.service.IGenerateService; -import com.hxkj.admin.util.GenUtil; -import com.hxkj.admin.util.VelocityUtil; -import com.hxkj.admin.validate.GenParam; -import com.hxkj.admin.validate.PageParam; -import com.hxkj.admin.vo.DbTableVo; -import com.hxkj.admin.vo.GenColumnVo; -import com.hxkj.admin.vo.GenTableVo; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; +import com.hxkj.generator.mapper.GenTableColumnMapper; +import com.hxkj.generator.mapper.GenTableMapper; +import com.hxkj.generator.service.IGenerateService; +import com.hxkj.generator.util.GenUtil; +import com.hxkj.generator.util.VelocityUtil; +import com.hxkj.generator.validate.GenParam; +import com.hxkj.generator.validate.PageParam; +import com.hxkj.generator.vo.DbTableVo; +import com.hxkj.generator.vo.GenColumnVo; +import com.hxkj.generator.vo.GenTableVo; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java similarity index 98% rename from server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java rename to server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index 2b1e7d69..8c98cadf 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -1,10 +1,10 @@ -package com.hxkj.admin.util; +package com.hxkj.generator.util; import com.hxkj.common.constant.GenConstants; import com.hxkj.common.utils.StringUtil; import com.hxkj.admin.config.GenConfig; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java rename to server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 5d11ccef..2adde84c 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -1,8 +1,8 @@ -package com.hxkj.admin.util; +package com.hxkj.generator.util; import com.hxkj.common.utils.StringUtil; -import com.hxkj.admin.entity.GenTable; -import com.hxkj.admin.entity.GenTableColumn; +import com.hxkj.generator.entity.GenTable; +import com.hxkj.generator.entity.GenTableColumn; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.RuntimeConstants; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java similarity index 98% rename from server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java rename to server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index bd6f9b45..3d5e9d29 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.generator.validate; import com.hxkj.common.validator.annotation.IDMust; import com.hxkj.common.validator.annotation.IntegerContains; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java similarity index 95% rename from server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java rename to server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java index 405a2428..a175e6a8 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/validate/PageParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/PageParam.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.validate; +package com.hxkj.generator.validate; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java similarity index 92% rename from server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java rename to server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java index be8ab12a..2eaad1da 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/vo/DbTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/DbTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package com.hxkj.generator.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java similarity index 97% rename from server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java rename to server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java index 4a4a84ac..1f255b49 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenColumnVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenColumnVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package com.hxkj.generator.vo; import lombok.Data; diff --git a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java similarity index 94% rename from server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java rename to server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java index 08c56a84..eb1e0e42 100644 --- a/server/like-generator/src/main/java/com/hxkj/admin/vo/GenTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo; +package com.hxkj.generator.vo; import lombok.Data;