From e5568e2b272f6d518574e04215aa8a863bb35fe7 Mon Sep 17 00:00:00 2001 From: taozi <552920369@qq.com> Date: Thu, 14 May 2020 12:32:03 +0800 Subject: [PATCH] =?UTF-8?q?bug--=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8C=85=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/{gen => yixiang}/domain/ColumnConfig.java | 4 ++-- .../java/co/{gen => yixiang}/domain/GenConfig.java | 2 +- .../co/{gen => yixiang}/domain/vo/ColumnInfo.java | 2 +- .../co/{gen => yixiang}/domain/vo/TableInfo.java | 2 +- .../{gen => yixiang}/rest/GenConfigController.java | 6 +++--- .../{gen => yixiang}/rest/GeneratorController.java | 8 ++++---- .../{gen => yixiang}/service/GenConfigService.java | 4 ++-- .../{gen => yixiang}/service/GeneratorService.java | 6 +++--- .../service/impl/GenConfigServiceImpl.java | 8 ++++---- .../service/impl/GeneratorServiceImpl.java | 14 +++++++------- .../service/mapper/ColumnInfoMapper.java | 4 ++-- .../service/mapper/GenConfigMapper.java | 4 ++-- .../java/co/{gen => yixiang}/utils/ColUtil.java | 2 +- .../java/co/{gen => yixiang}/utils/GenUtil.java | 8 +++----- 14 files changed, 36 insertions(+), 38 deletions(-) rename yshop-generator/src/main/java/co/{gen => yixiang}/domain/ColumnConfig.java (96%) rename yshop-generator/src/main/java/co/{gen => yixiang}/domain/GenConfig.java (97%) rename yshop-generator/src/main/java/co/{gen => yixiang}/domain/vo/ColumnInfo.java (96%) rename yshop-generator/src/main/java/co/{gen => yixiang}/domain/vo/TableInfo.java (94%) rename yshop-generator/src/main/java/co/{gen => yixiang}/rest/GenConfigController.java (91%) rename yshop-generator/src/main/java/co/{gen => yixiang}/rest/GeneratorController.java (96%) rename yshop-generator/src/main/java/co/{gen => yixiang}/service/GenConfigService.java (86%) rename yshop-generator/src/main/java/co/{gen => yixiang}/service/GeneratorService.java (94%) rename yshop-generator/src/main/java/co/{gen => yixiang}/service/impl/GenConfigServiceImpl.java (91%) rename yshop-generator/src/main/java/co/{gen => yixiang}/service/impl/GeneratorServiceImpl.java (96%) rename yshop-generator/src/main/java/co/{gen => yixiang}/service/mapper/ColumnInfoMapper.java (75%) rename yshop-generator/src/main/java/co/{gen => yixiang}/service/mapper/GenConfigMapper.java (76%) rename yshop-generator/src/main/java/co/{gen => yixiang}/utils/ColUtil.java (96%) rename yshop-generator/src/main/java/co/{gen => yixiang}/utils/GenUtil.java (99%) diff --git a/yshop-generator/src/main/java/co/gen/domain/ColumnConfig.java b/yshop-generator/src/main/java/co/yixiang/domain/ColumnConfig.java similarity index 96% rename from yshop-generator/src/main/java/co/gen/domain/ColumnConfig.java rename to yshop-generator/src/main/java/co/yixiang/domain/ColumnConfig.java index e60f53c9..bf4793ec 100644 --- a/yshop-generator/src/main/java/co/gen/domain/ColumnConfig.java +++ b/yshop-generator/src/main/java/co/yixiang/domain/ColumnConfig.java @@ -1,6 +1,6 @@ -package co.gen.domain; +package co.yixiang.domain; -import co.gen.utils.GenUtil; +import co.yixiang.utils.GenUtil; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/yshop-generator/src/main/java/co/gen/domain/GenConfig.java b/yshop-generator/src/main/java/co/yixiang/domain/GenConfig.java similarity index 97% rename from yshop-generator/src/main/java/co/gen/domain/GenConfig.java rename to yshop-generator/src/main/java/co/yixiang/domain/GenConfig.java index 54a95503..1efbae6d 100644 --- a/yshop-generator/src/main/java/co/gen/domain/GenConfig.java +++ b/yshop-generator/src/main/java/co/yixiang/domain/GenConfig.java @@ -1,4 +1,4 @@ -package co.gen.domain; +package co.yixiang.domain; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/yshop-generator/src/main/java/co/gen/domain/vo/ColumnInfo.java b/yshop-generator/src/main/java/co/yixiang/domain/vo/ColumnInfo.java similarity index 96% rename from yshop-generator/src/main/java/co/gen/domain/vo/ColumnInfo.java rename to yshop-generator/src/main/java/co/yixiang/domain/vo/ColumnInfo.java index ce95b086..b7c66f27 100644 --- a/yshop-generator/src/main/java/co/gen/domain/vo/ColumnInfo.java +++ b/yshop-generator/src/main/java/co/yixiang/domain/vo/ColumnInfo.java @@ -1,4 +1,4 @@ -package co.gen.domain.vo; +package co.yixiang.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-generator/src/main/java/co/gen/domain/vo/TableInfo.java b/yshop-generator/src/main/java/co/yixiang/domain/vo/TableInfo.java similarity index 94% rename from yshop-generator/src/main/java/co/gen/domain/vo/TableInfo.java rename to yshop-generator/src/main/java/co/yixiang/domain/vo/TableInfo.java index 681a0c77..a1770cd2 100644 --- a/yshop-generator/src/main/java/co/gen/domain/vo/TableInfo.java +++ b/yshop-generator/src/main/java/co/yixiang/domain/vo/TableInfo.java @@ -1,4 +1,4 @@ -package co.gen.domain.vo; +package co.yixiang.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-generator/src/main/java/co/gen/rest/GenConfigController.java b/yshop-generator/src/main/java/co/yixiang/rest/GenConfigController.java similarity index 91% rename from yshop-generator/src/main/java/co/gen/rest/GenConfigController.java rename to yshop-generator/src/main/java/co/yixiang/rest/GenConfigController.java index 957d2191..31340cd7 100644 --- a/yshop-generator/src/main/java/co/gen/rest/GenConfigController.java +++ b/yshop-generator/src/main/java/co/yixiang/rest/GenConfigController.java @@ -1,7 +1,7 @@ -package co.gen.rest; +package co.yixiang.rest; -import co.gen.service.GenConfigService; -import co.gen.domain.GenConfig; +import co.yixiang.service.GenConfigService; +import co.yixiang.domain.GenConfig; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; diff --git a/yshop-generator/src/main/java/co/gen/rest/GeneratorController.java b/yshop-generator/src/main/java/co/yixiang/rest/GeneratorController.java similarity index 96% rename from yshop-generator/src/main/java/co/gen/rest/GeneratorController.java rename to yshop-generator/src/main/java/co/yixiang/rest/GeneratorController.java index 859a4eaa..e991ab61 100644 --- a/yshop-generator/src/main/java/co/gen/rest/GeneratorController.java +++ b/yshop-generator/src/main/java/co/yixiang/rest/GeneratorController.java @@ -1,8 +1,8 @@ -package co.gen.rest; +package co.yixiang.rest; -import co.gen.service.GenConfigService; -import co.gen.service.GeneratorService; -import co.gen.domain.ColumnConfig; +import co.yixiang.service.GenConfigService; +import co.yixiang.service.GeneratorService; +import co.yixiang.domain.ColumnConfig; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import co.yixiang.exception.BadRequestException; diff --git a/yshop-generator/src/main/java/co/gen/service/GenConfigService.java b/yshop-generator/src/main/java/co/yixiang/service/GenConfigService.java similarity index 86% rename from yshop-generator/src/main/java/co/gen/service/GenConfigService.java rename to yshop-generator/src/main/java/co/yixiang/service/GenConfigService.java index e64988ae..1a4c57df 100644 --- a/yshop-generator/src/main/java/co/gen/service/GenConfigService.java +++ b/yshop-generator/src/main/java/co/yixiang/service/GenConfigService.java @@ -1,6 +1,6 @@ -package co.gen.service; +package co.yixiang.service; -import co.gen.domain.GenConfig; +import co.yixiang.domain.GenConfig; /** * @author Zheng Jie diff --git a/yshop-generator/src/main/java/co/gen/service/GeneratorService.java b/yshop-generator/src/main/java/co/yixiang/service/GeneratorService.java similarity index 94% rename from yshop-generator/src/main/java/co/gen/service/GeneratorService.java rename to yshop-generator/src/main/java/co/yixiang/service/GeneratorService.java index 90895fbb..ae0f1573 100644 --- a/yshop-generator/src/main/java/co/gen/service/GeneratorService.java +++ b/yshop-generator/src/main/java/co/yixiang/service/GeneratorService.java @@ -1,7 +1,7 @@ -package co.gen.service; +package co.yixiang.service; -import co.gen.domain.ColumnConfig; -import co.gen.domain.GenConfig; +import co.yixiang.domain.ColumnConfig; +import co.yixiang.domain.GenConfig; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; import javax.servlet.http.HttpServletRequest; diff --git a/yshop-generator/src/main/java/co/gen/service/impl/GenConfigServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/service/impl/GenConfigServiceImpl.java similarity index 91% rename from yshop-generator/src/main/java/co/gen/service/impl/GenConfigServiceImpl.java rename to yshop-generator/src/main/java/co/yixiang/service/impl/GenConfigServiceImpl.java index b4766121..5a944e73 100644 --- a/yshop-generator/src/main/java/co/gen/service/impl/GenConfigServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/service/impl/GenConfigServiceImpl.java @@ -1,9 +1,9 @@ -package co.gen.service.impl; +package co.yixiang.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.gen.domain.GenConfig; -import co.gen.service.GenConfigService; -import co.gen.service.mapper.GenConfigMapper; +import co.yixiang.domain.GenConfig; +import co.yixiang.service.GenConfigService; +import co.yixiang.service.mapper.GenConfigMapper; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; diff --git a/yshop-generator/src/main/java/co/gen/service/impl/GeneratorServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/service/impl/GeneratorServiceImpl.java similarity index 96% rename from yshop-generator/src/main/java/co/gen/service/impl/GeneratorServiceImpl.java rename to yshop-generator/src/main/java/co/yixiang/service/impl/GeneratorServiceImpl.java index 610dba26..a495e515 100644 --- a/yshop-generator/src/main/java/co/gen/service/impl/GeneratorServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/service/impl/GeneratorServiceImpl.java @@ -1,16 +1,16 @@ -package co.gen.service.impl; +package co.yixiang.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.gen.domain.ColumnConfig; -import co.gen.domain.GenConfig; -import co.gen.service.mapper.ColumnInfoMapper; -import co.gen.utils.GenUtil; -import co.gen.domain.vo.TableInfo; +import co.yixiang.domain.ColumnConfig; +import co.yixiang.domain.GenConfig; +import co.yixiang.service.mapper.ColumnInfoMapper; +import co.yixiang.utils.GenUtil; +import co.yixiang.domain.vo.TableInfo; import co.yixiang.exception.BadRequestException; -import co.gen.service.GeneratorService; +import co.yixiang.service.GeneratorService; import co.yixiang.utils.FileUtil; import co.yixiang.utils.PageUtil; import co.yixiang.utils.StringUtils; diff --git a/yshop-generator/src/main/java/co/gen/service/mapper/ColumnInfoMapper.java b/yshop-generator/src/main/java/co/yixiang/service/mapper/ColumnInfoMapper.java similarity index 75% rename from yshop-generator/src/main/java/co/gen/service/mapper/ColumnInfoMapper.java rename to yshop-generator/src/main/java/co/yixiang/service/mapper/ColumnInfoMapper.java index fde0cf86..109cb04f 100644 --- a/yshop-generator/src/main/java/co/gen/service/mapper/ColumnInfoMapper.java +++ b/yshop-generator/src/main/java/co/yixiang/service/mapper/ColumnInfoMapper.java @@ -1,6 +1,6 @@ -package co.gen.service.mapper; +package co.yixiang.service.mapper; -import co.gen.domain.ColumnConfig; +import co.yixiang.domain.ColumnConfig; import co.yixiang.common.mapper.CoreMapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-generator/src/main/java/co/gen/service/mapper/GenConfigMapper.java b/yshop-generator/src/main/java/co/yixiang/service/mapper/GenConfigMapper.java similarity index 76% rename from yshop-generator/src/main/java/co/gen/service/mapper/GenConfigMapper.java rename to yshop-generator/src/main/java/co/yixiang/service/mapper/GenConfigMapper.java index dba3a0b9..8153605c 100644 --- a/yshop-generator/src/main/java/co/gen/service/mapper/GenConfigMapper.java +++ b/yshop-generator/src/main/java/co/yixiang/service/mapper/GenConfigMapper.java @@ -1,6 +1,6 @@ -package co.gen.service.mapper; +package co.yixiang.service.mapper; -import co.gen.domain.GenConfig; +import co.yixiang.domain.GenConfig; import co.yixiang.common.mapper.CoreMapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-generator/src/main/java/co/gen/utils/ColUtil.java b/yshop-generator/src/main/java/co/yixiang/utils/ColUtil.java similarity index 96% rename from yshop-generator/src/main/java/co/gen/utils/ColUtil.java rename to yshop-generator/src/main/java/co/yixiang/utils/ColUtil.java index 6878567a..a00097b9 100644 --- a/yshop-generator/src/main/java/co/gen/utils/ColUtil.java +++ b/yshop-generator/src/main/java/co/yixiang/utils/ColUtil.java @@ -1,4 +1,4 @@ -package co.gen.utils; +package co.yixiang.utils; import org.apache.commons.configuration.*; diff --git a/yshop-generator/src/main/java/co/gen/utils/GenUtil.java b/yshop-generator/src/main/java/co/yixiang/utils/GenUtil.java similarity index 99% rename from yshop-generator/src/main/java/co/gen/utils/GenUtil.java rename to yshop-generator/src/main/java/co/yixiang/utils/GenUtil.java index f46c6046..2b63b4f5 100644 --- a/yshop-generator/src/main/java/co/gen/utils/GenUtil.java +++ b/yshop-generator/src/main/java/co/yixiang/utils/GenUtil.java @@ -1,12 +1,10 @@ -package co.gen.utils; +package co.yixiang.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.*; -import co.gen.domain.GenConfig; -import co.yixiang.utils.FileUtil; -import co.yixiang.utils.StringUtils; +import co.yixiang.domain.GenConfig; import lombok.extern.slf4j.Slf4j; -import co.gen.domain.ColumnConfig; +import co.yixiang.domain.ColumnConfig; import org.springframework.util.ObjectUtils; import java.io.File; import java.io.FileWriter;