From 5ab7fb5b73427700655997a144ec9ee6db334e63 Mon Sep 17 00:00:00 2001 From: dqjdda <201507802@qq.com> Date: Sun, 17 Nov 2019 14:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=20Not=20Equal=20=E6=9F=A5=E8=AF=A2=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/zhengjie/annotation/Query.java | 2 + .../java/me/zhengjie/utils/QueryHelp.java | 3 ++ eladmin-generator/pom.xml | 39 +++++++++++++++++++ .../java/me/zhengjie}/domain/GenConfig.java | 7 +--- .../me/zhengjie}/domain/vo/ColumnInfo.java | 2 +- .../me/zhengjie}/domain/vo/TableInfo.java | 2 +- .../repository/GenConfigRepository.java | 4 +- .../zhengjie}/rest/GenConfigController.java | 6 +-- .../zhengjie}/rest/GeneratorController.java | 9 ++--- .../zhengjie}/service/GenConfigService.java | 4 +- .../zhengjie}/service/GeneratorService.java | 6 +-- .../service/impl/GenConfigServiceImpl.java | 8 ++-- .../service/impl/GeneratorServiceImpl.java | 12 +++--- .../main/java/me/zhengjie}/utils/ColUtil.java | 6 +-- .../main/java/me/zhengjie}/utils/GenUtil.java | 8 ++-- eladmin-system/pom.xml | 12 ++++++ .../modules/system/rest/UserController.java | 4 +- eladmin-tools/pom.xml | 14 ------- .../tools => }/domain/AlipayConfig.java | 2 +- .../tools => }/domain/EmailConfig.java | 2 +- .../tools => }/domain/LocalStorage.java | 2 +- .../{modules/tools => }/domain/Picture.java | 2 +- .../tools => }/domain/QiniuConfig.java | 2 +- .../tools => }/domain/QiniuContent.java | 2 +- .../tools => }/domain/VerificationCode.java | 2 +- .../tools => }/domain/vo/EmailVo.java | 2 +- .../tools => }/domain/vo/TradeVo.java | 2 +- .../repository/AlipayRepository.java | 4 +- .../repository/EmailRepository.java | 4 +- .../repository/LocalStorageRepository.java | 4 +- .../repository/PictureRepository.java | 4 +- .../repository/QiNiuConfigRepository.java | 4 +- .../repository/QiniuContentRepository.java | 4 +- .../VerificationCodeRepository.java | 4 +- .../tools => }/rest/AliPayController.java | 12 +++--- .../tools => }/rest/EmailController.java | 8 ++-- .../rest/LocalStorageController.java | 8 ++-- .../tools => }/rest/PictureController.java | 8 ++-- .../tools => }/rest/QiniuController.java | 10 ++--- .../rest/VerificationCodeController.java | 10 ++--- .../tools => }/service/AlipayService.java | 6 +-- .../tools => }/service/EmailService.java | 6 +-- .../service/LocalStorageService.java | 8 ++-- .../tools => }/service/PictureService.java | 6 +-- .../tools => }/service/QiNiuService.java | 8 ++-- .../service/VerificationCodeService.java | 6 +-- .../service/dto/LocalStorageDTO.java | 2 +- .../dto/LocalStorageQueryCriteria.java | 2 +- .../service/dto/PictureQueryCriteria.java | 2 +- .../service/dto/QiniuQueryCriteria.java | 2 +- .../service/impl/AlipayServiceImpl.java | 10 ++--- .../service/impl/EmailServiceImpl.java | 10 ++--- .../service/impl/LocalStorageServiceImpl.java | 14 +++---- .../service/impl/PictureServiceImpl.java | 10 ++--- .../service/impl/QiNiuServiceImpl.java | 16 ++++---- .../impl/VerificationCodeServiceImpl.java | 10 ++--- .../service/mapper/LocalStorageMapper.java | 6 +-- .../tools => }/utils/AliPayStatusEnum.java | 2 +- .../tools => }/utils/AlipayUtils.java | 4 +- .../{modules/tools => }/utils/QiNiuUtil.java | 2 +- pom.xml | 3 +- 61 files changed, 210 insertions(+), 175 deletions(-) create mode 100644 eladmin-generator/pom.xml rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/domain/GenConfig.java (77%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/domain/vo/ColumnInfo.java (93%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/domain/vo/TableInfo.java (90%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/repository/GenConfigRepository.java (64%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/rest/GenConfigController.java (86%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/rest/GeneratorController.java (90%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/GenConfigService.java (60%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/GeneratorService.java (80%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/impl/GenConfigServiceImpl.java (87%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/service/impl/GeneratorServiceImpl.java (89%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/utils/ColUtil.java (75%) rename {eladmin-tools/src/main/java/me/zhengjie/modules/generator => eladmin-generator/src/main/java/me/zhengjie}/utils/GenUtil.java (97%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/AlipayConfig.java (97%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/EmailConfig.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/LocalStorage.java (97%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/Picture.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/QiniuConfig.java (96%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/QiniuContent.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/VerificationCode.java (96%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/vo/EmailVo.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/domain/vo/TradeVo.java (96%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/AlipayRepository.java (65%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/EmailRepository.java (65%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/LocalStorageRepository.java (75%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/PictureRepository.java (78%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/QiNiuConfigRepository.java (80%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/QiniuContentRepository.java (81%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/repository/VerificationCodeRepository.java (83%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/AliPayController.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/EmailController.java (87%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/LocalStorageController.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/PictureController.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/QiniuController.java (93%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/rest/VerificationCodeController.java (87%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/AlipayService.java (85%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/EmailService.java (82%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/LocalStorageService.java (76%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/PictureService.java (81%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/QiNiuService.java (89%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/VerificationCodeService.java (69%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/LocalStorageDTO.java (91%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/LocalStorageQueryCriteria.java (90%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/PictureQueryCriteria.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/dto/QiniuQueryCriteria.java (90%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/AlipayServiceImpl.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/EmailServiceImpl.java (91%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/LocalStorageServiceImpl.java (93%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/PictureServiceImpl.java (94%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/QiNiuServiceImpl.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/impl/VerificationCodeServiceImpl.java (92%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/service/mapper/LocalStorageMapper.java (65%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/utils/AliPayStatusEnum.java (91%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/utils/AlipayUtils.java (95%) rename eladmin-tools/src/main/java/me/zhengjie/{modules/tools => }/utils/QiNiuUtil.java (97%) diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java index 0a583390..8d986b9c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java +++ b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java @@ -50,6 +50,8 @@ public @interface Query { , LESS_THAN_NQ // jie 2019/6/4 包含 , IN + // 不等于 + ,NOT_EQUAL } /** diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java index 7c82dc1e..e8c59d79 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java @@ -106,6 +106,9 @@ public class QueryHelp { list.add(getExpression(attributeName,join,root).in((Collection) val)); } break; + case NOT_EQUAL: + list.add(cb.notEqual(getExpression(attributeName,join,root), val)); + break; default: break; } } diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml new file mode 100644 index 00000000..1ac5ccb1 --- /dev/null +++ b/eladmin-generator/pom.xml @@ -0,0 +1,39 @@ + + + + eladmin + me.zhengjie + 2.3 + + 4.0.0 + + eladmin-generator + 代码生成模块 + + + 1.9 + + + + + me.zhengjie + eladmin-common + 2.3 + + + + + org.springframework.boot + spring-boot-starter-freemarker + + + + + commons-configuration + commons-configuration + ${configuration.version} + + + \ No newline at end of file diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java similarity index 77% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java rename to eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java index 516fc208..30790e46 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java @@ -1,10 +1,7 @@ -package me.zhengjie.modules.generator.domain; +package me.zhengjie.domain; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; /** * 代码生成配置 diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java rename to eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java index ba387d78..a22470aa 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.generator.domain.vo; +package me.zhengjie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java rename to eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java index d753a9c0..b1b6ba4e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java +++ b/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.generator.domain.vo; +package me.zhengjie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java similarity index 64% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java rename to eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java index 0cd8a142..d72787d0 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java +++ b/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.generator.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.generator.domain.GenConfig; +import me.zhengjie.domain.GenConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java similarity index 86% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java rename to eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java index 3788be8b..0650b959 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java @@ -1,9 +1,9 @@ -package me.zhengjie.modules.generator.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.service.GenConfigService; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.service.GenConfigService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java rename to eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java index 1661b878..653489e2 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java +++ b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java @@ -1,17 +1,16 @@ -package me.zhengjie.modules.generator.rest; +package me.zhengjie.rest; import cn.hutool.core.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import me.zhengjie.domain.vo.ColumnInfo; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; -import me.zhengjie.modules.generator.service.GenConfigService; -import me.zhengjie.modules.generator.service.GeneratorService; +import me.zhengjie.service.GenConfigService; +import me.zhengjie.service.GeneratorService; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; - import java.util.List; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java similarity index 60% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java rename to eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java index 0023e93e..67afbbf5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.generator.service; +package me.zhengjie.service; -import me.zhengjie.modules.generator.domain.GenConfig; +import me.zhengjie.domain.GenConfig; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java similarity index 80% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java rename to eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java index ed585370..7ddb7f1e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.generator.service; +package me.zhengjie.service; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.domain.vo.ColumnInfo; import java.util.List; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java similarity index 87% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java rename to eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java index 1d7cc19f..4dfa354c 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.generator.service.impl; +package me.zhengjie.service.impl; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.repository.GenConfigRepository; -import me.zhengjie.modules.generator.service.GenConfigService; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.repository.GenConfigRepository; +import me.zhengjie.service.GenConfigService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java similarity index 89% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java rename to eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java index 6a7e6459..51198e56 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java +++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java @@ -1,12 +1,12 @@ -package me.zhengjie.modules.generator.service.impl; +package me.zhengjie.service.impl; import cn.hutool.core.util.ObjectUtil; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.domain.vo.ColumnInfo; +import me.zhengjie.domain.vo.TableInfo; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; -import me.zhengjie.modules.generator.domain.vo.TableInfo; -import me.zhengjie.modules.generator.service.GeneratorService; -import me.zhengjie.modules.generator.utils.GenUtil; +import me.zhengjie.service.GeneratorService; +import me.zhengjie.utils.GenUtil; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.StringUtils; import org.springframework.stereotype.Service; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java similarity index 75% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java rename to eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java index 0b9a37d2..9a119f2a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java @@ -1,8 +1,6 @@ -package me.zhengjie.modules.generator.utils; +package me.zhengjie.utils; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration.*; /** * sql字段转java diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java rename to eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java index 6f223b4d..2fb826c5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java @@ -1,12 +1,10 @@ -package me.zhengjie.modules.generator.utils; +package me.zhengjie.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.*; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.modules.generator.domain.GenConfig; -import me.zhengjie.modules.generator.domain.vo.ColumnInfo; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.StringUtils; +import me.zhengjie.domain.GenConfig; +import me.zhengjie.domain.vo.ColumnInfo; import org.springframework.util.ObjectUtils; import java.io.File; import java.io.FileWriter; diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index 8c350703..67d8db37 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -17,6 +17,18 @@ + + + me.zhengjie + eladmin-generator + 2.3 + + + me.zhengjie + eladmin-common + + + diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index d15613bb..4084e068 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.zhengjie.aop.log.Log; import me.zhengjie.config.DataScope; -import me.zhengjie.modules.tools.domain.VerificationCode; +import me.zhengjie.domain.VerificationCode; import me.zhengjie.modules.system.domain.User; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.system.domain.vo.UserPassVo; @@ -12,7 +12,7 @@ import me.zhengjie.modules.system.service.DeptService; import me.zhengjie.modules.system.service.RoleService; import me.zhengjie.modules.system.service.dto.RoleSmallDTO; import me.zhengjie.modules.system.service.dto.UserQueryCriteria; -import me.zhengjie.modules.tools.service.VerificationCodeService; +import me.zhengjie.service.VerificationCodeService; import me.zhengjie.utils.*; import me.zhengjie.modules.system.service.UserService; import org.springframework.data.domain.Pageable; diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml index 878cbf12..62df3e9f 100644 --- a/eladmin-tools/pom.xml +++ b/eladmin-tools/pom.xml @@ -16,7 +16,6 @@ 1.4.7 [7.2.0, 7.2.99] 3.1.0 - 1.9 @@ -34,19 +33,6 @@ ${mail.version} - - - org.springframework.boot - spring-boot-starter-freemarker - - - - - commons-configuration - commons-configuration - ${configuration.version} - - com.qiniu diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java index 25b99d62..914adf75 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import javax.persistence.*; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/EmailConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/EmailConfig.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java index 4033cdc3..c49131dc 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/EmailConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/LocalStorage.java b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/LocalStorage.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java index c7373ed7..9d6e9fcf 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/LocalStorage.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.*; import cn.hutool.core.bean.BeanUtil; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/Picture.java b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/Picture.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java index 50dc37f1..09a2867e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/Picture.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuConfig.java b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuConfig.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java index 1bf77b98..f4f84858 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuConfig.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import javax.persistence.*; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuContent.java b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuContent.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java index fad5a3af..3d1b7a06 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuContent.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.Data; import org.hibernate.annotations.UpdateTimestamp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/VerificationCode.java b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/VerificationCode.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java index 3be1bc81..8fd96689 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/VerificationCode.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/VerificationCode.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain; +package me.zhengjie.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/EmailVo.java b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/EmailVo.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java index 6537347d..289aa30d 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/EmailVo.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain.vo; +package me.zhengjie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/TradeVo.java b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/TradeVo.java rename to eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java index 702df7cd..638ab9b5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/TradeVo.java +++ b/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.domain.vo; +package me.zhengjie.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/AlipayRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java similarity index 65% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/AlipayRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java index c2fb3a56..fe1c0080 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/AlipayRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/AlipayRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.AlipayConfig; +import me.zhengjie.domain.AlipayConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/EmailRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java similarity index 65% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/EmailRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java index 6341bf7e..d5fb22fc 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/EmailRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.EmailConfig; +import me.zhengjie.domain.EmailConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/LocalStorageRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java similarity index 75% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/LocalStorageRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java index c6908452..15554451 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/LocalStorageRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.LocalStorage; +import me.zhengjie.domain.LocalStorage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/PictureRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java similarity index 78% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/PictureRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java index 08e64032..59c66945 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/PictureRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.Picture; +import me.zhengjie.domain.Picture; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiNiuConfigRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java similarity index 80% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiNiuConfigRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java index a08cb1d8..86ff49c7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiNiuConfigRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.QiniuConfig; +import me.zhengjie.domain.QiniuConfig; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiniuContentRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java similarity index 81% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiniuContentRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java index 1c82fecc..f6fdb1da 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiniuContentRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.QiniuContent; +import me.zhengjie.domain.QiniuContent; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/VerificationCodeRepository.java b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java similarity index 83% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/VerificationCodeRepository.java rename to eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java index d973a4ec..c602a45e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/VerificationCodeRepository.java +++ b/eladmin-tools/src/main/java/me/zhengjie/repository/VerificationCodeRepository.java @@ -1,6 +1,6 @@ -package me.zhengjie.modules.tools.repository; +package me.zhengjie.repository; -import me.zhengjie.modules.tools.domain.VerificationCode; +import me.zhengjie.domain.VerificationCode; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/AliPayController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/AliPayController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java index d35f9799..8994dcae 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/AliPayController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java @@ -1,15 +1,15 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.zhengjie.annotation.AnonymousAccess; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.AlipayConfig; -import me.zhengjie.modules.tools.domain.vo.TradeVo; -import me.zhengjie.modules.tools.utils.AliPayStatusEnum; -import me.zhengjie.modules.tools.utils.AlipayUtils; -import me.zhengjie.modules.tools.service.AlipayService; +import me.zhengjie.domain.vo.TradeVo; +import me.zhengjie.domain.AlipayConfig; +import me.zhengjie.utils.AliPayStatusEnum; +import me.zhengjie.utils.AlipayUtils; +import me.zhengjie.service.AlipayService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/EmailController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java similarity index 87% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/EmailController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java index 782c9a5f..f4892e5f 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/EmailController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.EmailConfig; -import me.zhengjie.modules.tools.domain.vo.EmailVo; -import me.zhengjie.modules.tools.service.EmailService; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.EmailConfig; +import me.zhengjie.service.EmailService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/LocalStorageController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/LocalStorageController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java index a520fd1b..0dce020f 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/LocalStorageController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java @@ -1,9 +1,9 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.LocalStorage; -import me.zhengjie.modules.tools.service.LocalStorageService; -import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria; +import me.zhengjie.domain.LocalStorage; +import me.zhengjie.service.LocalStorageService; +import me.zhengjie.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/PictureController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/PictureController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java index fb4bddfb..8a7852f4 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/PictureController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.Picture; -import me.zhengjie.modules.tools.service.PictureService; -import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria; +import me.zhengjie.domain.Picture; +import me.zhengjie.service.PictureService; +import me.zhengjie.service.dto.PictureQueryCriteria; import me.zhengjie.utils.SecurityUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/QiniuController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/QiniuController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java index c76f03f6..e8f5bc03 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/QiniuController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java @@ -1,13 +1,13 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.zhengjie.aop.log.Log; -import me.zhengjie.modules.tools.domain.QiniuConfig; -import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria; -import me.zhengjie.modules.tools.domain.QiniuContent; -import me.zhengjie.modules.tools.service.QiNiuService; +import me.zhengjie.domain.QiniuConfig; +import me.zhengjie.domain.QiniuContent; +import me.zhengjie.service.dto.QiniuQueryCriteria; +import me.zhengjie.service.QiNiuService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/VerificationCodeController.java b/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java similarity index 87% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/VerificationCodeController.java rename to eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java index 02471175..bffa0948 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/VerificationCodeController.java +++ b/eladmin-tools/src/main/java/me/zhengjie/rest/VerificationCodeController.java @@ -1,11 +1,11 @@ -package me.zhengjie.modules.tools.rest; +package me.zhengjie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import me.zhengjie.modules.tools.domain.VerificationCode; -import me.zhengjie.modules.tools.domain.vo.EmailVo; -import me.zhengjie.modules.tools.service.EmailService; -import me.zhengjie.modules.tools.service.VerificationCodeService; +import me.zhengjie.domain.VerificationCode; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.service.EmailService; +import me.zhengjie.service.VerificationCodeService; import me.zhengjie.utils.ElAdminConstant; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/AlipayService.java b/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java similarity index 85% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/AlipayService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java index 916541e4..1d5a82f5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/AlipayService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/AlipayService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.AlipayConfig; -import me.zhengjie.modules.tools.domain.vo.TradeVo; +import me.zhengjie.domain.vo.TradeVo; +import me.zhengjie.domain.AlipayConfig; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/EmailService.java b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java similarity index 82% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/EmailService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java index ab5a79f9..a8e05d3e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/EmailService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.EmailConfig; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.EmailConfig; import org.springframework.scheduling.annotation.Async; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/LocalStorageService.java b/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java similarity index 76% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/LocalStorageService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java index 133dde9a..f8990bad 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/LocalStorageService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.LocalStorage; -import me.zhengjie.modules.tools.service.dto.LocalStorageDTO; -import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria; +import me.zhengjie.domain.LocalStorage; +import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/PictureService.java b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java similarity index 81% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/PictureService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java index 9f594b69..746ec580 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/PictureService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.Picture; -import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria; +import me.zhengjie.domain.Picture; +import me.zhengjie.service.dto.PictureQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/QiNiuService.java b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java similarity index 89% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/QiNiuService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java index 45305d5d..4704f979 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/QiNiuService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.QiniuConfig; -import me.zhengjie.modules.tools.domain.QiniuContent; -import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria; +import me.zhengjie.domain.QiniuConfig; +import me.zhengjie.domain.QiniuContent; +import me.zhengjie.service.dto.QiniuQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/VerificationCodeService.java b/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java similarity index 69% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/VerificationCodeService.java rename to eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java index 1098cb4d..058947f5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/VerificationCodeService.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/VerificationCodeService.java @@ -1,7 +1,7 @@ -package me.zhengjie.modules.tools.service; +package me.zhengjie.service; -import me.zhengjie.modules.tools.domain.VerificationCode; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.VerificationCode; +import me.zhengjie.domain.vo.EmailVo; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageDTO.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageDTO.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java index 94b1a74f..b71c687c 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageDTO.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDTO.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageQueryCriteria.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java index c3f0b3a1..089aeda7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Data; import java.sql.Timestamp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/PictureQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/PictureQueryCriteria.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java index 4821b9d2..2869e7ee 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/PictureQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Data; import me.zhengjie.annotation.Query; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/QiniuQueryCriteria.java b/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java similarity index 90% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/QiniuQueryCriteria.java rename to eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java index adc50605..6f02941a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/QiniuQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.dto; +package me.zhengjie.service.dto; import lombok.Data; import me.zhengjie.annotation.Query; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/AlipayServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/AlipayServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java index afab5e1f..f0ef1bb4 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/AlipayServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/AlipayServiceImpl.java @@ -1,14 +1,14 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePagePayRequest; import com.alipay.api.request.AlipayTradeWapPayRequest; -import me.zhengjie.modules.tools.domain.AlipayConfig; -import me.zhengjie.modules.tools.domain.vo.TradeVo; +import me.zhengjie.domain.vo.TradeVo; +import me.zhengjie.domain.AlipayConfig; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.AlipayRepository; -import me.zhengjie.modules.tools.service.AlipayService; +import me.zhengjie.repository.AlipayRepository; +import me.zhengjie.service.AlipayService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/EmailServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java index 7206fc48..fee562de 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/EmailServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java @@ -1,12 +1,12 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; -import me.zhengjie.modules.tools.domain.EmailConfig; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.EmailConfig; +import me.zhengjie.domain.vo.EmailVo; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.EmailRepository; -import me.zhengjie.modules.tools.service.EmailService; +import me.zhengjie.repository.EmailRepository; +import me.zhengjie.service.EmailService; import me.zhengjie.utils.EncryptUtils; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CachePut; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/LocalStorageServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/LocalStorageServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java index f8e08c95..0849ba2d 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/LocalStorageServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java @@ -1,14 +1,14 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.core.util.ObjectUtil; -import me.zhengjie.modules.tools.domain.LocalStorage; -import me.zhengjie.modules.tools.service.dto.LocalStorageDTO; -import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria; -import me.zhengjie.modules.tools.service.mapper.LocalStorageMapper; +import me.zhengjie.domain.LocalStorage; +import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.service.dto.LocalStorageQueryCriteria; +import me.zhengjie.service.mapper.LocalStorageMapper; import me.zhengjie.exception.BadRequestException; import me.zhengjie.utils.*; -import me.zhengjie.modules.tools.repository.LocalStorageRepository; -import me.zhengjie.modules.tools.service.LocalStorageService; +import me.zhengjie.repository.LocalStorageRepository; +import me.zhengjie.service.LocalStorageService; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java index a91dfb56..bd57e129 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java @@ -1,14 +1,14 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.modules.tools.domain.Picture; -import me.zhengjie.modules.tools.repository.PictureRepository; -import me.zhengjie.modules.tools.service.PictureService; -import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria; +import me.zhengjie.domain.Picture; +import me.zhengjie.repository.PictureRepository; +import me.zhengjie.service.PictureService; +import me.zhengjie.service.dto.PictureQueryCriteria; import me.zhengjie.exception.BadRequestException; import me.zhengjie.utils.*; import org.springframework.cache.annotation.CacheConfig; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java index eb52ec2c..3300fd80 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import com.alibaba.fastjson.JSON; import com.qiniu.common.QiniuException; @@ -9,14 +9,14 @@ import com.qiniu.storage.UploadManager; import com.qiniu.storage.model.DefaultPutRet; import com.qiniu.storage.model.FileInfo; import com.qiniu.util.Auth; -import me.zhengjie.modules.tools.domain.QiniuConfig; -import me.zhengjie.modules.tools.domain.QiniuContent; -import me.zhengjie.modules.tools.repository.QiniuContentRepository; -import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria; -import me.zhengjie.modules.tools.utils.QiNiuUtil; +import me.zhengjie.domain.QiniuConfig; +import me.zhengjie.domain.QiniuContent; +import me.zhengjie.repository.QiniuContentRepository; +import me.zhengjie.service.dto.QiniuQueryCriteria; +import me.zhengjie.utils.QiNiuUtil; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.QiNiuConfigRepository; -import me.zhengjie.modules.tools.service.QiNiuService; +import me.zhengjie.repository.QiNiuConfigRepository; +import me.zhengjie.service.QiNiuService; import me.zhengjie.utils.FileUtil; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.QueryHelp; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java rename to eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java index 93d6ea41..bb47fe5d 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/VerificationCodeServiceImpl.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.service.impl; +package me.zhengjie.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; @@ -6,11 +6,11 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; -import me.zhengjie.modules.tools.domain.VerificationCode; -import me.zhengjie.modules.tools.domain.vo.EmailVo; +import me.zhengjie.domain.vo.EmailVo; +import me.zhengjie.domain.VerificationCode; import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.tools.repository.VerificationCodeRepository; -import me.zhengjie.modules.tools.service.VerificationCodeService; +import me.zhengjie.repository.VerificationCodeRepository; +import me.zhengjie.service.VerificationCodeService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java similarity index 65% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java rename to eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java index f3d3d20b..e3fb8f0a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java +++ b/eladmin-tools/src/main/java/me/zhengjie/service/mapper/LocalStorageMapper.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.service.mapper; +package me.zhengjie.service.mapper; import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.tools.service.dto.LocalStorageDTO; -import me.zhengjie.modules.tools.domain.LocalStorage; +import me.zhengjie.service.dto.LocalStorageDTO; +import me.zhengjie.domain.LocalStorage; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java b/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java rename to eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java index 4cb5fcc8..9bda06e8 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.utils; +package me.zhengjie.utils; /** * 支付状态 diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java b/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java rename to eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java index 5c64327b..bf38d29b 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java @@ -1,8 +1,8 @@ -package me.zhengjie.modules.tools.utils; +package me.zhengjie.utils; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; -import me.zhengjie.modules.tools.domain.AlipayConfig; +import me.zhengjie.domain.AlipayConfig; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; diff --git a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java b/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java rename to eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java index 5d09fc1a..73a401cf 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java +++ b/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java @@ -1,4 +1,4 @@ -package me.zhengjie.modules.tools.utils; +package me.zhengjie.utils; import com.qiniu.storage.Region; import me.zhengjie.utils.FileUtil; diff --git a/pom.xml b/pom.xml index 803708a3..824758aa 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ eladmin-system eladmin-tools eladmin-monitor - + eladmin-generator + EL-ADMIN后台管理系统 http://auauz.net