diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java b/eladmin-common/src/main/java/me/guoguojie/annotation/AnonymousAccess.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/AnonymousAccess.java index b2c168fe..2f623610 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/AnonymousAccess.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/AnonymousAccess.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.annotation; +package me.guoguojie.annotation; import java.lang.annotation.*; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java b/eladmin-common/src/main/java/me/guoguojie/annotation/DataPermission.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/DataPermission.java index b73c1a24..e670504a 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/DataPermission.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/DataPermission.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.annotation; +package me.guoguojie.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java b/eladmin-common/src/main/java/me/guoguojie/annotation/Limit.java similarity index 94% rename from eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/Limit.java index 58b41cf8..1bc984ff 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/Limit.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/Limit.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.annotation; +package me.guoguojie.annotation; -import me.zhengjie.aspect.LimitType; +import me.guoguojie.aspect.LimitType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/me/guoguojie/annotation/Query.java similarity index 98% rename from eladmin-common/src/main/java/me/zhengjie/annotation/Query.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/Query.java index e1758c9b..d0d822f6 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/Query.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.annotation; +package me.guoguojie.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousDeleteMapping.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousDeleteMapping.java index 6a81c2e9..04bc0156 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousDeleteMapping.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousDeleteMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.zhengjie.annotation.rest; +package me.guoguojie.annotation.rest; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import me.zhengjie.annotation.AnonymousAccess; +import me.guoguojie.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousGetMapping.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousGetMapping.java index c260a71b..fee506b6 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousGetMapping.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousGetMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.zhengjie.annotation.rest; +package me.guoguojie.annotation.rest; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import me.zhengjie.annotation.AnonymousAccess; +import me.guoguojie.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPatchMapping.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPatchMapping.java index 66866178..44c100c5 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPatchMapping.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPatchMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.zhengjie.annotation.rest; +package me.guoguojie.annotation.rest; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import me.zhengjie.annotation.AnonymousAccess; +import me.guoguojie.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPostMapping.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPostMapping.java index 8f1cdcdd..3dac522c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPostMapping.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPostMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.zhengjie.annotation.rest; +package me.guoguojie.annotation.rest; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import me.zhengjie.annotation.AnonymousAccess; +import me.guoguojie.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPutMapping.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java rename to eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPutMapping.java index 7c417dac..7f02532e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/annotation/rest/AnonymousPutMapping.java +++ b/eladmin-common/src/main/java/me/guoguojie/annotation/rest/AnonymousPutMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.zhengjie.annotation.rest; +package me.guoguojie.annotation.rest; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import me.zhengjie.annotation.AnonymousAccess; +import me.guoguojie.annotation.AnonymousAccess; import org.springframework.core.annotation.AliasFor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java b/eladmin-common/src/main/java/me/guoguojie/aspect/LimitAspect.java similarity index 93% rename from eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java rename to eladmin-common/src/main/java/me/guoguojie/aspect/LimitAspect.java index 31f40404..91a5aa35 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitAspect.java +++ b/eladmin-common/src/main/java/me/guoguojie/aspect/LimitAspect.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.aspect; +package me.guoguojie.aspect; import com.google.common.collect.ImmutableList; -import me.zhengjie.annotation.Limit; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.utils.RequestHolder; -import me.zhengjie.utils.StringUtils; +import me.guoguojie.annotation.Limit; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.RequestHolder; +import me.guoguojie.utils.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -48,7 +48,7 @@ public class LimitAspect { this.redisTemplate = redisTemplate; } - @Pointcut("@annotation(me.zhengjie.annotation.Limit)") + @Pointcut("@annotation(me.guoguojie.annotation.Limit)") public void pointcut() { } diff --git a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java b/eladmin-common/src/main/java/me/guoguojie/aspect/LimitType.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java rename to eladmin-common/src/main/java/me/guoguojie/aspect/LimitType.java index bf3f09e2..6368c70f 100644 --- a/eladmin-common/src/main/java/me/zhengjie/aspect/LimitType.java +++ b/eladmin-common/src/main/java/me/guoguojie/aspect/LimitType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.aspect; +package me.guoguojie.aspect; /** * 限流枚举 diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java b/eladmin-common/src/main/java/me/guoguojie/base/BaseDTO.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java rename to eladmin-common/src/main/java/me/guoguojie/base/BaseDTO.java index e9e7cc23..3662d01e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseDTO.java +++ b/eladmin-common/src/main/java/me/guoguojie/base/BaseDTO.java @@ -1,4 +1,4 @@ -package me.zhengjie.base; +package me.guoguojie.base; import lombok.Getter; import lombok.Setter; diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java b/eladmin-common/src/main/java/me/guoguojie/base/BaseEntity.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java rename to eladmin-common/src/main/java/me/guoguojie/base/BaseEntity.java index 618e100c..d40aee44 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseEntity.java +++ b/eladmin-common/src/main/java/me/guoguojie/base/BaseEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.base; +package me.guoguojie.base; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java b/eladmin-common/src/main/java/me/guoguojie/base/BaseMapper.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java rename to eladmin-common/src/main/java/me/guoguojie/base/BaseMapper.java index e8bb825d..07ea59f0 100644 --- a/eladmin-common/src/main/java/me/zhengjie/base/BaseMapper.java +++ b/eladmin-common/src/main/java/me/guoguojie/base/BaseMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.base; +package me.guoguojie.base; import java.util.List; diff --git a/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java b/eladmin-common/src/main/java/me/guoguojie/config/AuditorConfig.java similarity index 95% rename from eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java rename to eladmin-common/src/main/java/me/guoguojie/config/AuditorConfig.java index 006ef6b9..bcd3ea7e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/AuditorConfig.java +++ b/eladmin-common/src/main/java/me/guoguojie/config/AuditorConfig.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; -import me.zhengjie.utils.SecurityUtils; +import me.guoguojie.utils.SecurityUtils; import org.springframework.data.domain.AuditorAware; import org.springframework.stereotype.Component; import java.util.Optional; diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java b/eladmin-common/src/main/java/me/guoguojie/config/ElAdminProperties.java similarity index 93% rename from eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java rename to eladmin-common/src/main/java/me/guoguojie/config/ElAdminProperties.java index 28541858..f57791fe 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/ElAdminProperties.java +++ b/eladmin-common/src/main/java/me/guoguojie/config/ElAdminProperties.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import lombok.Data; -import me.zhengjie.utils.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java b/eladmin-common/src/main/java/me/guoguojie/config/ElPermissionConfig.java similarity index 95% rename from eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java rename to eladmin-common/src/main/java/me/guoguojie/config/ElPermissionConfig.java index 9ae1fd5d..fb13b1ab 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/ElPermissionConfig.java +++ b/eladmin-common/src/main/java/me/guoguojie/config/ElPermissionConfig.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; -import me.zhengjie.utils.SecurityUtils; +import me.guoguojie.utils.SecurityUtils; import org.springframework.security.core.GrantedAuthority; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java b/eladmin-common/src/main/java/me/guoguojie/config/FileProperties.java similarity index 95% rename from eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java rename to eladmin-common/src/main/java/me/guoguojie/config/FileProperties.java index bf0ebf6a..ce037123 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/FileProperties.java +++ b/eladmin-common/src/main/java/me/guoguojie/config/FileProperties.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import lombok.Data; -import me.zhengjie.utils.ElAdminConstant; +import me.guoguojie.utils.ElAdminConstant; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java b/eladmin-common/src/main/java/me/guoguojie/config/RedisConfig.java similarity index 90% rename from eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java rename to eladmin-common/src/main/java/me/guoguojie/config/RedisConfig.java index bad7f79f..a1021ddd 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java +++ b/eladmin-common/src/main/java/me/guoguojie/config/RedisConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSON; @@ -81,17 +81,17 @@ public class RedisConfig extends CachingConfigurerSupport { template.setValueSerializer(fastJsonRedisSerializer); template.setHashValueSerializer(fastJsonRedisSerializer); // fastjson 升级到 1.2.83 后需要指定序列化白名单 - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.domain"); - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.service.dto"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.domain"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.service.dto"); // 模块内的实体类 - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.mnt.domain"); - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.quartz.domain"); - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.system.domain"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.modules.mnt.domain"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.modules.quartz.domain"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.modules.system.domain"); // 模块内的 Dto - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.mnt.service.dto"); - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.quartz.service.dto"); - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.security.service.dto"); - ParserConfig.getGlobalInstance().addAccept("me.zhengjie.modules.system.service.dto"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.modules.mnt.service.dto"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.modules.quartz.service.dto"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.modules.security.service.dto"); + ParserConfig.getGlobalInstance().addAccept("me.guoguojie.modules.system.service.dto"); // key的序列化采用StringRedisSerializer template.setKeySerializer(new StringRedisSerializer()); template.setHashKeySerializer(new StringRedisSerializer()); diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java b/eladmin-common/src/main/java/me/guoguojie/config/RsaProperties.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java rename to eladmin-common/src/main/java/me/guoguojie/config/RsaProperties.java index a3594cdb..a4b68c81 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/RsaProperties.java +++ b/eladmin-common/src/main/java/me/guoguojie/config/RsaProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; @@ -35,4 +35,4 @@ public class RsaProperties { public void setPrivateKey(String privateKey) { RsaProperties.privateKey = privateKey; } -} \ No newline at end of file +} diff --git a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java b/eladmin-common/src/main/java/me/guoguojie/config/SwaggerConfig.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java rename to eladmin-common/src/main/java/me/guoguojie/config/SwaggerConfig.java index 50343bcb..ab6974b5 100644 --- a/eladmin-common/src/main/java/me/zhengjie/config/SwaggerConfig.java +++ b/eladmin-common/src/main/java/me/guoguojie/config/SwaggerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import com.fasterxml.classmate.TypeResolver; import com.google.common.base.Predicates; diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java b/eladmin-common/src/main/java/me/guoguojie/exception/BadConfigurationException.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java rename to eladmin-common/src/main/java/me/guoguojie/exception/BadConfigurationException.java index ede3691f..6c3d2917 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/BadConfigurationException.java +++ b/eladmin-common/src/main/java/me/guoguojie/exception/BadConfigurationException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.exception; +package me.guoguojie.exception; /** * 统一关于错误配置信息 异常 diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java b/eladmin-common/src/main/java/me/guoguojie/exception/BadRequestException.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java rename to eladmin-common/src/main/java/me/guoguojie/exception/BadRequestException.java index 900453bd..7d6a8b91 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/BadRequestException.java +++ b/eladmin-common/src/main/java/me/guoguojie/exception/BadRequestException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.exception; +package me.guoguojie.exception; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java b/eladmin-common/src/main/java/me/guoguojie/exception/EntityExistException.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java rename to eladmin-common/src/main/java/me/guoguojie/exception/EntityExistException.java index 03f9bf2a..d8f0faf1 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityExistException.java +++ b/eladmin-common/src/main/java/me/guoguojie/exception/EntityExistException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.exception; +package me.guoguojie.exception; import org.springframework.util.StringUtils; @@ -31,4 +31,4 @@ public class EntityExistException extends RuntimeException { return StringUtils.capitalize(entity) + " with " + field + " "+ val + " existed"; } -} \ No newline at end of file +} diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java b/eladmin-common/src/main/java/me/guoguojie/exception/EntityNotFoundException.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java rename to eladmin-common/src/main/java/me/guoguojie/exception/EntityNotFoundException.java index bcdc9562..2d919ae2 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/EntityNotFoundException.java +++ b/eladmin-common/src/main/java/me/guoguojie/exception/EntityNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.exception; +package me.guoguojie.exception; import org.springframework.util.StringUtils; @@ -31,4 +31,4 @@ public class EntityNotFoundException extends RuntimeException { return StringUtils.capitalize(entity) + " with " + field + " "+ val + " does not exist"; } -} \ No newline at end of file +} diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java b/eladmin-common/src/main/java/me/guoguojie/exception/handler/ApiError.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java rename to eladmin-common/src/main/java/me/guoguojie/exception/handler/ApiError.java index 5112730b..5c12674f 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/ApiError.java +++ b/eladmin-common/src/main/java/me/guoguojie/exception/handler/ApiError.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.exception.handler; +package me.guoguojie.exception.handler; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java b/eladmin-common/src/main/java/me/guoguojie/exception/handler/GlobalExceptionHandler.java similarity index 94% rename from eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java rename to eladmin-common/src/main/java/me/guoguojie/exception/handler/GlobalExceptionHandler.java index 56d73f7d..9e4d66ad 100644 --- a/eladmin-common/src/main/java/me/zhengjie/exception/handler/GlobalExceptionHandler.java +++ b/eladmin-common/src/main/java/me/guoguojie/exception/handler/GlobalExceptionHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.exception.handler; +package me.guoguojie.exception.handler; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.exception.EntityExistException; -import me.zhengjie.exception.EntityNotFoundException; -import me.zhengjie.utils.ThrowableUtil; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.exception.EntityNotFoundException; +import me.guoguojie.exception.EntityExistException; +import me.guoguojie.utils.ThrowableUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.BadCredentialsException; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java b/eladmin-common/src/main/java/me/guoguojie/utils/CacheKey.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java rename to eladmin-common/src/main/java/me/guoguojie/utils/CacheKey.java index 7485713f..916d2a49 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/CacheKey.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/CacheKey.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; /** * @author: liaojinlong diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java b/eladmin-common/src/main/java/me/guoguojie/utils/CallBack.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java rename to eladmin-common/src/main/java/me/guoguojie/utils/CallBack.java index 9b108127..12c503b4 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/CallBack.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/CallBack.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; /** * @author: liaojinlong diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java b/eladmin-common/src/main/java/me/guoguojie/utils/CloseUtil.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java rename to eladmin-common/src/main/java/me/guoguojie/utils/CloseUtil.java index 98d375be..89ff7dde 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/CloseUtil.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/CloseUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import java.io.Closeable; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java b/eladmin-common/src/main/java/me/guoguojie/utils/DateUtil.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java rename to eladmin-common/src/main/java/me/guoguojie/utils/DateUtil.java index 0b0bf637..487d5c5f 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/DateUtil.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/DateUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java b/eladmin-common/src/main/java/me/guoguojie/utils/ElAdminConstant.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java rename to eladmin-common/src/main/java/me/guoguojie/utils/ElAdminConstant.java index 08f9c3c1..01ec9fd2 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/ElAdminConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; /** * 常用静态常量 diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java b/eladmin-common/src/main/java/me/guoguojie/utils/EncryptUtils.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java rename to eladmin-common/src/main/java/me/guoguojie/utils/EncryptUtils.java index 4f334aac..8e7b8af8 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/EncryptUtils.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/EncryptUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import javax.crypto.Cipher; import javax.crypto.SecretKey; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/guoguojie/utils/FileUtil.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java rename to eladmin-common/src/main/java/me/guoguojie/utils/FileUtil.java index 0d8d5fb4..6f9d9b93 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/FileUtil.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; -import me.zhengjie.exception.BadRequestException; +import me.guoguojie.exception.BadRequestException; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.slf4j.Logger; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java b/eladmin-common/src/main/java/me/guoguojie/utils/PageUtil.java similarity index 98% rename from eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java rename to eladmin-common/src/main/java/me/guoguojie/utils/PageUtil.java index 44db68dd..b9f8dae1 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/PageUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import org.springframework.data.domain.Page; import java.util.*; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/guoguojie/utils/QueryHelp.java similarity index 98% rename from eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java rename to eladmin-common/src/main/java/me/guoguojie/utils/QueryHelp.java index 69cb5e24..7bcb873c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/QueryHelp.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.annotation.DataPermission; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.DataPermission; +import me.guoguojie.annotation.Query; + import javax.persistence.criteria.*; import java.lang.reflect.Field; import java.util.*; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java b/eladmin-common/src/main/java/me/guoguojie/utils/RedisUtils.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java rename to eladmin-common/src/main/java/me/guoguojie/utils/RedisUtils.java index b49b3ca5..86e24c5b 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/RedisUtils.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/RedisUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java b/eladmin-common/src/main/java/me/guoguojie/utils/RequestHolder.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java rename to eladmin-common/src/main/java/me/guoguojie/utils/RequestHolder.java index 71a4b9e5..af9ffd1c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/RequestHolder.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/RequestHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java b/eladmin-common/src/main/java/me/guoguojie/utils/RsaUtils.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java rename to eladmin-common/src/main/java/me/guoguojie/utils/RsaUtils.java index 8123ff38..41c95a59 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/RsaUtils.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/RsaUtils.java @@ -1,4 +1,4 @@ -package me.zhengjie.utils; +package me.guoguojie.utils; import org.apache.commons.codec.binary.Base64; import javax.crypto.Cipher; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java b/eladmin-common/src/main/java/me/guoguojie/utils/SecurityUtils.java similarity index 96% rename from eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java rename to eladmin-common/src/main/java/me/guoguojie/utils/SecurityUtils.java index 08f4c042..2c03d17e 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/SecurityUtils.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/SecurityUtils.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.utils.enums.DataScopeEnum; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.enums.DataScopeEnum; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java b/eladmin-common/src/main/java/me/guoguojie/utils/SpringContextHolder.java similarity index 99% rename from eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java rename to eladmin-common/src/main/java/me/guoguojie/utils/SpringContextHolder.java index d5a50bcf..4809f863 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/SpringContextHolder.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/SpringContextHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java b/eladmin-common/src/main/java/me/guoguojie/utils/StringUtils.java similarity index 98% rename from eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java rename to eladmin-common/src/main/java/me/guoguojie/utils/StringUtils.java index e0c262b0..c97e4476 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/StringUtils.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.config.ElAdminProperties; +import me.guoguojie.config.ElAdminProperties; import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; import net.dreamlu.mica.ip2region.core.IpInfo; import nl.basjes.parse.useragent.UserAgent; @@ -109,7 +109,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * toCapitalizeCamelCase("hello_world") == "HelloWorld" * toUnderScoreCase("helloWorld") = "hello_world" */ - static String toUnderScoreCase(String s) { + public static String toUnderScoreCase(String s) { if (s == null) { return null; } diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java b/eladmin-common/src/main/java/me/guoguojie/utils/ThrowableUtil.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java rename to eladmin-common/src/main/java/me/guoguojie/utils/ThrowableUtil.java index 075a65c5..c980a6b6 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/ThrowableUtil.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/ThrowableUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java b/eladmin-common/src/main/java/me/guoguojie/utils/TranslatorUtil.java similarity index 98% rename from eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java rename to eladmin-common/src/main/java/me/guoguojie/utils/TranslatorUtil.java index f2bd5d2d..2745267c 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/TranslatorUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import cn.hutool.json.JSONArray; import java.io.BufferedReader; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java b/eladmin-common/src/main/java/me/guoguojie/utils/ValidationUtil.java similarity index 94% rename from eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java rename to eladmin-common/src/main/java/me/guoguojie/utils/ValidationUtil.java index 57a4913d..83441b43 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/ValidationUtil.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/ValidationUtil.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import cn.hutool.core.util.ObjectUtil; -import me.zhengjie.exception.BadRequestException; +import me.guoguojie.exception.BadRequestException; import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator; /** diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java b/eladmin-common/src/main/java/me/guoguojie/utils/enums/CodeBiEnum.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java rename to eladmin-common/src/main/java/me/guoguojie/utils/enums/CodeBiEnum.java index 944bc71c..cb0180b6 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeBiEnum.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/enums/CodeBiEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils.enums; +package me.guoguojie.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java b/eladmin-common/src/main/java/me/guoguojie/utils/enums/CodeEnum.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java rename to eladmin-common/src/main/java/me/guoguojie/utils/enums/CodeEnum.java index 916862a6..af21443a 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/CodeEnum.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/enums/CodeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils.enums; +package me.guoguojie.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java b/eladmin-common/src/main/java/me/guoguojie/utils/enums/DataScopeEnum.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java rename to eladmin-common/src/main/java/me/guoguojie/utils/enums/DataScopeEnum.java index 465eef65..aa984882 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/DataScopeEnum.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/enums/DataScopeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils.enums; +package me.guoguojie.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java b/eladmin-common/src/main/java/me/guoguojie/utils/enums/RequestMethodEnum.java similarity index 97% rename from eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java rename to eladmin-common/src/main/java/me/guoguojie/utils/enums/RequestMethodEnum.java index 35e42b80..8e67af17 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/enums/RequestMethodEnum.java +++ b/eladmin-common/src/main/java/me/guoguojie/utils/enums/RequestMethodEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils.enums; +package me.guoguojie.utils.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java b/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java index 4f28ed37..bb87320e 100644 --- a/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java +++ b/eladmin-common/src/test/java/me/zhengjie/utils/DateUtilsTest.java @@ -1,5 +1,6 @@ -package me.zhengjie.utils; +package me.guoguojie.utils; +import me.guoguojie.utils.DateUtil; import org.junit.Test; import java.time.LocalDateTime; diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java b/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java index f909d9db..d24fc79c 100644 --- a/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java +++ b/eladmin-common/src/test/java/me/zhengjie/utils/EncryptUtilsTest.java @@ -1,8 +1,8 @@ -package me.zhengjie.utils; +package me.guoguojie.utils; import org.junit.Test; import static org.junit.Assert.*; -import static me.zhengjie.utils.EncryptUtils.*; +import static me.guoguojie.utils.EncryptUtils.*; public class EncryptUtilsTest { diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java b/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java index f069c158..0d92d537 100644 --- a/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java +++ b/eladmin-common/src/test/java/me/zhengjie/utils/FileUtilTest.java @@ -1,10 +1,10 @@ -package me.zhengjie.utils; +package me.guoguojie.utils; import org.junit.Test; import org.springframework.mock.web.MockMultipartFile; import static org.junit.Assert.*; -import static me.zhengjie.utils.FileUtil.*; +import static me.guoguojie.utils.FileUtil.*; public class FileUtilTest { diff --git a/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java b/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java index 12e875a8..4ce64c52 100644 --- a/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java +++ b/eladmin-common/src/test/java/me/zhengjie/utils/StringUtilsTest.java @@ -1,12 +1,13 @@ -package me.zhengjie.utils; +package me.guoguojie.utils; +import me.guoguojie.utils.StringUtils; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import java.text.SimpleDateFormat; import java.util.*; -import static me.zhengjie.utils.StringUtils.*; +import static me.guoguojie.utils.StringUtils.*; import static org.junit.Assert.*; public class StringUtilsTest { @@ -40,4 +41,4 @@ public class StringUtilsTest { public void testGetIP() { assertEquals("127.0.0.1", getIp(new MockHttpServletRequest())); } -} \ No newline at end of file +} diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml index 7aa21757..35bba78c 100644 --- a/eladmin-generator/pom.xml +++ b/eladmin-generator/pom.xml @@ -18,7 +18,7 @@ - me.zhengjie + me.guoguojie eladmin-common 2.6 diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java b/eladmin-generator/src/main/java/me/guoguojie/domain/ColumnInfo.java similarity index 97% rename from eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java rename to eladmin-generator/src/main/java/me/guoguojie/domain/ColumnInfo.java index fdb962a4..f029c6cf 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/ColumnInfo.java +++ b/eladmin-generator/src/main/java/me/guoguojie/domain/ColumnInfo.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import me.zhengjie.utils.GenUtil; +import me.guoguojie.utils.GenUtil; import javax.persistence.*; import java.io.Serializable; diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java b/eladmin-generator/src/main/java/me/guoguojie/domain/GenConfig.java similarity index 98% rename from eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java rename to eladmin-generator/src/main/java/me/guoguojie/domain/GenConfig.java index a2d67063..dc7f6100 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/GenConfig.java +++ b/eladmin-generator/src/main/java/me/guoguojie/domain/GenConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java b/eladmin-generator/src/main/java/me/guoguojie/domain/vo/TableInfo.java similarity index 97% rename from eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java rename to eladmin-generator/src/main/java/me/guoguojie/domain/vo/TableInfo.java index 1d3967b5..072fc316 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/domain/vo/TableInfo.java +++ b/eladmin-generator/src/main/java/me/guoguojie/domain/vo/TableInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain.vo; +package me.guoguojie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java b/eladmin-generator/src/main/java/me/guoguojie/repository/ColumnInfoRepository.java similarity index 93% rename from eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java rename to eladmin-generator/src/main/java/me/guoguojie/repository/ColumnInfoRepository.java index 4638be26..7fbf6554 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/repository/ColumnInfoRepository.java +++ b/eladmin-generator/src/main/java/me/guoguojie/repository/ColumnInfoRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.ColumnInfo; +import me.guoguojie.domain.ColumnInfo; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java b/eladmin-generator/src/main/java/me/guoguojie/repository/GenConfigRepository.java similarity index 92% rename from eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java rename to eladmin-generator/src/main/java/me/guoguojie/repository/GenConfigRepository.java index 18c9a0c8..9ab51c97 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/repository/GenConfigRepository.java +++ b/eladmin-generator/src/main/java/me/guoguojie/repository/GenConfigRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.GenConfig; +import me.guoguojie.domain.GenConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java b/eladmin-generator/src/main/java/me/guoguojie/rest/GenConfigController.java similarity index 93% rename from eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java rename to eladmin-generator/src/main/java/me/guoguojie/rest/GenConfigController.java index 1c099993..04a5388e 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java +++ b/eladmin-generator/src/main/java/me/guoguojie/rest/GenConfigController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.rest; +package me.guoguojie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.GenConfig; -import me.zhengjie.service.GenConfigService; +import me.guoguojie.domain.GenConfig; +import me.guoguojie.service.GenConfigService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/guoguojie/rest/GeneratorController.java similarity index 94% rename from eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java rename to eladmin-generator/src/main/java/me/guoguojie/rest/GeneratorController.java index bfdfecc0..c08c25dd 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java +++ b/eladmin-generator/src/main/java/me/guoguojie/rest/GeneratorController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.rest; +package me.guoguojie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.ColumnInfo; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.service.GenConfigService; -import me.zhengjie.service.GeneratorService; -import me.zhengjie.utils.PageUtil; +import me.guoguojie.domain.ColumnInfo; +import me.guoguojie.service.GenConfigService; +import me.guoguojie.service.GeneratorService; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.PageUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java b/eladmin-generator/src/main/java/me/guoguojie/service/GenConfigService.java similarity index 93% rename from eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java rename to eladmin-generator/src/main/java/me/guoguojie/service/GenConfigService.java index b5711f48..b1e86921 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GenConfigService.java +++ b/eladmin-generator/src/main/java/me/guoguojie/service/GenConfigService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service; +package me.guoguojie.service; -import me.zhengjie.domain.GenConfig; +import me.guoguojie.domain.GenConfig; /** * @author Zheng Jie diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java b/eladmin-generator/src/main/java/me/guoguojie/service/GeneratorService.java similarity index 93% rename from eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java rename to eladmin-generator/src/main/java/me/guoguojie/service/GeneratorService.java index b5a1e0a5..9b8ab0d8 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java +++ b/eladmin-generator/src/main/java/me/guoguojie/service/GeneratorService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service; +package me.guoguojie.service; -import me.zhengjie.domain.GenConfig; -import me.zhengjie.domain.ColumnInfo; +import me.guoguojie.domain.ColumnInfo; +import me.guoguojie.domain.GenConfig; import org.springframework.http.ResponseEntity; -import org.springframework.scheduling.annotation.Async; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java b/eladmin-generator/src/main/java/me/guoguojie/service/impl/GenConfigServiceImpl.java similarity index 90% rename from eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java rename to eladmin-generator/src/main/java/me/guoguojie/service/impl/GenConfigServiceImpl.java index bc2d061d..83b3b5f3 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GenConfigServiceImpl.java +++ b/eladmin-generator/src/main/java/me/guoguojie/service/impl/GenConfigServiceImpl.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.impl; +package me.guoguojie.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.GenConfig; -import me.zhengjie.repository.GenConfigRepository; -import me.zhengjie.service.GenConfigService; -import me.zhengjie.utils.StringUtils; +import me.guoguojie.domain.GenConfig; +import me.guoguojie.repository.GenConfigRepository; +import me.guoguojie.service.GenConfigService; import org.springframework.stereotype.Service; import java.io.File; diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/guoguojie/service/impl/GeneratorServiceImpl.java similarity index 94% rename from eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java rename to eladmin-generator/src/main/java/me/guoguojie/service/impl/GeneratorServiceImpl.java index 43255dfa..c71061db 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java +++ b/eladmin-generator/src/main/java/me/guoguojie/service/impl/GeneratorServiceImpl.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.impl; +package me.guoguojie.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.GenConfig; -import me.zhengjie.domain.ColumnInfo; -import me.zhengjie.domain.vo.TableInfo; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.repository.ColumnInfoRepository; -import me.zhengjie.service.GeneratorService; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.GenUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.StringUtils; +import me.guoguojie.domain.ColumnInfo; +import me.guoguojie.domain.GenConfig; +import me.guoguojie.domain.vo.TableInfo; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.repository.ColumnInfoRepository; +import me.guoguojie.service.GeneratorService; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.GenUtil; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java b/eladmin-generator/src/main/java/me/guoguojie/utils/ColUtil.java similarity index 98% rename from eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java rename to eladmin-generator/src/main/java/me/guoguojie/utils/ColUtil.java index b5fcd6b7..dd586e51 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/ColUtil.java +++ b/eladmin-generator/src/main/java/me/guoguojie/utils/ColUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import org.apache.commons.configuration.*; import org.slf4j.Logger; diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/guoguojie/utils/GenUtil.java similarity index 98% rename from eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java rename to eladmin-generator/src/main/java/me/guoguojie/utils/GenUtil.java index b1cb249e..7580454d 100644 --- a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java +++ b/eladmin-generator/src/main/java/me/guoguojie/utils/GenUtil.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.*; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.domain.GenConfig; -import me.zhengjie.domain.ColumnInfo; +import me.guoguojie.domain.ColumnInfo; +import me.guoguojie.domain.GenConfig; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.StringUtils; import org.springframework.util.ObjectUtils; import java.io.File; @@ -29,7 +31,7 @@ import java.io.Writer; import java.time.LocalDate; import java.util.*; -import static me.zhengjie.utils.FileUtil.SYS_TEM_DIR; +import static me.guoguojie.utils.FileUtil.SYS_TEM_DIR; /** * 代码生成 diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml index fd163559..f9c377dc 100644 --- a/eladmin-logging/pom.xml +++ b/eladmin-logging/pom.xml @@ -14,7 +14,7 @@ - me.zhengjie + me.guoguojie eladmin-common 2.6 diff --git a/eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java b/eladmin-logging/src/main/java/me/guoguojie/annotation/Log.java similarity index 96% rename from eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java rename to eladmin-logging/src/main/java/me/guoguojie/annotation/Log.java index 6c001cd3..f432b8f1 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/annotation/Log.java +++ b/eladmin-logging/src/main/java/me/guoguojie/annotation/Log.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.annotation; +package me.guoguojie.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java b/eladmin-logging/src/main/java/me/guoguojie/aspect/LogAspect.java similarity index 90% rename from eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java rename to eladmin-logging/src/main/java/me/guoguojie/aspect/LogAspect.java index 53e4532b..de09e7c8 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/aspect/LogAspect.java +++ b/eladmin-logging/src/main/java/me/guoguojie/aspect/LogAspect.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.aspect; +package me.guoguojie.aspect; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.domain.Log; -import me.zhengjie.service.LogService; -import me.zhengjie.utils.RequestHolder; -import me.zhengjie.utils.SecurityUtils; -import me.zhengjie.utils.StringUtils; -import me.zhengjie.utils.ThrowableUtil; +import me.guoguojie.domain.Log; +import me.guoguojie.service.LogService; +import me.guoguojie.utils.RequestHolder; +import me.guoguojie.utils.SecurityUtils; +import me.guoguojie.utils.StringUtils; +import me.guoguojie.utils.ThrowableUtil; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.AfterThrowing; @@ -51,7 +51,7 @@ public class LogAspect { /** * 配置切入点 */ - @Pointcut("@annotation(me.zhengjie.annotation.Log)") + @Pointcut("@annotation(me.guoguojie.annotation.Log)") public void logPointcut() { // 该方法无方法体,主要为了让同类中其他方法使用此切入点 } diff --git a/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java b/eladmin-logging/src/main/java/me/guoguojie/domain/Log.java similarity index 98% rename from eladmin-logging/src/main/java/me/zhengjie/domain/Log.java rename to eladmin-logging/src/main/java/me/guoguojie/domain/Log.java index 88dad027..99d7a8dd 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/domain/Log.java +++ b/eladmin-logging/src/main/java/me/guoguojie/domain/Log.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java b/eladmin-logging/src/main/java/me/guoguojie/repository/LogRepository.java similarity index 95% rename from eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java rename to eladmin-logging/src/main/java/me/guoguojie/repository/LogRepository.java index f7fc10e5..d6524731 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/repository/LogRepository.java +++ b/eladmin-logging/src/main/java/me/guoguojie/repository/LogRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.Log; +import me.guoguojie.domain.Log; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java b/eladmin-logging/src/main/java/me/guoguojie/rest/LogController.java similarity index 95% rename from eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java rename to eladmin-logging/src/main/java/me/guoguojie/rest/LogController.java index d4101449..ad307340 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java +++ b/eladmin-logging/src/main/java/me/guoguojie/rest/LogController.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.rest; +package me.guoguojie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.service.LogService; -import me.zhengjie.service.dto.LogQueryCriteria; -import me.zhengjie.utils.SecurityUtils; +import me.guoguojie.annotation.Log; +import me.guoguojie.service.LogService; +import me.guoguojie.service.dto.LogQueryCriteria; +import me.guoguojie.utils.SecurityUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java b/eladmin-logging/src/main/java/me/guoguojie/service/LogService.java similarity index 95% rename from eladmin-logging/src/main/java/me/zhengjie/service/LogService.java rename to eladmin-logging/src/main/java/me/guoguojie/service/LogService.java index d74dce68..f2fff203 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/LogService.java +++ b/eladmin-logging/src/main/java/me/guoguojie/service/LogService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service; +package me.guoguojie.service; -import me.zhengjie.domain.Log; -import me.zhengjie.service.dto.LogQueryCriteria; +import me.guoguojie.domain.Log; +import me.guoguojie.service.dto.LogQueryCriteria; import org.aspectj.lang.ProceedingJoinPoint; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java b/eladmin-logging/src/main/java/me/guoguojie/service/dto/LogErrorDTO.java similarity index 96% rename from eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java rename to eladmin-logging/src/main/java/me/guoguojie/service/dto/LogErrorDTO.java index bc0d4ec2..53d5dbec 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogErrorDTO.java +++ b/eladmin-logging/src/main/java/me/guoguojie/service/dto/LogErrorDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.dto; +package me.guoguojie.service.dto; import lombok.Data; import java.io.Serializable; @@ -43,4 +43,4 @@ public class LogErrorDTO implements Serializable { private String address; private Timestamp createTime; -} \ No newline at end of file +} diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java b/eladmin-logging/src/main/java/me/guoguojie/service/dto/LogQueryCriteria.java similarity index 93% rename from eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java rename to eladmin-logging/src/main/java/me/guoguojie/service/dto/LogQueryCriteria.java index 83406079..13e71ef8 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java +++ b/eladmin-logging/src/main/java/me/guoguojie/service/dto/LogQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.dto; +package me.guoguojie.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java b/eladmin-logging/src/main/java/me/guoguojie/service/dto/LogSmallDTO.java similarity index 96% rename from eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java rename to eladmin-logging/src/main/java/me/guoguojie/service/dto/LogSmallDTO.java index d074fd15..db551516 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/dto/LogSmallDTO.java +++ b/eladmin-logging/src/main/java/me/guoguojie/service/dto/LogSmallDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.dto; +package me.guoguojie.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/me/guoguojie/service/impl/LogServiceImpl.java similarity index 83% rename from eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java rename to eladmin-logging/src/main/java/me/guoguojie/service/impl/LogServiceImpl.java index ecc6efb8..dca5f1eb 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java +++ b/eladmin-logging/src/main/java/me/guoguojie/service/impl/LogServiceImpl.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.impl; +package me.guoguojie.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.Log; -import me.zhengjie.repository.LogRepository; -import me.zhengjie.service.LogService; -import me.zhengjie.service.dto.LogQueryCriteria; -import me.zhengjie.service.mapstruct.LogErrorMapper; -import me.zhengjie.service.mapstruct.LogSmallMapper; -import me.zhengjie.utils.*; +import me.guoguojie.annotation.Log; +import me.guoguojie.service.mapstruct.LogErrorMapper; +import me.guoguojie.service.mapstruct.LogSmallMapper; +import me.guoguojie.repository.LogRepository; +import me.guoguojie.service.LogService; +import me.guoguojie.service.dto.LogQueryCriteria; +import me.guoguojie.utils.*; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.data.domain.Page; @@ -54,7 +54,7 @@ public class LogServiceImpl implements LogService { @Override public Object queryAll(LogQueryCriteria criteria, Pageable pageable) { - Page page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable); + Page page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable); String status = "ERROR"; if (status.equals(criteria.getLogType())) { return PageUtil.toPage(page.map(logErrorMapper::toDto)); @@ -63,32 +63,32 @@ public class LogServiceImpl implements LogService { } @Override - public List queryAll(LogQueryCriteria criteria) { + public List queryAll(LogQueryCriteria criteria) { return logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb))); } @Override public Object queryAllByUser(LogQueryCriteria criteria, Pageable pageable) { - Page page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable); + Page page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable); return PageUtil.toPage(page.map(logSmallMapper::toDto)); } @Override @Transactional(rollbackFor = Exception.class) - public void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, Log log) { + public void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, me.guoguojie.domain.Log log) { if (log == null) { throw new IllegalArgumentException("Log 不能为 null!"); } MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = signature.getMethod(); - me.zhengjie.annotation.Log aopLog = method.getAnnotation(me.zhengjie.annotation.Log.class); + Log aopLog = method.getAnnotation(Log.class); // 方法路径 String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; // 描述 log.setDescription(aopLog.value()); - + log.setRequestIp(ip); log.setAddress(StringUtils.getCityInfo(log.getRequestIp())); log.setMethod(methodName); @@ -130,16 +130,16 @@ public class LogServiceImpl implements LogService { @Override public Object findByErrDetail(Long id) { - Log log = logRepository.findById(id).orElseGet(Log::new); + me.guoguojie.domain.Log log = logRepository.findById(id).orElseGet(me.guoguojie.domain.Log::new); ValidationUtil.isNull(log.getId(), "Log", "id", id); byte[] details = log.getExceptionDetail(); return Dict.create().set("exception", new String(ObjectUtil.isNotNull(details) ? details : "".getBytes())); } @Override - public void download(List logs, HttpServletResponse response) throws IOException { + public void download(List logs, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (Log log : logs) { + for (me.guoguojie.domain.Log log : logs) { Map map = new LinkedHashMap<>(); map.put("用户名", log.getUsername()); map.put("IP", log.getRequestIp()); diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java b/eladmin-logging/src/main/java/me/guoguojie/service/mapstruct/LogErrorMapper.java similarity index 84% rename from eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java rename to eladmin-logging/src/main/java/me/guoguojie/service/mapstruct/LogErrorMapper.java index 3ae02c90..ae6f1354 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogErrorMapper.java +++ b/eladmin-logging/src/main/java/me/guoguojie/service/mapstruct/LogErrorMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.mapstruct; +package me.guoguojie.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.domain.Log; -import me.zhengjie.service.dto.LogErrorDTO; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.domain.Log; +import me.guoguojie.service.dto.LogErrorDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface LogErrorMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java b/eladmin-logging/src/main/java/me/guoguojie/service/mapstruct/LogSmallMapper.java similarity index 84% rename from eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java rename to eladmin-logging/src/main/java/me/guoguojie/service/mapstruct/LogSmallMapper.java index 9f2972ad..2c496f0a 100644 --- a/eladmin-logging/src/main/java/me/zhengjie/service/mapstruct/LogSmallMapper.java +++ b/eladmin-logging/src/main/java/me/guoguojie/service/mapstruct/LogSmallMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.mapstruct; +package me.guoguojie.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.domain.Log; -import me.zhengjie.service.dto.LogSmallDTO; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.domain.Log; +import me.guoguojie.service.dto.LogSmallDTO; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface LogSmallMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml index 8195d6fb..ff24e8b6 100644 --- a/eladmin-system/pom.xml +++ b/eladmin-system/pom.xml @@ -21,12 +21,12 @@ - me.zhengjie + me.guoguojie eladmin-generator 2.6 - me.zhengjie + me.guoguojie eladmin-common @@ -34,7 +34,7 @@ - me.zhengjie + me.guoguojie eladmin-tools 2.6 diff --git a/eladmin-system/src/main/java/me/zhengjie/AppRun.java b/eladmin-system/src/main/java/me/guoguojie/AppRun.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/AppRun.java rename to eladmin-system/src/main/java/me/guoguojie/AppRun.java index f16bf975..547e8d1e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/AppRun.java +++ b/eladmin-system/src/main/java/me/guoguojie/AppRun.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie; +package me.guoguojie; import io.swagger.annotations.Api; -import me.zhengjie.annotation.rest.AnonymousGetMapping; -import me.zhengjie.utils.SpringContextHolder; +import me.guoguojie.annotation.rest.AnonymousGetMapping; +import me.guoguojie.utils.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.ApplicationPidFileWriter; diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/guoguojie/config/ConfigurerAdapter.java similarity index 98% rename from eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java rename to eladmin-system/src/main/java/me/guoguojie/config/ConfigurerAdapter.java index dca5b94b..de7ab7ef 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java +++ b/eladmin-system/src/main/java/me/guoguojie/config/ConfigurerAdapter.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; +import me.guoguojie.config.FileProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; diff --git a/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java b/eladmin-system/src/main/java/me/guoguojie/config/WebSocketConfig.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java rename to eladmin-system/src/main/java/me/guoguojie/config/WebSocketConfig.java index f55f5c60..7c41ad26 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/WebSocketConfig.java +++ b/eladmin-system/src/main/java/me/guoguojie/config/WebSocketConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java b/eladmin-system/src/main/java/me/guoguojie/config/thread/AsyncTaskExecutePool.java similarity index 98% rename from eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java rename to eladmin-system/src/main/java/me/guoguojie/config/thread/AsyncTaskExecutePool.java index 133cf55f..a51c7ec0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java +++ b/eladmin-system/src/main/java/me/guoguojie/config/thread/AsyncTaskExecutePool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config.thread; +package me.guoguojie.config.thread; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java b/eladmin-system/src/main/java/me/guoguojie/config/thread/AsyncTaskProperties.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java rename to eladmin-system/src/main/java/me/guoguojie/config/thread/AsyncTaskProperties.java index 6e075eab..87442f39 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java +++ b/eladmin-system/src/main/java/me/guoguojie/config/thread/AsyncTaskProperties.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config.thread; +package me.guoguojie.config.thread; import lombok.Data; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java b/eladmin-system/src/main/java/me/guoguojie/config/thread/TheadFactoryName.java similarity index 98% rename from eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java rename to eladmin-system/src/main/java/me/guoguojie/config/thread/TheadFactoryName.java index 4cc8ae91..909b6c66 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/thread/TheadFactoryName.java +++ b/eladmin-system/src/main/java/me/guoguojie/config/thread/TheadFactoryName.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config.thread; +package me.guoguojie.config.thread; import org.springframework.stereotype.Component; diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java b/eladmin-system/src/main/java/me/guoguojie/config/thread/ThreadPoolExecutorUtil.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java rename to eladmin-system/src/main/java/me/guoguojie/config/thread/ThreadPoolExecutorUtil.java index 8e04aa2b..081a7d47 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java +++ b/eladmin-system/src/main/java/me/guoguojie/config/thread/ThreadPoolExecutorUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config.thread; +package me.guoguojie.config.thread; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/App.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/App.java index cf5789c9..cd197291 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/App.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/App.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain; +package me.guoguojie.modules.mnt.domain; import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import java.io.Serializable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/Database.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/Database.java index 6b3a68a6..f0a2ba7a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Database.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/Database.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain; +package me.guoguojie.modules.mnt.domain; import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import java.io.Serializable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/Deploy.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/Deploy.java index bcf61e54..68ddd43d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/Deploy.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/Deploy.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain; +package me.guoguojie.modules.mnt.domain; import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import java.io.Serializable; import java.util.Set; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/DeployHistory.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/DeployHistory.java index 6e07e136..d76cad45 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/DeployHistory.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/DeployHistory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain; +package me.guoguojie.modules.mnt.domain; import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.BeanUtil; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/ServerDeploy.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/ServerDeploy.java index f5235627..d5ec7054 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/domain/ServerDeploy.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/domain/ServerDeploy.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.domain; +package me.guoguojie.modules.mnt.domain; import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import java.io.Serializable; import java.util.Objects; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/AppRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/AppRepository.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/AppRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/AppRepository.java index 41e5f5c9..df60c4df 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/AppRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/AppRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.repository; +package me.guoguojie.modules.mnt.repository; -import me.zhengjie.modules.mnt.domain.App; +import me.guoguojie.modules.mnt.domain.App; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DatabaseRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DatabaseRepository.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DatabaseRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DatabaseRepository.java index 695e0adc..b910a5a4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DatabaseRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DatabaseRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.repository; +package me.guoguojie.modules.mnt.repository; -import me.zhengjie.modules.mnt.domain.Database; +import me.guoguojie.modules.mnt.domain.Database; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployHistoryRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DeployHistoryRepository.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployHistoryRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DeployHistoryRepository.java index 3c8980ec..66a66284 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployHistoryRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DeployHistoryRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.repository; +package me.guoguojie.modules.mnt.repository; -import me.zhengjie.modules.mnt.domain.DeployHistory; +import me.guoguojie.modules.mnt.domain.DeployHistory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DeployRepository.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DeployRepository.java index 2ea44986..5a8dc197 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/DeployRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/DeployRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.repository; +package me.guoguojie.modules.mnt.repository; -import me.zhengjie.modules.mnt.domain.Deploy; +import me.guoguojie.modules.mnt.domain.Deploy; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/ServerDeployRepository.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/ServerDeployRepository.java index 4ca336c0..2a2d3ac7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/repository/ServerDeployRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/repository/ServerDeployRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.repository; +package me.guoguojie.modules.mnt.repository; -import me.zhengjie.modules.mnt.domain.ServerDeploy; +import me.guoguojie.modules.mnt.domain.ServerDeploy; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/AppController.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/AppController.java index 61ce07c1..440794ee 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/AppController.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.rest; +package me.guoguojie.modules.mnt.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.service.AppService; -import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria; +import me.guoguojie.modules.mnt.domain.App; +import me.guoguojie.modules.mnt.service.AppService; +import me.guoguojie.modules.mnt.service.dto.AppQueryCriteria; +import me.guoguojie.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DatabaseController.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DatabaseController.java index 215c802a..f5802a3c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DatabaseController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.rest; +package me.guoguojie.modules.mnt.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.service.DatabaseService; -import me.zhengjie.modules.mnt.service.dto.DatabaseDto; -import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria; -import me.zhengjie.modules.mnt.util.SqlUtils; -import me.zhengjie.utils.FileUtil; +import me.guoguojie.modules.mnt.domain.Database; +import me.guoguojie.modules.mnt.service.DatabaseService; +import me.guoguojie.modules.mnt.service.dto.DatabaseDto; +import me.guoguojie.modules.mnt.service.dto.DatabaseQueryCriteria; +import me.guoguojie.modules.mnt.util.SqlUtils; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.FileUtil; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DeployController.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DeployController.java index 38197e82..c2a9b8b8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DeployController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.rest; +package me.guoguojie.modules.mnt.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.modules.mnt.domain.Deploy; -import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.service.DeployService; -import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria; -import me.zhengjie.utils.FileUtil; +import me.guoguojie.modules.mnt.domain.Deploy; +import me.guoguojie.modules.mnt.domain.DeployHistory; +import me.guoguojie.modules.mnt.service.DeployService; +import me.guoguojie.modules.mnt.service.dto.DeployQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.utils.FileUtil; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DeployHistoryController.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DeployHistoryController.java index 2d1037ba..6821280d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/DeployHistoryController.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.rest; +package me.guoguojie.modules.mnt.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.modules.mnt.service.DeployHistoryService; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria; +import me.guoguojie.modules.mnt.service.DeployHistoryService; +import me.guoguojie.modules.mnt.service.dto.DeployHistoryQueryCriteria; +import me.guoguojie.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/ServerDeployController.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/ServerDeployController.java index 894a90a9..6e949e54 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/ServerDeployController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/rest/ServerDeployController.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.rest; +package me.guoguojie.modules.mnt.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.modules.mnt.domain.ServerDeploy; -import me.zhengjie.modules.mnt.service.ServerDeployService; -import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria; +import me.guoguojie.modules.mnt.domain.ServerDeploy; +import me.guoguojie.modules.mnt.service.ServerDeployService; +import me.guoguojie.modules.mnt.service.dto.ServerDeployQueryCriteria; +import me.guoguojie.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/AppService.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/AppService.java index c8227785..3899aba6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/AppService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/AppService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service; +package me.guoguojie.modules.mnt.service; -import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.service.dto.AppDto; -import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria; +import me.guoguojie.modules.mnt.domain.App; +import me.guoguojie.modules.mnt.service.dto.AppDto; +import me.guoguojie.modules.mnt.service.dto.AppQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DatabaseService.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DatabaseService.java index e8a3acb7..a7706e54 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DatabaseService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DatabaseService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service; +package me.guoguojie.modules.mnt.service; -import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.service.dto.DatabaseDto; -import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria; +import me.guoguojie.modules.mnt.domain.Database; +import me.guoguojie.modules.mnt.service.dto.DatabaseDto; +import me.guoguojie.modules.mnt.service.dto.DatabaseQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DeployHistoryService.java similarity index 88% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DeployHistoryService.java index 5eb1b3de..3e9777c3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployHistoryService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DeployHistoryService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service; +package me.guoguojie.modules.mnt.service; -import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria; +import me.guoguojie.modules.mnt.domain.DeployHistory; +import me.guoguojie.modules.mnt.service.dto.DeployHistoryDto; +import me.guoguojie.modules.mnt.service.dto.DeployHistoryQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DeployService.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DeployService.java index 583474d7..0872dae9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/DeployService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/DeployService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service; +package me.guoguojie.modules.mnt.service; -import me.zhengjie.modules.mnt.domain.Deploy; -import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.service.dto.DeployDto; -import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria; +import me.guoguojie.modules.mnt.domain.Deploy; +import me.guoguojie.modules.mnt.domain.DeployHistory; +import me.guoguojie.modules.mnt.service.dto.DeployDto; +import me.guoguojie.modules.mnt.service.dto.DeployQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/ServerDeployService.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/ServerDeployService.java index be8bb573..75a937fd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/ServerDeployService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/ServerDeployService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service; +package me.guoguojie.modules.mnt.service; -import me.zhengjie.modules.mnt.domain.ServerDeploy; -import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; -import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria; +import me.guoguojie.modules.mnt.domain.ServerDeploy; +import me.guoguojie.modules.mnt.service.dto.ServerDeployDto; +import me.guoguojie.modules.mnt.service.dto.ServerDeployQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/AppDto.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/AppDto.java index c6fd6f74..0b415f97 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/AppDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/AppQueryCriteria.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/AppQueryCriteria.java index 17f358f7..dba87537 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/AppQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/AppQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DatabaseDto.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DatabaseDto.java index 689b06b9..d3793ee9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DatabaseDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DatabaseQueryCriteria.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DatabaseQueryCriteria.java index 53d619d4..1da4d7eb 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DatabaseQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DatabaseQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployDto.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployDto.java index f3d77b8e..901d1db3 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployDto.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import cn.hutool.core.collection.CollectionUtil; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; import java.util.Objects; import java.util.Set; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployHistoryDto.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployHistoryDto.java index a9f480cf..58d0bbbe 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployHistoryDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java index c34f1242..15fcbe13 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployHistoryQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployQueryCriteria.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployQueryCriteria.java index c404620a..4c539748 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/DeployQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/DeployQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/ServerDeployDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/ServerDeployDto.java index a49c7950..1549ebc6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/ServerDeployDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; import java.util.Objects; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/ServerDeployQueryCriteria.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/ServerDeployQueryCriteria.java index bb8bd412..b6bd8f6b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/dto/ServerDeployQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/dto/ServerDeployQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.dto; +package me.guoguojie.modules.mnt.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/AppServiceImpl.java similarity index 88% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/AppServiceImpl.java index 42b088ff..0cb4f624 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/AppServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/AppServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.impl; +package me.guoguojie.modules.mnt.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.repository.AppRepository; -import me.zhengjie.modules.mnt.service.AppService; -import me.zhengjie.modules.mnt.service.dto.AppDto; -import me.zhengjie.modules.mnt.service.dto.AppQueryCriteria; -import me.zhengjie.modules.mnt.service.mapstruct.AppMapper; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; -import me.zhengjie.utils.ValidationUtil; +import me.guoguojie.modules.mnt.repository.AppRepository; +import me.guoguojie.modules.mnt.service.dto.AppDto; +import me.guoguojie.modules.mnt.service.dto.AppQueryCriteria; +import me.guoguojie.modules.mnt.service.mapstruct.AppMapper; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.mnt.domain.App; +import me.guoguojie.modules.mnt.service.AppService; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.QueryHelp; +import me.guoguojie.utils.ValidationUtil; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DatabaseServiceImpl.java similarity index 86% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DatabaseServiceImpl.java index c7740285..8b147c57 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DatabaseServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DatabaseServiceImpl.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.impl; +package me.guoguojie.modules.mnt.service.impl; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.repository.DatabaseRepository; -import me.zhengjie.modules.mnt.service.DatabaseService; -import me.zhengjie.modules.mnt.service.dto.DatabaseDto; -import me.zhengjie.modules.mnt.service.dto.DatabaseQueryCriteria; -import me.zhengjie.modules.mnt.service.mapstruct.DatabaseMapper; -import me.zhengjie.modules.mnt.util.SqlUtils; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; -import me.zhengjie.utils.ValidationUtil; +import me.guoguojie.modules.mnt.repository.DatabaseRepository; +import me.guoguojie.modules.mnt.service.dto.DatabaseDto; +import me.guoguojie.modules.mnt.service.dto.DatabaseQueryCriteria; +import me.guoguojie.modules.mnt.domain.Database; +import me.guoguojie.modules.mnt.service.DatabaseService; +import me.guoguojie.modules.mnt.service.mapstruct.DatabaseMapper; +import me.guoguojie.modules.mnt.util.SqlUtils; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.QueryHelp; +import me.guoguojie.utils.ValidationUtil; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DeployHistoryServiceImpl.java similarity index 85% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DeployHistoryServiceImpl.java index 7431113d..d294bbc9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployHistoryServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DeployHistoryServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.impl; +package me.guoguojie.modules.mnt.service.impl; import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.repository.DeployHistoryRepository; -import me.zhengjie.modules.mnt.service.DeployHistoryService; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryQueryCriteria; -import me.zhengjie.modules.mnt.service.mapstruct.DeployHistoryMapper; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; -import me.zhengjie.utils.ValidationUtil; +import me.guoguojie.modules.mnt.repository.DeployHistoryRepository; +import me.guoguojie.modules.mnt.service.dto.DeployHistoryDto; +import me.guoguojie.modules.mnt.service.dto.DeployHistoryQueryCriteria; +import me.guoguojie.modules.mnt.service.mapstruct.DeployHistoryMapper; +import me.guoguojie.modules.mnt.domain.DeployHistory; +import me.guoguojie.modules.mnt.service.DeployHistoryService; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.QueryHelp; +import me.guoguojie.utils.ValidationUtil; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DeployServiceImpl.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DeployServiceImpl.java index f2491cda..96c31a04 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/DeployServiceImpl.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.impl; +package me.guoguojie.modules.mnt.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.domain.Deploy; -import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.domain.ServerDeploy; -import me.zhengjie.modules.mnt.repository.DeployRepository; -import me.zhengjie.modules.mnt.service.DeployHistoryService; -import me.zhengjie.modules.mnt.service.DeployService; -import me.zhengjie.modules.mnt.service.ServerDeployService; -import me.zhengjie.modules.mnt.service.dto.AppDto; -import me.zhengjie.modules.mnt.service.dto.DeployDto; -import me.zhengjie.modules.mnt.service.dto.DeployQueryCriteria; -import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; -import me.zhengjie.modules.mnt.service.mapstruct.DeployMapper; -import me.zhengjie.modules.mnt.util.ExecuteShellUtil; -import me.zhengjie.modules.mnt.util.ScpClientUtil; -import me.zhengjie.modules.mnt.websocket.MsgType; -import me.zhengjie.modules.mnt.websocket.SocketMsg; -import me.zhengjie.modules.mnt.websocket.WebSocketServer; -import me.zhengjie.utils.*; +import me.guoguojie.modules.mnt.repository.DeployRepository; +import me.guoguojie.modules.mnt.service.dto.AppDto; +import me.guoguojie.modules.mnt.service.dto.DeployDto; +import me.guoguojie.modules.mnt.service.dto.DeployQueryCriteria; +import me.guoguojie.modules.mnt.service.dto.ServerDeployDto; +import me.guoguojie.modules.mnt.service.mapstruct.DeployMapper; +import me.guoguojie.modules.mnt.websocket.MsgType; +import me.guoguojie.modules.mnt.websocket.SocketMsg; +import me.guoguojie.modules.mnt.websocket.WebSocketServer; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.mnt.domain.App; +import me.guoguojie.modules.mnt.domain.Deploy; +import me.guoguojie.modules.mnt.domain.DeployHistory; +import me.guoguojie.modules.mnt.domain.ServerDeploy; +import me.guoguojie.modules.mnt.service.DeployHistoryService; +import me.guoguojie.modules.mnt.service.DeployService; +import me.guoguojie.modules.mnt.service.ServerDeployService; +import me.guoguojie.modules.mnt.util.ExecuteShellUtil; +import me.guoguojie.modules.mnt.util.ScpClientUtil; +import me.guoguojie.utils.*; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/ServerDeployServiceImpl.java similarity index 86% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/ServerDeployServiceImpl.java index 63272dae..d2e9e8cc 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/ServerDeployServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/impl/ServerDeployServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.impl; +package me.guoguojie.modules.mnt.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.mnt.domain.ServerDeploy; -import me.zhengjie.modules.mnt.repository.ServerDeployRepository; -import me.zhengjie.modules.mnt.service.ServerDeployService; -import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; -import me.zhengjie.modules.mnt.service.dto.ServerDeployQueryCriteria; -import me.zhengjie.modules.mnt.service.mapstruct.ServerDeployMapper; -import me.zhengjie.modules.mnt.util.ExecuteShellUtil; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; -import me.zhengjie.utils.ValidationUtil; +import me.guoguojie.modules.mnt.repository.ServerDeployRepository; +import me.guoguojie.modules.mnt.service.dto.ServerDeployDto; +import me.guoguojie.modules.mnt.service.dto.ServerDeployQueryCriteria; +import me.guoguojie.modules.mnt.service.mapstruct.ServerDeployMapper; +import me.guoguojie.modules.mnt.domain.ServerDeploy; +import me.guoguojie.modules.mnt.service.ServerDeployService; +import me.guoguojie.modules.mnt.util.ExecuteShellUtil; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.QueryHelp; +import me.guoguojie.utils.ValidationUtil; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/AppMapper.java similarity index 82% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/AppMapper.java index fc39eeb2..86c50948 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/AppMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/AppMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapstruct; +package me.guoguojie.modules.mnt.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.mnt.domain.App; -import me.zhengjie.modules.mnt.service.dto.AppDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.mnt.domain.App; +import me.guoguojie.modules.mnt.service.dto.AppDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DatabaseMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DatabaseMapper.java index 3cc6e8dd..e5cffc4c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DatabaseMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DatabaseMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapstruct; +package me.guoguojie.modules.mnt.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.mnt.domain.Database; -import me.zhengjie.modules.mnt.service.dto.DatabaseDto; +import me.guoguojie.modules.mnt.service.dto.DatabaseDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.mnt.domain.Database; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DeployHistoryMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DeployHistoryMapper.java index 2522ab02..b45ada8c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployHistoryMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DeployHistoryMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapstruct; +package me.guoguojie.modules.mnt.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.mnt.domain.DeployHistory; -import me.zhengjie.modules.mnt.service.dto.DeployHistoryDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.mnt.domain.DeployHistory; +import me.guoguojie.modules.mnt.service.dto.DeployHistoryDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DeployMapper.java similarity index 82% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DeployMapper.java index cd3edee8..c98d6f36 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/DeployMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/DeployMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapstruct; +package me.guoguojie.modules.mnt.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.mnt.domain.Deploy; -import me.zhengjie.modules.mnt.service.dto.DeployDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.mnt.domain.Deploy; +import me.guoguojie.modules.mnt.service.dto.DeployDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/ServerDeployMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/ServerDeployMapper.java index 960b25b1..9624df75 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/mapstruct/ServerDeployMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/service/mapstruct/ServerDeployMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.service.mapstruct; +package me.guoguojie.modules.mnt.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.mnt.domain.ServerDeploy; -import me.zhengjie.modules.mnt.service.dto.ServerDeployDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.mnt.domain.ServerDeploy; +import me.guoguojie.modules.mnt.service.dto.ServerDeployDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/DataTypeEnum.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/DataTypeEnum.java similarity index 99% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/DataTypeEnum.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/DataTypeEnum.java index e104b9ee..46a6ae02 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/DataTypeEnum.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/DataTypeEnum.java @@ -17,7 +17,7 @@ * */ -package me.zhengjie.modules.mnt.util; +package me.guoguojie.modules.mnt.util; import lombok.extern.slf4j.Slf4j; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ExecuteShellUtil.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/ExecuteShellUtil.java similarity index 98% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ExecuteShellUtil.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/ExecuteShellUtil.java index a5d5b599..7ec0c1c1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ExecuteShellUtil.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/ExecuteShellUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.util; +package me.guoguojie.modules.mnt.util; import cn.hutool.core.io.IoUtil; import com.jcraft.jsch.ChannelShell; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/ScpClientUtil.java similarity index 98% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/ScpClientUtil.java index 7cb83aa1..16cd4a5f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/ScpClientUtil.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/ScpClientUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.util; +package me.guoguojie.modules.mnt.util; import ch.ethz.ssh2.Connection; import ch.ethz.ssh2.SCPClient; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/SqlUtils.java similarity index 98% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/SqlUtils.java index d7e06b17..1b797a7c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/util/SqlUtils.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/util/SqlUtils.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.util; +package me.guoguojie.modules.mnt.util; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.StringUtils; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.utils.CloseUtil; +import me.guoguojie.utils.CloseUtil; import javax.sql.DataSource; import java.io.BufferedReader; import java.io.File; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/MsgType.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/MsgType.java index 2fc473da..97b7418b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/MsgType.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/MsgType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.websocket; +package me.guoguojie.modules.mnt.websocket; /** * @author ZhangHouYing diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/SocketMsg.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/SocketMsg.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/SocketMsg.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/SocketMsg.java index ade33a24..3beaaf28 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/SocketMsg.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/SocketMsg.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.websocket; +package me.guoguojie.modules.mnt.websocket; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/WebSocketServer.java similarity index 98% rename from eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java rename to eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/WebSocketServer.java index 9c92165b..5e6e0c62 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketServer.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/mnt/websocket/WebSocketServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.mnt.websocket; +package me.guoguojie.modules.mnt.websocket; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/config/JobRunner.java similarity index 87% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/config/JobRunner.java index a5a9c91f..54c6fe89 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/config/JobRunner.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.config; +package me.guoguojie.modules.quartz.config; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.quartz.domain.QuartzJob; -import me.zhengjie.modules.quartz.repository.QuartzJobRepository; -import me.zhengjie.modules.quartz.utils.QuartzManage; +import me.guoguojie.modules.quartz.domain.QuartzJob; +import me.guoguojie.modules.quartz.repository.QuartzJobRepository; +import me.guoguojie.modules.quartz.utils.QuartzManage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.ApplicationArguments; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/config/QuartzConfig.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/config/QuartzConfig.java index 99f2e50e..dea21619 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/QuartzConfig.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/config/QuartzConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.config; +package me.guoguojie.modules.quartz.config; import org.quartz.spi.TriggerFiredBundle; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/domain/QuartzJob.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/domain/QuartzJob.java index 39e11f42..22a678f5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzJob.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/domain/QuartzJob.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.domain; +package me.guoguojie.modules.quartz.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -82,4 +82,4 @@ public class QuartzJob extends BaseEntity implements Serializable { @NotBlank @ApiModelProperty(value = "备注") private String description; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/domain/QuartzLog.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/domain/QuartzLog.java index 4de57ec1..f7e6d70b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/domain/QuartzLog.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/domain/QuartzLog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.domain; +package me.guoguojie.modules.quartz.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/repository/QuartzJobRepository.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/repository/QuartzJobRepository.java index 79b222be..34870963 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzJobRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/repository/QuartzJobRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.repository; +package me.guoguojie.modules.quartz.repository; -import me.zhengjie.modules.quartz.domain.QuartzJob; +import me.guoguojie.modules.quartz.domain.QuartzJob; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/repository/QuartzLogRepository.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/repository/QuartzLogRepository.java index db724aa4..6545b6f0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/repository/QuartzLogRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/repository/QuartzLogRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.repository; +package me.guoguojie.modules.quartz.repository; -import me.zhengjie.modules.quartz.domain.QuartzLog; +import me.guoguojie.modules.quartz.domain.QuartzLog; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/rest/QuartzJobController.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/rest/QuartzJobController.java index 31613572..4af0b2a2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/rest/QuartzJobController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/rest/QuartzJobController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.rest; +package me.guoguojie.modules.quartz.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.annotation.Log; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.quartz.domain.QuartzJob; -import me.zhengjie.modules.quartz.service.QuartzJobService; -import me.zhengjie.modules.quartz.service.dto.JobQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.quartz.domain.QuartzJob; +import me.guoguojie.modules.quartz.service.QuartzJobService; +import me.guoguojie.modules.quartz.service.dto.JobQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/QuartzJobService.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/QuartzJobService.java index b32850e9..74966a4a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/QuartzJobService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/QuartzJobService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.service; +package me.guoguojie.modules.quartz.service; -import me.zhengjie.modules.quartz.domain.QuartzJob; -import me.zhengjie.modules.quartz.domain.QuartzLog; -import me.zhengjie.modules.quartz.service.dto.JobQueryCriteria; +import me.guoguojie.modules.quartz.domain.QuartzJob; +import me.guoguojie.modules.quartz.domain.QuartzLog; +import me.guoguojie.modules.quartz.service.dto.JobQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/dto/JobQueryCriteria.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/dto/JobQueryCriteria.java index 6cec0f19..1eb32a30 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/dto/JobQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/dto/JobQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.service.dto; +package me.guoguojie.modules.quartz.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/impl/QuartzJobServiceImpl.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/impl/QuartzJobServiceImpl.java index 42ee326f..96c0e8b7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.service.impl; +package me.guoguojie.modules.quartz.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.quartz.domain.QuartzJob; -import me.zhengjie.modules.quartz.domain.QuartzLog; -import me.zhengjie.modules.quartz.repository.QuartzJobRepository; -import me.zhengjie.modules.quartz.repository.QuartzLogRepository; -import me.zhengjie.modules.quartz.service.QuartzJobService; -import me.zhengjie.modules.quartz.service.dto.JobQueryCriteria; -import me.zhengjie.modules.quartz.utils.QuartzManage; -import me.zhengjie.utils.*; +import me.guoguojie.modules.quartz.repository.QuartzJobRepository; +import me.guoguojie.modules.quartz.repository.QuartzLogRepository; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.quartz.domain.QuartzJob; +import me.guoguojie.modules.quartz.domain.QuartzLog; +import me.guoguojie.modules.quartz.service.QuartzJobService; +import me.guoguojie.modules.quartz.service.dto.JobQueryCriteria; +import me.guoguojie.modules.quartz.utils.QuartzManage; +import me.guoguojie.utils.*; import org.quartz.CronExpression; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/task/TestTask.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/task/TestTask.java index da1c8ff4..06ef5697 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/task/TestTask.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.task; +package me.guoguojie.modules.quartz.task; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/ExecutionJob.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/ExecutionJob.java index 0b352079..274e3849 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/ExecutionJob.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/ExecutionJob.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.utils; +package me.guoguojie.modules.quartz.utils; 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.domain.vo.EmailVo; -import me.zhengjie.modules.quartz.domain.QuartzJob; -import me.zhengjie.modules.quartz.domain.QuartzLog; -import me.zhengjie.modules.quartz.repository.QuartzLogRepository; -import me.zhengjie.modules.quartz.service.QuartzJobService; -import me.zhengjie.service.EmailService; -import me.zhengjie.utils.RedisUtils; -import me.zhengjie.utils.SpringContextHolder; -import me.zhengjie.utils.StringUtils; -import me.zhengjie.utils.ThrowableUtil; +import me.guoguojie.modules.quartz.repository.QuartzLogRepository; +import me.guoguojie.domain.vo.EmailVo; +import me.guoguojie.modules.quartz.domain.QuartzJob; +import me.guoguojie.modules.quartz.domain.QuartzLog; +import me.guoguojie.modules.quartz.service.QuartzJobService; +import me.guoguojie.service.EmailService; +import me.guoguojie.utils.RedisUtils; +import me.guoguojie.utils.SpringContextHolder; +import me.guoguojie.utils.StringUtils; +import me.guoguojie.utils.ThrowableUtil; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/QuartzManage.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/QuartzManage.java index e0cf1e0a..1569cac9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzManage.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/QuartzManage.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.utils; +package me.guoguojie.modules.quartz.utils; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.quartz.domain.QuartzJob; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.quartz.domain.QuartzJob; import org.quartz.*; import org.quartz.impl.triggers.CronTriggerImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.Date; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/QuartzRunnable.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java rename to eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/QuartzRunnable.java index 31c3a0f8..d2dc45e8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/utils/QuartzRunnable.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/quartz/utils/QuartzRunnable.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.quartz.utils; +package me.guoguojie.modules.quartz.utils; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.utils.SpringContextHolder; +import me.guoguojie.utils.SpringContextHolder; import org.apache.commons.lang3.StringUtils; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/ConfigBeanConfiguration.java similarity index 87% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/config/ConfigBeanConfiguration.java index 8cbc88dd..8b373d1d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/ConfigBeanConfiguration.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/ConfigBeanConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.config; +package me.guoguojie.modules.security.config; -import me.zhengjie.modules.security.config.bean.LoginProperties; -import me.zhengjie.modules.security.config.bean.SecurityProperties; +import me.guoguojie.modules.security.config.bean.LoginProperties; +import me.guoguojie.modules.security.config.bean.SecurityProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/SpringSecurityConfig.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/config/SpringSecurityConfig.java index ad886f31..fe54a2be 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/SpringSecurityConfig.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/SpringSecurityConfig.java @@ -13,15 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.config; +package me.guoguojie.modules.security.config; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.AnonymousAccess; -import me.zhengjie.modules.security.config.bean.SecurityProperties; -import me.zhengjie.modules.security.security.*; -import me.zhengjie.modules.security.service.OnlineUserService; -import me.zhengjie.modules.security.service.UserCacheManager; -import me.zhengjie.utils.enums.RequestMethodEnum; +import me.guoguojie.modules.security.config.bean.SecurityProperties; +import me.guoguojie.modules.security.security.JwtAccessDeniedHandler; +import me.guoguojie.modules.security.security.JwtAuthenticationEntryPoint; +import me.guoguojie.modules.security.security.TokenConfigurer; +import me.guoguojie.modules.security.security.TokenProvider; +import me.guoguojie.annotation.AnonymousAccess; +import me.guoguojie.modules.security.security.*; +import me.guoguojie.modules.security.service.OnlineUserService; +import me.guoguojie.modules.security.service.UserCacheManager; +import me.guoguojie.utils.enums.RequestMethodEnum; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginCode.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginCode.java index fefd252b..30a80aaa 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCode.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.config.bean; +package me.guoguojie.modules.security.config.bean; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginCodeEnum.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginCodeEnum.java index 685ccbbb..042aca3b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginCodeEnum.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginCodeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.config.bean; +package me.guoguojie.modules.security.config.bean; /** * 验证码配置枚举 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginProperties.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginProperties.java index 1e00f2fe..32ecdd21 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/LoginProperties.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/LoginProperties.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.config.bean; +package me.guoguojie.modules.security.config.bean; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; import lombok.Data; -import me.zhengjie.exception.BadConfigurationException; -import me.zhengjie.utils.StringUtils; +import me.guoguojie.exception.BadConfigurationException; +import me.guoguojie.utils.StringUtils; import java.awt.*; import java.util.Objects; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/SecurityProperties.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/SecurityProperties.java index 16ec3cf0..987b891d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/config/bean/SecurityProperties.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/config/bean/SecurityProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.config.bean; +package me.guoguojie.modules.security.config.bean; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/rest/AuthorizationController.java similarity index 86% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/rest/AuthorizationController.java index 634356d5..272acdf4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/rest/AuthorizationController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.rest; +package me.guoguojie.modules.security.rest; import cn.hutool.core.util.IdUtil; import com.wf.captcha.base.Captcha; @@ -21,22 +21,22 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.annotation.rest.AnonymousDeleteMapping; -import me.zhengjie.annotation.rest.AnonymousGetMapping; -import me.zhengjie.annotation.rest.AnonymousPostMapping; -import me.zhengjie.config.RsaProperties; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.security.config.bean.LoginCodeEnum; -import me.zhengjie.modules.security.config.bean.LoginProperties; -import me.zhengjie.modules.security.config.bean.SecurityProperties; -import me.zhengjie.modules.security.security.TokenProvider; -import me.zhengjie.modules.security.service.dto.AuthUserDto; -import me.zhengjie.modules.security.service.dto.JwtUserDto; -import me.zhengjie.modules.security.service.OnlineUserService; -import me.zhengjie.utils.RsaUtils; -import me.zhengjie.utils.RedisUtils; -import me.zhengjie.utils.SecurityUtils; -import me.zhengjie.utils.StringUtils; +import me.guoguojie.modules.security.config.bean.LoginCodeEnum; +import me.guoguojie.modules.security.config.bean.LoginProperties; +import me.guoguojie.modules.security.config.bean.SecurityProperties; +import me.guoguojie.modules.security.security.TokenProvider; +import me.guoguojie.modules.security.service.OnlineUserService; +import me.guoguojie.modules.security.service.dto.AuthUserDto; +import me.guoguojie.modules.security.service.dto.JwtUserDto; +import me.guoguojie.annotation.rest.AnonymousDeleteMapping; +import me.guoguojie.annotation.rest.AnonymousGetMapping; +import me.guoguojie.annotation.rest.AnonymousPostMapping; +import me.guoguojie.config.RsaProperties; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.RsaUtils; +import me.guoguojie.utils.RedisUtils; +import me.guoguojie.utils.SecurityUtils; +import me.guoguojie.utils.StringUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/rest/OnlineController.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/rest/OnlineController.java index 8b91fdfd..2d4dce9d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/OnlineController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/rest/OnlineController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.rest; +package me.guoguojie.modules.security.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.security.service.OnlineUserService; -import me.zhengjie.utils.EncryptUtils; +import me.guoguojie.modules.security.service.OnlineUserService; +import me.guoguojie.utils.EncryptUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAccessDeniedHandler.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/JwtAccessDeniedHandler.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAccessDeniedHandler.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/security/JwtAccessDeniedHandler.java index 8b3f8c17..7a1163a6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAccessDeniedHandler.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/JwtAccessDeniedHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.security; +package me.guoguojie.modules.security.security; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/JwtAuthenticationEntryPoint.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/security/JwtAuthenticationEntryPoint.java index f8815862..83003ec0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/JwtAuthenticationEntryPoint.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/JwtAuthenticationEntryPoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.security; +package me.guoguojie.modules.security.security; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenConfigurer.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenConfigurer.java similarity index 86% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenConfigurer.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenConfigurer.java index cff5e1ed..8e177597 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenConfigurer.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenConfigurer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.security; +package me.guoguojie.modules.security.security; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.security.config.bean.SecurityProperties; -import me.zhengjie.modules.security.service.OnlineUserService; -import me.zhengjie.modules.security.service.UserCacheManager; +import me.guoguojie.modules.security.config.bean.SecurityProperties; +import me.guoguojie.modules.security.service.OnlineUserService; +import me.guoguojie.modules.security.service.UserCacheManager; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.DefaultSecurityFilterChain; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenFilter.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenFilter.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenFilter.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenFilter.java index d235cb81..c0b83f6c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenFilter.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenFilter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.security; +package me.guoguojie.modules.security.security; import cn.hutool.core.util.StrUtil; import io.jsonwebtoken.ExpiredJwtException; -import me.zhengjie.modules.security.config.bean.SecurityProperties; -import me.zhengjie.modules.security.service.UserCacheManager; -import me.zhengjie.modules.security.service.dto.OnlineUserDto; -import me.zhengjie.modules.security.service.OnlineUserService; +import me.guoguojie.modules.security.config.bean.SecurityProperties; +import me.guoguojie.modules.security.service.UserCacheManager; +import me.guoguojie.modules.security.service.dto.OnlineUserDto; +import me.guoguojie.modules.security.service.OnlineUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenProvider.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenProvider.java index db98fba4..f5dd37ab 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/security/TokenProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.security; +package me.guoguojie.modules.security.security; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; @@ -22,8 +22,8 @@ import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.modules.security.config.bean.SecurityProperties; -import me.zhengjie.utils.RedisUtils; +import me.guoguojie.modules.security.config.bean.SecurityProperties; +import me.guoguojie.utils.RedisUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/OnlineUserService.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/service/OnlineUserService.java index af8d2986..6c85b389 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/OnlineUserService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.service; +package me.guoguojie.modules.security.service; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.modules.security.config.bean.SecurityProperties; -import me.zhengjie.modules.security.service.dto.JwtUserDto; -import me.zhengjie.modules.security.service.dto.OnlineUserDto; -import me.zhengjie.utils.*; +import me.guoguojie.modules.security.config.bean.SecurityProperties; +import me.guoguojie.modules.security.service.dto.OnlineUserDto; +import me.guoguojie.modules.security.service.dto.JwtUserDto; +import me.guoguojie.utils.*; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserCacheManager.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/UserCacheManager.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserCacheManager.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/service/UserCacheManager.java index 3a8afe72..83002de8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserCacheManager.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/UserCacheManager.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.service; +package me.guoguojie.modules.security.service; import cn.hutool.core.util.RandomUtil; -import me.zhengjie.modules.security.config.bean.LoginProperties; -import me.zhengjie.modules.security.service.dto.JwtUserDto; -import me.zhengjie.utils.RedisUtils; -import me.zhengjie.utils.StringUtils; +import me.guoguojie.modules.security.config.bean.LoginProperties; +import me.guoguojie.modules.security.service.dto.JwtUserDto; +import me.guoguojie.utils.RedisUtils; +import me.guoguojie.utils.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; @@ -79,4 +79,4 @@ public class UserCacheManager { redisUtils.hdel(LoginProperties.cacheKey, userName); } } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/UserDetailsServiceImpl.java similarity index 84% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/service/UserDetailsServiceImpl.java index 70db5df0..b132cd60 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/UserDetailsServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/UserDetailsServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.service; +package me.guoguojie.modules.security.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.exception.EntityNotFoundException; -import me.zhengjie.modules.security.service.dto.JwtUserDto; -import me.zhengjie.modules.system.service.DataService; -import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.service.UserService; -import me.zhengjie.modules.system.service.dto.UserLoginDto; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.exception.EntityNotFoundException; +import me.guoguojie.modules.security.service.dto.JwtUserDto; +import me.guoguojie.modules.system.service.DataService; +import me.guoguojie.modules.system.service.RoleService; +import me.guoguojie.modules.system.service.UserService; +import me.guoguojie.modules.system.service.dto.UserLoginDto; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/AuthUserDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/AuthUserDto.java index 5219fc53..cf8feb4d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthUserDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/AuthUserDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.service.dto; +package me.guoguojie.modules.security.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/AuthorityDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/AuthorityDto.java index 888cceb6..540fc0ba 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/AuthorityDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/AuthorityDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.service.dto; +package me.guoguojie.modules.security.service.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/JwtUserDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/JwtUserDto.java index 5aa0c45f..ce32d4f5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/JwtUserDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/JwtUserDto.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.service.dto; +package me.guoguojie.modules.security.service.dto; import com.alibaba.fastjson.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Getter; -import me.zhengjie.modules.system.service.dto.UserLoginDto; +import me.guoguojie.modules.system.service.dto.UserLoginDto; import org.springframework.security.core.userdetails.UserDetails; import java.util.List; import java.util.Set; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/OnlineUserDto.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/OnlineUserDto.java index 290ab6d6..bceddc6f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/dto/OnlineUserDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/security/service/dto/OnlineUserDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.security.service.dto; +package me.guoguojie.modules.security.service.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Dept.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Dept.java index 9f28af21..4c6af948 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Dept.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain; +package me.guoguojie.modules.system.domain; import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -83,4 +83,4 @@ public class Dept extends BaseEntity implements Serializable { public int hashCode() { return Objects.hash(id, name); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Dict.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Dict.java index 689cf2e3..6b9a43b1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Dict.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain; +package me.guoguojie.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -51,4 +51,4 @@ public class Dict extends BaseEntity implements Serializable { @ApiModelProperty(value = "描述") private String description; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/DictDetail.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/DictDetail.java index 554dde61..5a4e3aa0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/DictDetail.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain; +package me.guoguojie.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -53,4 +53,4 @@ public class DictDetail extends BaseEntity implements Serializable { @ApiModelProperty(value = "排序") private Integer dictSort = 999; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Job.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Job.java index f2d358a6..242bacd0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Job.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain; +package me.guoguojie.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -70,4 +70,4 @@ public class Job extends BaseEntity implements Serializable { public int hashCode() { return Objects.hash(id); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Menu.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Menu.java index b2ea225d..96c99c7d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Menu.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain; +package me.guoguojie.modules.system.domain; import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Role.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Role.java index d33d75c1..dc37ad3c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/Role.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain; +package me.guoguojie.modules.system.domain; import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; -import me.zhengjie.utils.enums.DataScopeEnum; +import me.guoguojie.base.BaseEntity; +import me.guoguojie.utils.enums.DataScopeEnum; import javax.persistence.*; import javax.validation.constraints.NotBlank; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/User.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/User.java index b4d11bda..3e5651c0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/User.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain; +package me.guoguojie.modules.system.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; @@ -122,4 +122,4 @@ public class User extends BaseEntity implements Serializable { public int hashCode() { return Objects.hash(id, username); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/MenuMetaVo.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/MenuMetaVo.java index 647baa88..9af7883b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/MenuMetaVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.guoguojie.modules.system.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/MenuVo.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/MenuVo.java index 82fc0cc5..763dc527 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/MenuVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.guoguojie.modules.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/UserPassVo.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/UserPassVo.java index fccb100f..6fe099ad 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/domain/vo/UserPassVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.domain.vo; +package me.guoguojie.modules.system.domain.vo; import lombok.Data; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DeptRepository.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DeptRepository.java index 98583224..bb10c34a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DeptRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.repository; +package me.guoguojie.modules.system.repository; -import me.zhengjie.modules.system.domain.Dept; +import me.guoguojie.modules.system.domain.Dept; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; @@ -66,4 +66,4 @@ public interface DeptRepository extends JpaRepository, JpaSpecificat @Modifying @Query(value = " update sys_dept set sub_count = ?1 where dept_id = ?2 ",nativeQuery = true) void updateSubCntById(Integer count, Long id); -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DictDetailRepository.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DictDetailRepository.java index d80b9702..07b9614e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DictDetailRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.repository; +package me.guoguojie.modules.system.repository; -import me.zhengjie.modules.system.domain.DictDetail; +import me.guoguojie.modules.system.domain.DictDetail; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -33,4 +33,4 @@ public interface DictDetailRepository extends JpaRepository, J * @return / */ List findByDictName(String name); -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DictRepository.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DictRepository.java index f09b6d1b..d4c45b06 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/DictRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.repository; +package me.guoguojie.modules.system.repository; -import me.zhengjie.modules.system.domain.Dict; +import me.guoguojie.modules.system.domain.Dict; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -40,4 +40,4 @@ public interface DictRepository extends JpaRepository, JpaSpecificat * @return / */ List findByIdIn(Set ids); -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/JobRepository.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/repository/JobRepository.java index e39ebf00..7d0e2fe7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/JobRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.repository; +package me.guoguojie.modules.system.repository; -import me.zhengjie.modules.system.domain.Job; +import me.guoguojie.modules.system.domain.Job; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -39,4 +39,4 @@ public interface JobRepository extends JpaRepository, JpaSpecificatio * @param ids / */ void deleteAllByIdIn(Set ids); -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/MenuRepository.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/repository/MenuRepository.java index 0907606f..62de11ce 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/MenuRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.repository; +package me.guoguojie.modules.system.repository; -import me.zhengjie.modules.system.domain.Menu; +import me.guoguojie.modules.system.domain.Menu; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/RoleRepository.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/repository/RoleRepository.java index 8e76cc55..8a97d186 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/RoleRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.repository; +package me.guoguojie.modules.system.repository; -import me.zhengjie.modules.system.domain.Role; +import me.guoguojie.modules.system.domain.Role; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/UserRepository.java similarity index 97% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/repository/UserRepository.java index c5c88a8d..f58e6e74 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/repository/UserRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.repository; +package me.guoguojie.modules.system.repository; -import me.zhengjie.modules.system.domain.User; +import me.guoguojie.modules.system.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DeptController.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DeptController.java index 99624306..ae7ec0c2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DeptController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import cn.hutool.core.collection.CollectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.DeptService; -import me.zhengjie.modules.system.service.dto.DeptDto; -import me.zhengjie.modules.system.service.dto.DeptQueryCriteria; -import me.zhengjie.utils.PageUtil; +import me.guoguojie.modules.system.domain.Dept; +import me.guoguojie.modules.system.service.DeptService; +import me.guoguojie.modules.system.service.dto.DeptDto; +import me.guoguojie.modules.system.service.dto.DeptQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.PageUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -114,4 +114,4 @@ public class DeptController { deptService.delete(deptDtos); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DictController.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DictController.java index 70705781..6c5b90ac 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DictController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.DictService; -import me.zhengjie.modules.system.service.dto.DictQueryCriteria; +import me.guoguojie.modules.system.domain.Dict; +import me.guoguojie.modules.system.service.DictService; +import me.guoguojie.modules.system.service.dto.DictQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -96,4 +96,4 @@ public class DictController { dictService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DictDetailController.java similarity index 86% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DictDetailController.java index 8ddbfe4b..69452da4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictDetailController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/DictDetailController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.service.DictDetailService; -import me.zhengjie.modules.system.service.dto.DictDetailDto; -import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; +import me.guoguojie.modules.system.domain.DictDetail; +import me.guoguojie.modules.system.service.DictDetailService; +import me.guoguojie.modules.system.service.dto.DictDetailDto; +import me.guoguojie.modules.system.service.dto.DictDetailQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; @@ -52,7 +52,7 @@ public class DictDetailController { @ApiOperation("查询字典详情") @GetMapping public ResponseEntity queryDictDetail(DictDetailQueryCriteria criteria, - @PageableDefault(sort = {"dictSort"}, direction = Sort.Direction.ASC) Pageable pageable){ + @PageableDefault(sort = {"dictSort"}, direction = Sort.Direction.ASC) Pageable pageable){ return new ResponseEntity<>(dictDetailService.queryAll(criteria,pageable),HttpStatus.OK); } @@ -96,4 +96,4 @@ public class DictDetailController { dictDetailService.delete(id); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/JobController.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/JobController.java index d904e278..0523ca41 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/JobController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/JobController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.service.JobService; -import me.zhengjie.modules.system.service.dto.JobQueryCriteria; +import me.guoguojie.modules.system.domain.Job; +import me.guoguojie.modules.system.service.JobService; +import me.guoguojie.modules.system.service.dto.JobQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -91,4 +91,4 @@ public class JobController { jobService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/LimitController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/LimitController.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/LimitController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/LimitController.java index 02db642e..c254bb0a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/LimitController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/LimitController.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import me.zhengjie.annotation.Limit; -import me.zhengjie.annotation.rest.AnonymousGetMapping; +import me.guoguojie.annotation.Limit; +import me.guoguojie.annotation.rest.AnonymousGetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/MenuController.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/MenuController.java index 66a1e82c..cc69f3ef 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/MenuController.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import cn.hutool.core.collection.CollectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.service.MenuService; -import me.zhengjie.modules.system.service.dto.MenuDto; -import me.zhengjie.modules.system.service.dto.MenuQueryCriteria; -import me.zhengjie.modules.system.service.mapstruct.MenuMapper; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.SecurityUtils; +import me.guoguojie.modules.system.domain.Menu; +import me.guoguojie.modules.system.service.MenuService; +import me.guoguojie.modules.system.service.dto.MenuDto; +import me.guoguojie.modules.system.service.dto.MenuQueryCriteria; +import me.guoguojie.modules.system.service.mapstruct.MenuMapper; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.SecurityUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MonitorController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/MonitorController.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MonitorController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/MonitorController.java index bb0e39b4..23fdc620 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MonitorController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/MonitorController.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.system.service.MonitorService; +import me.guoguojie.modules.system.service.MonitorService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/RoleController.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/RoleController.java index f4f9f5e3..c7558052 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/RoleController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/RoleController.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import cn.hutool.core.lang.Dict; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.service.dto.RoleDto; -import me.zhengjie.modules.system.service.dto.RoleQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDto; -import me.zhengjie.utils.SecurityUtils; +import me.guoguojie.modules.system.domain.Role; +import me.guoguojie.modules.system.service.RoleService; +import me.guoguojie.modules.system.service.dto.RoleDto; +import me.guoguojie.modules.system.service.dto.RoleQueryCriteria; +import me.guoguojie.modules.system.service.dto.RoleSmallDto; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.SecurityUtils; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/UserController.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/UserController.java index ed8e51fb..a5983087 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/UserController.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import cn.hutool.core.collection.CollectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.config.RsaProperties; -import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.DataService; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.vo.UserPassVo; -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.UserDto; -import me.zhengjie.modules.system.service.dto.UserQueryCriteria; -import me.zhengjie.modules.system.service.VerifyService; -import me.zhengjie.utils.*; -import me.zhengjie.modules.system.service.UserService; -import me.zhengjie.utils.enums.CodeEnum; +import me.guoguojie.modules.system.domain.Dept; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.modules.system.domain.vo.UserPassVo; +import me.guoguojie.modules.system.service.dto.RoleSmallDto; +import me.guoguojie.modules.system.service.dto.UserDto; +import me.guoguojie.modules.system.service.dto.UserQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.config.RsaProperties; +import me.guoguojie.modules.system.service.DataService; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.system.service.DeptService; +import me.guoguojie.modules.system.service.RoleService; +import me.guoguojie.modules.system.service.VerifyService; +import me.guoguojie.utils.*; +import me.guoguojie.modules.system.service.UserService; +import me.guoguojie.utils.enums.CodeEnum; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/VerifyController.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/VerifyController.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/rest/VerifyController.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/rest/VerifyController.java index 09ba44b0..0f99d842 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/VerifyController.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/rest/VerifyController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.rest; +package me.guoguojie.modules.system.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.vo.EmailVo; -import me.zhengjie.service.EmailService; -import me.zhengjie.modules.system.service.VerifyService; -import me.zhengjie.utils.enums.CodeBiEnum; -import me.zhengjie.utils.enums.CodeEnum; +import me.guoguojie.modules.system.service.VerifyService; +import me.guoguojie.domain.vo.EmailVo; +import me.guoguojie.service.EmailService; +import me.guoguojie.utils.enums.CodeBiEnum; +import me.guoguojie.utils.enums.CodeEnum; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DataService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DataService.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/DataService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/DataService.java index 10258d99..9a31fdd9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DataService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DataService.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; + +import me.guoguojie.modules.system.service.dto.UserDto; -import me.zhengjie.modules.system.service.dto.UserDto; import java.util.List; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DeptService.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/DeptService.java index d589bf88..c28ee5d8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DeptService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DeptService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.dto.DeptDto; -import me.zhengjie.modules.system.service.dto.DeptQueryCriteria; +import me.guoguojie.modules.system.domain.Dept; +import me.guoguojie.modules.system.service.dto.DeptDto; +import me.guoguojie.modules.system.service.dto.DeptQueryCriteria; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; @@ -121,4 +121,4 @@ public interface DeptService { * @param deptDtos / */ void verification(Set deptDtos); -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DictDetailService.java similarity index 85% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/DictDetailService.java index 3912a475..6dcf205a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DictDetailService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.service.dto.DictDetailDto; -import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; +import me.guoguojie.modules.system.domain.DictDetail; +import me.guoguojie.modules.system.service.dto.DictDetailDto; +import me.guoguojie.modules.system.service.dto.DictDetailQueryCriteria; import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; @@ -60,4 +60,4 @@ public interface DictDetailService { * @return / */ List getDictByName(String name); -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DictService.java similarity index 88% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/DictService.java index 9a89e4c2..51ab47b6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/DictService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictDto; -import me.zhengjie.modules.system.service.dto.DictQueryCriteria; +import me.guoguojie.modules.system.service.dto.DictDto; +import me.guoguojie.modules.system.domain.Dict; +import me.guoguojie.modules.system.service.dto.DictQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -72,4 +72,4 @@ public interface DictService { * @throws IOException / */ void download(List queryAll, HttpServletResponse response) throws IOException; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/JobService.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/JobService.java index 5b6fa85b..5021c239 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/JobService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.service.dto.JobDto; -import me.zhengjie.modules.system.service.dto.JobQueryCriteria; +import me.guoguojie.modules.system.domain.Job; +import me.guoguojie.modules.system.service.dto.JobDto; +import me.guoguojie.modules.system.service.dto.JobQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -85,4 +85,4 @@ public interface JobService { * @param ids / */ void verification(Set ids); -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/MenuService.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/MenuService.java index f7b8ecea..8d632c92 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MenuService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/MenuService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.service.dto.MenuDto; -import me.zhengjie.modules.system.service.dto.MenuQueryCriteria; +import me.guoguojie.modules.system.domain.Menu; +import me.guoguojie.modules.system.service.dto.MenuDto; +import me.guoguojie.modules.system.service.dto.MenuQueryCriteria; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MonitorService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/MonitorService.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/MonitorService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/MonitorService.java index 478225ae..f98c3235 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/MonitorService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/MonitorService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; import java.util.Map; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/RoleService.java similarity index 87% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/RoleService.java index feb614b9..fed0bfc7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/RoleService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/RoleService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.modules.security.service.dto.AuthorityDto; -import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.service.dto.RoleDto; -import me.zhengjie.modules.system.service.dto.RoleQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDto; -import me.zhengjie.modules.system.service.dto.UserDto; +import me.guoguojie.modules.security.service.dto.AuthorityDto; +import me.guoguojie.modules.system.service.dto.RoleDto; +import me.guoguojie.modules.system.service.dto.RoleQueryCriteria; +import me.guoguojie.modules.system.service.dto.RoleSmallDto; +import me.guoguojie.modules.system.domain.Role; +import me.guoguojie.modules.system.service.dto.UserDto; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/UserService.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/UserService.java index 8d63fa86..73c26c91 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/UserService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.service.dto.UserDto; -import me.zhengjie.modules.system.service.dto.UserLoginDto; -import me.zhengjie.modules.system.service.dto.UserQueryCriteria; +import me.guoguojie.modules.system.service.dto.UserLoginDto; +import me.guoguojie.modules.system.service.dto.UserQueryCriteria; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.modules.system.service.dto.UserDto; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/VerifyService.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/VerifyService.java index 4ca39b9d..8ad6dd5b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/VerifyService.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/VerifyService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service; +package me.guoguojie.modules.system.service; -import me.zhengjie.domain.vo.EmailVo; +import me.guoguojie.domain.vo.EmailVo; /** * @author Zheng Jie diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptDto.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptDto.java index 4c3b12aa..207670d2 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptDto.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; import java.util.List; import java.util.Objects; @@ -75,4 +75,4 @@ public class DeptDto extends BaseDTO implements Serializable { public int hashCode() { return Objects.hash(id, name); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptQueryCriteria.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptQueryCriteria.java index 4d8cdf2a..d33acc22 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptQueryCriteria.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; -import me.zhengjie.annotation.DataPermission; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.DataPermission; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; @@ -43,4 +43,4 @@ public class DeptQueryCriteria{ @Query(type = Query.Type.BETWEEN) private List createTime; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptSmallDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptSmallDto.java index 4dc64e58..69955a47 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DeptSmallDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DeptSmallDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; import java.io.Serializable; @@ -28,4 +28,4 @@ public class DeptSmallDto implements Serializable { private Long id; private String name; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDetailDto.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDetailDto.java index a4b931b6..ca174d75 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDetailDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; /** @@ -37,4 +37,4 @@ public class DictDetailDto extends BaseDTO implements Serializable { private String value; private Integer dictSort; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDetailQueryCriteria.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDetailQueryCriteria.java index 91a01b1d..7586631d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDetailQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDetailQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; /** * @author Zheng Jie @@ -30,4 +30,4 @@ public class DictDetailQueryCriteria { @Query(propName = "name",joinName = "dict") private String dictName; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDto.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDto.java index 048b4a19..f4b9baf7 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictQueryCriteria.java similarity index 90% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictQueryCriteria.java index 7207c616..7ccaf58d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; /** * @author Zheng Jie diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictSmallDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictSmallDto.java index 98fc6eeb..d56e5cea 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictSmallDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/DictSmallDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobDto.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobDto.java index 8836d550..124a45dd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobDto.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; @@ -43,4 +43,4 @@ public class JobDto extends BaseDTO implements Serializable { this.name = name; this.enabled = enabled; } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobQueryCriteria.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobQueryCriteria.java index ee851dc6..49cffeb0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobQueryCriteria.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; import lombok.NoArgsConstructor; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; @@ -37,4 +37,4 @@ public class JobQueryCriteria { @Query(type = Query.Type.BETWEEN) private List createTime; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobSmallDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobSmallDto.java index 09cfa624..5ebdc049 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/JobSmallDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/JobSmallDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; import lombok.NoArgsConstructor; @@ -30,4 +30,4 @@ public class JobSmallDto implements Serializable { private Long id; private String name; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/MenuDto.java similarity index 95% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/MenuDto.java index d60dd290..a3949df0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/MenuDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; import java.util.List; import java.util.Objects; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/MenuQueryCriteria.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/MenuQueryCriteria.java index bd43e8db..c5c52633 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/MenuQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleDto.java index fc74d84b..501d255c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; import java.util.Objects; import java.util.Set; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleQueryCriteria.java similarity index 91% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleQueryCriteria.java index 5454fc44..cfdb8009 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleSmallDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleSmallDto.java index 99215e63..7894788e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/RoleSmallDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; import java.io.Serializable; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserDto.java index 923e2d42..4c5dd8d1 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserDto.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import com.alibaba.fastjson.annotation.JSONField; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; import java.util.Date; import java.util.Set; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserLoginDto.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserLoginDto.java similarity index 94% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserLoginDto.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserLoginDto.java index 13a51f77..951cee18 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserLoginDto.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserLoginDto.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; /** * @author Zheng Jie diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserQueryCriteria.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserQueryCriteria.java index ad8e7755..2e8e4d4b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/dto/UserQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.dto; +package me.guoguojie.modules.system.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.io.Serializable; import java.sql.Timestamp; import java.util.HashSet; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DataServiceImpl.java similarity index 86% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DataServiceImpl.java index 33a81480..0ee6eae9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DataServiceImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.DataService; -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.UserDto; -import me.zhengjie.utils.enums.DataScopeEnum; +import me.guoguojie.modules.system.service.dto.RoleSmallDto; +import me.guoguojie.modules.system.domain.Dept; +import me.guoguojie.modules.system.service.DataService; +import me.guoguojie.modules.system.service.DeptService; +import me.guoguojie.modules.system.service.RoleService; +import me.guoguojie.modules.system.service.dto.UserDto; +import me.guoguojie.utils.enums.DataScopeEnum; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DeptServiceImpl.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DeptServiceImpl.java index a02bd699..c106d8bf 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DeptServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.repository.RoleRepository; -import me.zhengjie.modules.system.repository.UserRepository; -import me.zhengjie.modules.system.service.dto.DeptDto; -import me.zhengjie.modules.system.service.dto.DeptQueryCriteria; -import me.zhengjie.utils.*; -import me.zhengjie.modules.system.repository.DeptRepository; -import me.zhengjie.modules.system.service.DeptService; -import me.zhengjie.modules.system.service.mapstruct.DeptMapper; -import me.zhengjie.utils.enums.DataScopeEnum; +import me.guoguojie.modules.system.repository.DeptRepository; +import me.guoguojie.modules.system.repository.RoleRepository; +import me.guoguojie.modules.system.repository.UserRepository; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.system.domain.Dept; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.modules.system.service.dto.DeptDto; +import me.guoguojie.modules.system.service.dto.DeptQueryCriteria; +import me.guoguojie.utils.*; +import me.guoguojie.modules.system.service.DeptService; +import me.guoguojie.modules.system.service.mapstruct.DeptMapper; +import me.guoguojie.utils.enums.DataScopeEnum; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Sort; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DictDetailServiceImpl.java similarity index 84% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DictDetailServiceImpl.java index 3f5fc742..19ee145d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DictDetailServiceImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.repository.DictRepository; -import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; -import me.zhengjie.utils.*; -import me.zhengjie.modules.system.repository.DictDetailRepository; -import me.zhengjie.modules.system.service.DictDetailService; -import me.zhengjie.modules.system.service.dto.DictDetailDto; -import me.zhengjie.modules.system.service.mapstruct.DictDetailMapper; +import me.guoguojie.modules.system.repository.DictDetailRepository; +import me.guoguojie.modules.system.repository.DictRepository; +import me.guoguojie.modules.system.service.mapstruct.DictDetailMapper; +import me.guoguojie.modules.system.domain.Dict; +import me.guoguojie.modules.system.domain.DictDetail; +import me.guoguojie.modules.system.service.dto.DictDetailQueryCriteria; +import me.guoguojie.utils.*; +import me.guoguojie.modules.system.service.DictDetailService; +import me.guoguojie.modules.system.service.dto.DictDetailDto; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; @@ -92,4 +92,4 @@ public class DictDetailServiceImpl implements DictDetailService { Dict dict = dictRepository.findById(dictDetail.getDict().getId()).orElseGet(Dict::new); redisUtils.del(CacheKey.DICT_NAME + dict.getName()); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DictServiceImpl.java similarity index 89% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DictServiceImpl.java index 3a2bcd9d..5f98ddb8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/DictServiceImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictDetailDto; -import me.zhengjie.modules.system.service.dto.DictQueryCriteria; -import me.zhengjie.utils.*; -import me.zhengjie.modules.system.repository.DictRepository; -import me.zhengjie.modules.system.service.DictService; -import me.zhengjie.modules.system.service.dto.DictDto; -import me.zhengjie.modules.system.service.mapstruct.DictMapper; +import me.guoguojie.modules.system.repository.DictRepository; +import me.guoguojie.modules.system.service.dto.DictDto; +import me.guoguojie.modules.system.service.mapstruct.DictMapper; +import me.guoguojie.modules.system.domain.Dict; +import me.guoguojie.modules.system.service.dto.DictDetailDto; +import me.guoguojie.modules.system.service.dto.DictQueryCriteria; +import me.guoguojie.utils.*; +import me.guoguojie.modules.system.service.DictService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -118,4 +118,4 @@ public class DictServiceImpl implements DictService { public void delCaches(Dict dict){ redisUtils.del(CacheKey.DICT_NAME + dict.getName()); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/JobServiceImpl.java similarity index 87% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/JobServiceImpl.java index f98782ce..15021fe4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/JobServiceImpl.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.exception.EntityExistException; -import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.repository.UserRepository; -import me.zhengjie.modules.system.service.dto.JobQueryCriteria; -import me.zhengjie.utils.*; -import me.zhengjie.modules.system.repository.JobRepository; -import me.zhengjie.modules.system.service.JobService; -import me.zhengjie.modules.system.service.dto.JobDto; -import me.zhengjie.modules.system.service.mapstruct.JobMapper; +import me.guoguojie.modules.system.repository.JobRepository; +import me.guoguojie.modules.system.repository.UserRepository; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.exception.EntityExistException; +import me.guoguojie.modules.system.domain.Job; +import me.guoguojie.modules.system.service.dto.JobQueryCriteria; +import me.guoguojie.utils.*; +import me.guoguojie.modules.system.service.JobService; +import me.guoguojie.modules.system.service.dto.JobDto; +import me.guoguojie.modules.system.service.mapstruct.JobMapper; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -122,4 +122,4 @@ public class JobServiceImpl implements JobService { throw new BadRequestException("所选的岗位中存在用户关联，请解除关联再试！"); } } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/MenuServiceImpl.java similarity index 93% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/MenuServiceImpl.java index 229186bd..e19698c4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/MenuServiceImpl.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.domain.vo.MenuMetaVo; -import me.zhengjie.modules.system.domain.vo.MenuVo; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.exception.EntityExistException; -import me.zhengjie.modules.system.repository.MenuRepository; -import me.zhengjie.modules.system.repository.UserRepository; -import me.zhengjie.modules.system.service.MenuService; -import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.service.dto.MenuDto; -import me.zhengjie.modules.system.service.dto.MenuQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDto; -import me.zhengjie.modules.system.service.mapstruct.MenuMapper; -import me.zhengjie.utils.*; +import me.guoguojie.modules.system.repository.MenuRepository; +import me.guoguojie.modules.system.repository.UserRepository; +import me.guoguojie.modules.system.domain.Menu; +import me.guoguojie.modules.system.domain.Role; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.modules.system.domain.vo.MenuMetaVo; +import me.guoguojie.modules.system.domain.vo.MenuVo; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.exception.EntityExistException; +import me.guoguojie.modules.system.service.MenuService; +import me.guoguojie.modules.system.service.RoleService; +import me.guoguojie.modules.system.service.dto.MenuDto; +import me.guoguojie.modules.system.service.dto.MenuQueryCriteria; +import me.guoguojie.modules.system.service.dto.RoleSmallDto; +import me.guoguojie.modules.system.service.mapstruct.MenuMapper; +import me.guoguojie.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Sort; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/MonitorServiceImpl.java similarity index 96% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/MonitorServiceImpl.java index 7ff2e91b..2728963d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MonitorServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/MonitorServiceImpl.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import cn.hutool.core.date.BetweenFormater; import cn.hutool.core.date.DateUtil; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.service.MonitorService; -import me.zhengjie.utils.ElAdminConstant; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.StringUtils; +import me.guoguojie.modules.system.service.MonitorService; +import me.guoguojie.utils.ElAdminConstant; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.StringUtils; import org.springframework.stereotype.Service; import oshi.SystemInfo; import oshi.hardware.*; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/RoleServiceImpl.java similarity index 88% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/RoleServiceImpl.java index def575ea..5530e8ed 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/RoleServiceImpl.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.security.service.UserCacheManager; -import me.zhengjie.modules.security.service.dto.AuthorityDto; -import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.exception.EntityExistException; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.repository.RoleRepository; -import me.zhengjie.modules.system.repository.UserRepository; -import me.zhengjie.modules.system.service.RoleService; -import me.zhengjie.modules.system.service.dto.RoleDto; -import me.zhengjie.modules.system.service.dto.RoleQueryCriteria; -import me.zhengjie.modules.system.service.dto.RoleSmallDto; -import me.zhengjie.modules.system.service.dto.UserDto; -import me.zhengjie.modules.system.service.mapstruct.RoleMapper; -import me.zhengjie.modules.system.service.mapstruct.RoleSmallMapper; -import me.zhengjie.utils.*; +import me.guoguojie.modules.security.service.UserCacheManager; +import me.guoguojie.modules.security.service.dto.AuthorityDto; +import me.guoguojie.modules.system.repository.RoleRepository; +import me.guoguojie.modules.system.repository.UserRepository; +import me.guoguojie.modules.system.service.dto.RoleDto; +import me.guoguojie.modules.system.service.dto.RoleQueryCriteria; +import me.guoguojie.modules.system.service.dto.RoleSmallDto; +import me.guoguojie.modules.system.service.mapstruct.RoleMapper; +import me.guoguojie.modules.system.service.mapstruct.RoleSmallMapper; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.system.domain.Menu; +import me.guoguojie.modules.system.domain.Role; +import me.guoguojie.exception.EntityExistException; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.modules.system.service.RoleService; +import me.guoguojie.modules.system.service.dto.UserDto; +import me.guoguojie.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/UserServiceImpl.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/UserServiceImpl.java index 6342d130..236d1c6d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/UserServiceImpl.java @@ -13,22 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.config.FileProperties; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.security.service.OnlineUserService; -import me.zhengjie.modules.security.service.UserCacheManager; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.exception.EntityExistException; -import me.zhengjie.exception.EntityNotFoundException; -import me.zhengjie.modules.system.repository.UserRepository; -import me.zhengjie.modules.system.service.UserService; -import me.zhengjie.modules.system.service.dto.*; -import me.zhengjie.modules.system.service.mapstruct.UserLoginMapper; -import me.zhengjie.modules.system.service.mapstruct.UserMapper; -import me.zhengjie.utils.*; +import me.guoguojie.modules.security.service.OnlineUserService; +import me.guoguojie.modules.security.service.UserCacheManager; +import me.guoguojie.modules.system.repository.UserRepository; +import me.guoguojie.modules.system.service.dto.*; +import me.guoguojie.modules.system.service.mapstruct.UserLoginMapper; +import me.guoguojie.config.FileProperties; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.exception.EntityExistException; +import me.guoguojie.exception.EntityNotFoundException; +import me.guoguojie.modules.system.service.UserService; +import me.guoguojie.modules.system.service.dto.*; +import me.guoguojie.modules.system.service.mapstruct.UserMapper; +import me.guoguojie.utils.*; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/VerifyServiceImpl.java similarity index 92% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/VerifyServiceImpl.java index ec3230c7..edbdd903 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/VerifyServiceImpl.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/impl/VerifyServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.impl; +package me.guoguojie.modules.system.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; @@ -22,10 +22,10 @@ import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.vo.EmailVo; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.modules.system.service.VerifyService; -import me.zhengjie.utils.RedisUtils; +import me.guoguojie.domain.vo.EmailVo; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.modules.system.service.VerifyService; +import me.guoguojie.utils.RedisUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DeptMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DeptMapper.java index b0fb9049..24daead6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DeptMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.dto.DeptDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Dept; +import me.guoguojie.modules.system.service.dto.DeptDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -27,4 +27,4 @@ import org.mapstruct.ReportingPolicy; */ @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DeptMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptSmallMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DeptSmallMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptSmallMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DeptSmallMapper.java index 75076001..49ecf383 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DeptSmallMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DeptSmallMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Dept; -import me.zhengjie.modules.system.service.dto.DeptSmallDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Dept; +import me.guoguojie.modules.system.service.dto.DeptSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DeptSmallMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictDetailMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictDetailMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictDetailMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictDetailMapper.java index 3f9fe84e..4472185b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictDetailMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictDetailMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.DictDetail; -import me.zhengjie.modules.system.service.dto.DictDetailDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.DictDetail; +import me.guoguojie.modules.system.service.dto.DictDetailDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring", uses = {DictSmallMapper.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DictDetailMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictMapper.java index 1047b3bb..c5ae655c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Dict; +import me.guoguojie.modules.system.service.dto.DictDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DictMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictSmallMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictSmallMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictSmallMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictSmallMapper.java index 80ccc4e3..2c7de8f5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/DictSmallMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/DictSmallMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Dict; -import me.zhengjie.modules.system.service.dto.DictSmallDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Dict; +import me.guoguojie.modules.system.service.dto.DictSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface DictSmallMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/JobMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/JobMapper.java index 37719302..85824cf6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/JobMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.service.dto.JobDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Job; +import me.guoguojie.modules.system.service.dto.JobDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -27,4 +27,4 @@ import org.mapstruct.ReportingPolicy; */ @Mapper(componentModel = "spring",uses = {DeptMapper.class},unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface JobMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobSmallMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/JobSmallMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobSmallMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/JobSmallMapper.java index 36a59cf3..6ccfaa4d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/JobSmallMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/JobSmallMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Job; -import me.zhengjie.modules.system.service.dto.JobSmallDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Job; +import me.guoguojie.modules.system.service.dto.JobSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface JobSmallMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/MenuMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/MenuMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/MenuMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/MenuMapper.java index 6d8bffab..3cda7240 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/MenuMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/MenuMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Menu; -import me.zhengjie.modules.system.service.dto.MenuDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Menu; +import me.guoguojie.modules.system.service.dto.MenuDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/RoleMapper.java similarity index 82% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/RoleMapper.java index 5dc551df..6d1b1c12 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/RoleMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.service.dto.RoleDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Role; +import me.guoguojie.modules.system.service.dto.RoleDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleSmallMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/RoleSmallMapper.java similarity index 81% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleSmallMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/RoleSmallMapper.java index db034b5c..833c171f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/RoleSmallMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/RoleSmallMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.Role; -import me.zhengjie.modules.system.service.dto.RoleSmallDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.Role; +import me.guoguojie.modules.system.service.dto.RoleSmallDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserLoginMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/UserLoginMapper.java similarity index 82% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserLoginMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/UserLoginMapper.java index fbb88139..e88693e9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserLoginMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/UserLoginMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.service.dto.UserLoginDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.modules.system.service.dto.UserLoginDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserMapper.java b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/UserMapper.java similarity index 82% rename from eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserMapper.java rename to eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/UserMapper.java index 510c21b4..6c6bf7dd 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapstruct/UserMapper.java +++ b/eladmin-system/src/main/java/me/guoguojie/modules/system/service/mapstruct/UserMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.modules.system.service.mapstruct; +package me.guoguojie.modules.system.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.modules.system.domain.User; -import me.zhengjie.modules.system.service.dto.UserDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.modules.system.domain.User; +import me.guoguojie.modules.system.service.dto.UserDto; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; diff --git a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl index f81e280f..9fa348ec 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Controller.ftl @@ -15,7 +15,7 @@ */ package ${package}.rest; -import me.zhengjie.annotation.Log; +import me.guoguojie.annotation.Log; import ${package}.domain.${className}; import ${package}.service.${className}Service; import ${package}.service.dto.${className}QueryCriteria; @@ -84,4 +84,4 @@ public class ${className}Controller { ${changeClassName}Service.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl index 3387f060..485889f8 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl @@ -15,7 +15,7 @@ */ package ${package}.service.mapstruct; -import me.zhengjie.base.BaseMapper; +import me.guoguojie.base.BaseMapper; import ${package}.domain.${className}; import ${package}.service.dto.${className}Dto; import org.mapstruct.Mapper; @@ -29,4 +29,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface ${className}Mapper extends BaseMapper<${className}Dto, ${className}> { -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl index 2a4d1ff4..ed42a1ab 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl @@ -26,7 +26,7 @@ import java.math.BigDecimal; import java.util.List; <#if queryColumns??> -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; /** @@ -78,4 +78,4 @@ public class ${className}QueryCriteria{ private List<${column.columnType}> ${column.changeColumnName}; -} \ No newline at end of file +} diff --git a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl index 17f04547..84988179 100644 --- a/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -20,13 +20,13 @@ import ${package}.domain.${className}; <#list columns as column> <#if column.columnKey = 'UNI'> <#if column_index = 1> -import me.zhengjie.exception.EntityExistException; +import me.guoguojie.exception.EntityExistException; -import me.zhengjie.utils.ValidationUtil; -import me.zhengjie.utils.FileUtil; +import me.guoguojie.utils.ValidationUtil; +import me.guoguojie.utils.FileUtil; import lombok.RequiredArgsConstructor; import ${package}.repository.${className}Repository; import ${package}.service.${className}Service; @@ -44,8 +44,8 @@ import cn.hutool.core.util.IdUtil; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.QueryHelp; import java.util.List; import java.util.Map; import java.io.IOException; @@ -90,10 +90,10 @@ public class ${className}ServiceImpl implements ${className}Service { public ${className}Dto create(${className} resources) { <#if !auto && pkColumnType = 'Long'> Snowflake snowflake = IdUtil.createSnowflake(1, 1); - resources.set${pkCapitalColName}(snowflake.nextId()); + resources.set${pkCapitalColName}(snowflake.nextId()); <#if !auto && pkColumnType = 'String'> - resources.set${pkCapitalColName}(IdUtil.simpleUUID()); + resources.set${pkCapitalColName}(IdUtil.simpleUUID()); <#if columns??> <#list columns as column> @@ -154,4 +154,4 @@ public class ${className}ServiceImpl implements ${className}Service { } FileUtil.downloadExcel(list, response); } -} \ No newline at end of file +} diff --git a/eladmin-system/src/test/java/me/zhengjie/EladminSystemApplicationTests.java b/eladmin-system/src/test/java/me/zhengjie/EladminSystemApplicationTests.java index 45d52120..e45b8c44 100644 --- a/eladmin-system/src/test/java/me/zhengjie/EladminSystemApplicationTests.java +++ b/eladmin-system/src/test/java/me/zhengjie/EladminSystemApplicationTests.java @@ -1,4 +1,4 @@ -package me.zhengjie; +package me.guoguojie; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml index 90fa857b..0ba50b43 100644 --- a/eladmin-tools/pom.xml +++ b/eladmin-tools/pom.xml @@ -21,7 +21,7 @@ - me.zhengjie + me.guoguojie eladmin-logging 2.6 diff --git a/eladmin-tools/src/main/java/me/zhengjie/config/MultipartConfig.java b/eladmin-tools/src/main/java/me/guoguojie/config/MultipartConfig.java similarity index 98% rename from eladmin-tools/src/main/java/me/zhengjie/config/MultipartConfig.java rename to eladmin-tools/src/main/java/me/guoguojie/config/MultipartConfig.java index cf04de5c..d30d92f0 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/config/MultipartConfig.java +++ b/eladmin-tools/src/main/java/me/guoguojie/config/MultipartConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.config; +package me.guoguojie.config; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; @@ -44,4 +44,4 @@ public class MultipartConfig { factory.setLocation(location); return factory.createMultipartConfig(); } -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java b/eladmin-tools/src/main/java/me/guoguojie/domain/AlipayConfig.java similarity index 98% rename from eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java rename to eladmin-tools/src/main/java/me/guoguojie/domain/AlipayConfig.java index def695d9..07d63860 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/AlipayConfig.java +++ b/eladmin-tools/src/main/java/me/guoguojie/domain/AlipayConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java b/eladmin-tools/src/main/java/me/guoguojie/domain/EmailConfig.java similarity index 98% rename from eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java rename to eladmin-tools/src/main/java/me/guoguojie/domain/EmailConfig.java index b4fc1e6d..762fddf7 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/EmailConfig.java +++ b/eladmin-tools/src/main/java/me/guoguojie/domain/EmailConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java b/eladmin-tools/src/main/java/me/guoguojie/domain/LocalStorage.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java rename to eladmin-tools/src/main/java/me/guoguojie/domain/LocalStorage.java index 59fd0ab8..f893b637 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/LocalStorage.java +++ b/eladmin-tools/src/main/java/me/guoguojie/domain/LocalStorage.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import io.swagger.annotations.ApiModelProperty; import lombok.*; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import me.zhengjie.base.BaseEntity; +import me.guoguojie.base.BaseEntity; import javax.persistence.*; import java.io.Serializable; @@ -70,4 +70,4 @@ public class LocalStorage extends BaseEntity implements Serializable { public void copy(LocalStorage source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java b/eladmin-tools/src/main/java/me/guoguojie/domain/QiniuConfig.java similarity index 98% rename from eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java rename to eladmin-tools/src/main/java/me/guoguojie/domain/QiniuConfig.java index 0247e673..5a0b0045 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuConfig.java +++ b/eladmin-tools/src/main/java/me/guoguojie/domain/QiniuConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java b/eladmin-tools/src/main/java/me/guoguojie/domain/QiniuContent.java similarity index 98% rename from eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java rename to eladmin-tools/src/main/java/me/guoguojie/domain/QiniuContent.java index db69a6a6..6b750728 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/QiniuContent.java +++ b/eladmin-tools/src/main/java/me/guoguojie/domain/QiniuContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain; +package me.guoguojie.domain; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java b/eladmin-tools/src/main/java/me/guoguojie/domain/vo/EmailVo.java similarity index 97% rename from eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java rename to eladmin-tools/src/main/java/me/guoguojie/domain/vo/EmailVo.java index 1fb759f5..f246778c 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/EmailVo.java +++ b/eladmin-tools/src/main/java/me/guoguojie/domain/vo/EmailVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain.vo; +package me.guoguojie.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java b/eladmin-tools/src/main/java/me/guoguojie/domain/vo/TradeVo.java similarity index 98% rename from eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java rename to eladmin-tools/src/main/java/me/guoguojie/domain/vo/TradeVo.java index 01c1c2fd..fd07bbdb 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/domain/vo/TradeVo.java +++ b/eladmin-tools/src/main/java/me/guoguojie/domain/vo/TradeVo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.domain.vo; +package me.guoguojie.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java b/eladmin-tools/src/main/java/me/guoguojie/repository/AliPayRepository.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java rename to eladmin-tools/src/main/java/me/guoguojie/repository/AliPayRepository.java index 61183b43..5cbd398e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/AliPayRepository.java +++ b/eladmin-tools/src/main/java/me/guoguojie/repository/AliPayRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.AlipayConfig; +import me.guoguojie.domain.AlipayConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java b/eladmin-tools/src/main/java/me/guoguojie/repository/EmailRepository.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java rename to eladmin-tools/src/main/java/me/guoguojie/repository/EmailRepository.java index 7765602c..7486a23a 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/EmailRepository.java +++ b/eladmin-tools/src/main/java/me/guoguojie/repository/EmailRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.EmailConfig; +import me.guoguojie.domain.EmailConfig; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java b/eladmin-tools/src/main/java/me/guoguojie/repository/LocalStorageRepository.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java rename to eladmin-tools/src/main/java/me/guoguojie/repository/LocalStorageRepository.java index 8c1e85af..54e8c44b 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/LocalStorageRepository.java +++ b/eladmin-tools/src/main/java/me/guoguojie/repository/LocalStorageRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.LocalStorage; +import me.guoguojie.domain.LocalStorage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -24,4 +24,4 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; * @date 2019-09-05 */ public interface LocalStorageRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java b/eladmin-tools/src/main/java/me/guoguojie/repository/QiNiuConfigRepository.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java rename to eladmin-tools/src/main/java/me/guoguojie/repository/QiNiuConfigRepository.java index 9379f55b..caddc9a5 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiNiuConfigRepository.java +++ b/eladmin-tools/src/main/java/me/guoguojie/repository/QiNiuConfigRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.QiniuConfig; +import me.guoguojie.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/repository/QiniuContentRepository.java b/eladmin-tools/src/main/java/me/guoguojie/repository/QiniuContentRepository.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java rename to eladmin-tools/src/main/java/me/guoguojie/repository/QiniuContentRepository.java index 55f813f5..f4db5134 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/repository/QiniuContentRepository.java +++ b/eladmin-tools/src/main/java/me/guoguojie/repository/QiniuContentRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.repository; +package me.guoguojie.repository; -import me.zhengjie.domain.QiniuContent; +import me.guoguojie.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/rest/AliPayController.java b/eladmin-tools/src/main/java/me/guoguojie/rest/AliPayController.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java rename to eladmin-tools/src/main/java/me/guoguojie/rest/AliPayController.java index 0c03d0ae..93a9ceb6 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/rest/AliPayController.java +++ b/eladmin-tools/src/main/java/me/guoguojie/rest/AliPayController.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.rest; +package me.guoguojie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.annotation.AnonymousAccess; -import me.zhengjie.annotation.Log; -import me.zhengjie.annotation.rest.AnonymousGetMapping; -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 me.guoguojie.domain.AlipayConfig; +import me.guoguojie.domain.vo.TradeVo; +import me.guoguojie.service.AliPayService; +import me.guoguojie.utils.AliPayStatusEnum; +import me.guoguojie.utils.AlipayUtils; +import me.guoguojie.annotation.AnonymousAccess; +import me.guoguojie.annotation.Log; +import me.guoguojie.annotation.rest.AnonymousGetMapping; 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/rest/EmailController.java b/eladmin-tools/src/main/java/me/guoguojie/rest/EmailController.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java rename to eladmin-tools/src/main/java/me/guoguojie/rest/EmailController.java index 952f8ba2..ad5d03cb 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/rest/EmailController.java +++ b/eladmin-tools/src/main/java/me/guoguojie/rest/EmailController.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.rest; +package me.guoguojie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.domain.vo.EmailVo; -import me.zhengjie.domain.EmailConfig; -import me.zhengjie.service.EmailService; +import me.guoguojie.domain.EmailConfig; +import me.guoguojie.domain.vo.EmailVo; +import me.guoguojie.service.EmailService; +import me.guoguojie.annotation.Log; 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/rest/LocalStorageController.java b/eladmin-tools/src/main/java/me/guoguojie/rest/LocalStorageController.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java rename to eladmin-tools/src/main/java/me/guoguojie/rest/LocalStorageController.java index 45f39366..e586724e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java +++ b/eladmin-tools/src/main/java/me/guoguojie/rest/LocalStorageController.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.rest; +package me.guoguojie.rest; import lombok.RequiredArgsConstructor; -import me.zhengjie.annotation.Log; -import me.zhengjie.domain.LocalStorage; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.service.LocalStorageService; -import me.zhengjie.service.dto.LocalStorageQueryCriteria; -import me.zhengjie.utils.FileUtil; +import me.guoguojie.domain.LocalStorage; +import me.guoguojie.service.LocalStorageService; +import me.guoguojie.service.dto.LocalStorageQueryCriteria; +import me.guoguojie.annotation.Log; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.FileUtil; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -95,4 +95,4 @@ public class LocalStorageController { localStorageService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java b/eladmin-tools/src/main/java/me/guoguojie/rest/QiniuController.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java rename to eladmin-tools/src/main/java/me/guoguojie/rest/QiniuController.java index a601bdfd..79465b1b 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java +++ b/eladmin-tools/src/main/java/me/guoguojie/rest/QiniuController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.rest; +package me.guoguojie.rest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.annotation.Log; -import me.zhengjie.domain.QiniuConfig; -import me.zhengjie.domain.QiniuContent; -import me.zhengjie.service.dto.QiniuQueryCriteria; -import me.zhengjie.service.QiNiuService; +import me.guoguojie.domain.QiniuConfig; +import me.guoguojie.domain.QiniuContent; +import me.guoguojie.service.QiNiuService; +import me.guoguojie.service.dto.QiniuQueryCriteria; +import me.guoguojie.annotation.Log; 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/service/AliPayService.java b/eladmin-tools/src/main/java/me/guoguojie/service/AliPayService.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/service/AliPayService.java rename to eladmin-tools/src/main/java/me/guoguojie/service/AliPayService.java index be19c905..f78b4406 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/AliPayService.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/AliPayService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service; +package me.guoguojie.service; -import me.zhengjie.domain.vo.TradeVo; -import me.zhengjie.domain.AlipayConfig; +import me.guoguojie.domain.AlipayConfig; +import me.guoguojie.domain.vo.TradeVo; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java b/eladmin-tools/src/main/java/me/guoguojie/service/EmailService.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java rename to eladmin-tools/src/main/java/me/guoguojie/service/EmailService.java index aabfcb0a..3a04e3d4 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/EmailService.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/EmailService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service; +package me.guoguojie.service; -import me.zhengjie.domain.vo.EmailVo; -import me.zhengjie.domain.EmailConfig; +import me.guoguojie.domain.EmailConfig; +import me.guoguojie.domain.vo.EmailVo; /** * @author Zheng Jie diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java b/eladmin-tools/src/main/java/me/guoguojie/service/LocalStorageService.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java rename to eladmin-tools/src/main/java/me/guoguojie/service/LocalStorageService.java index 6df06243..042f5deb 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/LocalStorageService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service; +package me.guoguojie.service; -import me.zhengjie.domain.LocalStorage; -import me.zhengjie.service.dto.LocalStorageDto; -import me.zhengjie.service.dto.LocalStorageQueryCriteria; +import me.guoguojie.domain.LocalStorage; +import me.guoguojie.service.dto.LocalStorageDto; +import me.guoguojie.service.dto.LocalStorageQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -79,4 +79,4 @@ public interface LocalStorageService { * @throws IOException / */ void download(List localStorageDtos, HttpServletResponse response) throws IOException; -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java b/eladmin-tools/src/main/java/me/guoguojie/service/QiNiuService.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java rename to eladmin-tools/src/main/java/me/guoguojie/service/QiNiuService.java index 09dca6a8..ec81cf20 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/QiNiuService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service; +package me.guoguojie.service; -import me.zhengjie.domain.QiniuConfig; -import me.zhengjie.domain.QiniuContent; -import me.zhengjie.service.dto.QiniuQueryCriteria; +import me.guoguojie.domain.QiniuConfig; +import me.guoguojie.domain.QiniuContent; +import me.guoguojie.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/service/dto/LocalStorageDto.java b/eladmin-tools/src/main/java/me/guoguojie/service/dto/LocalStorageDto.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java rename to eladmin-tools/src/main/java/me/guoguojie/service/dto/LocalStorageDto.java index 14221c2a..f8efcefc 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageDto.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/dto/LocalStorageDto.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.dto; +package me.guoguojie.service.dto; import lombok.Getter; import lombok.Setter; -import me.zhengjie.base.BaseDTO; +import me.guoguojie.base.BaseDTO; import java.io.Serializable; /** @@ -39,4 +39,4 @@ public class LocalStorageDto extends BaseDTO implements Serializable { private String type; private String size; -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java b/eladmin-tools/src/main/java/me/guoguojie/service/dto/LocalStorageQueryCriteria.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java rename to eladmin-tools/src/main/java/me/guoguojie/service/dto/LocalStorageQueryCriteria.java index bea1cc7c..d4b9231f 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/dto/LocalStorageQueryCriteria.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.dto; +package me.guoguojie.service.dto; import lombok.Data; import java.sql.Timestamp; import java.util.List; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; /** * @author Zheng Jie @@ -33,4 +33,4 @@ public class LocalStorageQueryCriteria{ @Query(type = Query.Type.BETWEEN) private List createTime; -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java b/eladmin-tools/src/main/java/me/guoguojie/service/dto/PictureQueryCriteria.java similarity index 93% rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java rename to eladmin-tools/src/main/java/me/guoguojie/service/dto/PictureQueryCriteria.java index e7d4f1b1..719e952e 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/dto/PictureQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.dto; +package me.guoguojie.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; @@ -31,7 +31,7 @@ public class PictureQueryCriteria{ @Query(type = Query.Type.INNER_LIKE) private String filename; - + @Query(type = Query.Type.INNER_LIKE) private String username; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java b/eladmin-tools/src/main/java/me/guoguojie/service/dto/QiniuQueryCriteria.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java rename to eladmin-tools/src/main/java/me/guoguojie/service/dto/QiniuQueryCriteria.java index f5c2240b..8d0edbcd 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/dto/QiniuQueryCriteria.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.dto; +package me.guoguojie.service.dto; import lombok.Data; -import me.zhengjie.annotation.Query; +import me.guoguojie.annotation.Query; import java.sql.Timestamp; import java.util.List; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java b/eladmin-tools/src/main/java/me/guoguojie/service/impl/AliPayServiceImpl.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java rename to eladmin-tools/src/main/java/me/guoguojie/service/impl/AliPayServiceImpl.java index 0625ba42..ddd68ae0 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/impl/AliPayServiceImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.impl; +package me.guoguojie.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 lombok.RequiredArgsConstructor; -import me.zhengjie.domain.vo.TradeVo; -import me.zhengjie.domain.AlipayConfig; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.repository.AliPayRepository; -import me.zhengjie.service.AliPayService; +import me.guoguojie.domain.vo.TradeVo; +import me.guoguojie.domain.AlipayConfig; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.repository.AliPayRepository; +import me.guoguojie.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/service/impl/EmailServiceImpl.java b/eladmin-tools/src/main/java/me/guoguojie/service/impl/EmailServiceImpl.java similarity index 92% rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java rename to eladmin-tools/src/main/java/me/guoguojie/service/impl/EmailServiceImpl.java index c98c76ec..26fb30ba 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/impl/EmailServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.impl; +package me.guoguojie.service.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; import lombok.RequiredArgsConstructor; -import me.zhengjie.domain.EmailConfig; -import me.zhengjie.domain.vo.EmailVo; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.repository.EmailRepository; -import me.zhengjie.service.EmailService; -import me.zhengjie.utils.EncryptUtils; +import me.guoguojie.domain.EmailConfig; +import me.guoguojie.domain.vo.EmailVo; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.repository.EmailRepository; +import me.guoguojie.service.EmailService; +import me.guoguojie.utils.EncryptUtils; 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/service/impl/LocalStorageServiceImpl.java b/eladmin-tools/src/main/java/me/guoguojie/service/impl/LocalStorageServiceImpl.java similarity index 91% rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java rename to eladmin-tools/src/main/java/me/guoguojie/service/impl/LocalStorageServiceImpl.java index 77174c44..3492dabf 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/impl/LocalStorageServiceImpl.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.impl; +package me.guoguojie.service.impl; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.config.FileProperties; -import me.zhengjie.domain.LocalStorage; -import me.zhengjie.service.dto.LocalStorageDto; -import me.zhengjie.service.dto.LocalStorageQueryCriteria; -import me.zhengjie.service.mapstruct.LocalStorageMapper; -import me.zhengjie.exception.BadRequestException; -import me.zhengjie.utils.*; -import me.zhengjie.repository.LocalStorageRepository; -import me.zhengjie.service.LocalStorageService; +import me.guoguojie.service.dto.LocalStorageDto; +import me.guoguojie.service.dto.LocalStorageQueryCriteria; +import me.guoguojie.config.FileProperties; +import me.guoguojie.domain.LocalStorage; +import me.guoguojie.service.mapstruct.LocalStorageMapper; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.utils.*; +import me.guoguojie.repository.LocalStorageRepository; +import me.guoguojie.service.LocalStorageService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.File; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java b/eladmin-tools/src/main/java/me/guoguojie/service/impl/QiNiuServiceImpl.java similarity index 94% rename from eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java rename to eladmin-tools/src/main/java/me/guoguojie/service/impl/QiNiuServiceImpl.java index 942f437e..ff2447c9 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/impl/QiNiuServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.impl; +package me.guoguojie.service.impl; import com.alibaba.fastjson.JSON; import com.qiniu.common.QiniuException; @@ -25,18 +25,18 @@ import com.qiniu.storage.model.DefaultPutRet; import com.qiniu.storage.model.FileInfo; import com.qiniu.util.Auth; import lombok.RequiredArgsConstructor; -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.repository.QiNiuConfigRepository; -import me.zhengjie.service.QiNiuService; -import me.zhengjie.utils.FileUtil; -import me.zhengjie.utils.PageUtil; -import me.zhengjie.utils.QueryHelp; -import me.zhengjie.utils.ValidationUtil; +import me.guoguojie.repository.QiNiuConfigRepository; +import me.guoguojie.service.dto.QiniuQueryCriteria; +import me.guoguojie.domain.QiniuConfig; +import me.guoguojie.domain.QiniuContent; +import me.guoguojie.repository.QiniuContentRepository; +import me.guoguojie.utils.QiNiuUtil; +import me.guoguojie.exception.BadRequestException; +import me.guoguojie.service.QiNiuService; +import me.guoguojie.utils.FileUtil; +import me.guoguojie.utils.PageUtil; +import me.guoguojie.utils.QueryHelp; +import me.guoguojie.utils.ValidationUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CachePut; diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java b/eladmin-tools/src/main/java/me/guoguojie/service/mapstruct/LocalStorageMapper.java similarity index 84% rename from eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java rename to eladmin-tools/src/main/java/me/guoguojie/service/mapstruct/LocalStorageMapper.java index 4c6d9555..2ebc08c0 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/service/mapstruct/LocalStorageMapper.java +++ b/eladmin-tools/src/main/java/me/guoguojie/service/mapstruct/LocalStorageMapper.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.service.mapstruct; +package me.guoguojie.service.mapstruct; -import me.zhengjie.base.BaseMapper; -import me.zhengjie.service.dto.LocalStorageDto; -import me.zhengjie.domain.LocalStorage; +import me.guoguojie.service.dto.LocalStorageDto; +import me.guoguojie.base.BaseMapper; +import me.guoguojie.domain.LocalStorage; import org.mapstruct.Mapper; import org.mapstruct.ReportingPolicy; @@ -28,4 +28,4 @@ import org.mapstruct.ReportingPolicy; @Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE) public interface LocalStorageMapper extends BaseMapper { -} \ No newline at end of file +} diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java b/eladmin-tools/src/main/java/me/guoguojie/utils/AliPayStatusEnum.java similarity index 95% rename from eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java rename to eladmin-tools/src/main/java/me/guoguojie/utils/AliPayStatusEnum.java index c114fd16..b0f94c07 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/AliPayStatusEnum.java +++ b/eladmin-tools/src/main/java/me/guoguojie/utils/AliPayStatusEnum.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; /** * 支付状态 - * @author zhengjie + * @author guoguojie * @date 2018/08/01 16:45:43 */ public enum AliPayStatusEnum { diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java b/eladmin-tools/src/main/java/me/guoguojie/utils/AlipayUtils.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java rename to eladmin-tools/src/main/java/me/guoguojie/utils/AlipayUtils.java index 203f7db7..6c747e98 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/AlipayUtils.java +++ b/eladmin-tools/src/main/java/me/guoguojie/utils/AlipayUtils.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; -import me.zhengjie.domain.AlipayConfig; +import me.guoguojie.domain.AlipayConfig; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; @@ -27,7 +27,7 @@ import java.util.Map; /** * 支付宝工具类 - * @author zhengjie + * @author guoguojie * @date 2018/09/30 14:04:35 */ @Component diff --git a/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java b/eladmin-tools/src/main/java/me/guoguojie/utils/QiNiuUtil.java similarity index 96% rename from eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java rename to eladmin-tools/src/main/java/me/guoguojie/utils/QiNiuUtil.java index 8091a95d..744ddaab 100644 --- a/eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java +++ b/eladmin-tools/src/main/java/me/guoguojie/utils/QiNiuUtil.java @@ -13,9 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package me.zhengjie.utils; +package me.guoguojie.utils; import com.qiniu.storage.Region; +import me.guoguojie.utils.FileUtil; + import java.text.SimpleDateFormat; import java.util.Date;