修改包名 由zhengjie改为guoguojie

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.*;
 

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;

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;

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;

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;

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;

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;

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;

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;

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() {
     }
 

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;
 
 /**
  * 限流枚举

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;

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;

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;
 

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;

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;
 

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;

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;
 

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());

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;
     }
-}
+}

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;

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;
 
 /**
  * 统一关于错误配置信息 异常

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;

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";
     }
-}
+}

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";
     }
-}
+}

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;

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;

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

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

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;
 

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;

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;
 
 /**
  * 常用静态常量

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;

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;

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.*;

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.*;

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;

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;

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;

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;

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;

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;
         }

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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 {
 

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 {
 

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()));
     }
-}
+}

eladmin-generator/pom.xml

@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>me.zhengjie</groupId>
+            <groupId>me.guoguojie</groupId>
             <artifactId>eladmin-common</artifactId>
             <version>2.6</version>
         </dependency>

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;
 

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;

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;

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;
 

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;
 
 /**

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;

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;

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

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;

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;
 

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;

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;

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;
 
 /**
  * 代码生成

eladmin-logging/pom.xml

@@ -14,7 +14,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>me.zhengjie</groupId>
+            <groupId>me.guoguojie</groupId>
             <artifactId>eladmin-common</artifactId>
             <version>2.6</version>
         </dependency>

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;

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() {
         // 该方法无方法体,主要为了让同类中其他方法使用此切入点
     }

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;

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;

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;

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;

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;
-}
+}

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;
 

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;

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<Log> page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable);
+        Page<me.guoguojie.domain.Log> 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<Log> queryAll(LogQueryCriteria criteria) {
+    public List<me.guoguojie.domain.Log> queryAll(LogQueryCriteria criteria) {
         return logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)));
     }
 
     @Override
     public Object queryAllByUser(LogQueryCriteria criteria, Pageable pageable) {
-        Page<Log> page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable);
+        Page<me.guoguojie.domain.Log> 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<Log> logs, HttpServletResponse response) throws IOException {
+    public void download(List<me.guoguojie.domain.Log> logs, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
-        for (Log log : logs) {
+        for (me.guoguojie.domain.Log log : logs) {
             Map<String, Object> map = new LinkedHashMap<>();
             map.put("用户名", log.getUsername());
             map.put("IP", log.getRequestIp());

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<LogErrorDTO, Log> {
 
-}
+}

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<LogSmallDTO, Log> {
 
-}
+}

eladmin-system/pom.xml

@@ -21,12 +21,12 @@
     <dependencies>
         <!-- 代码生成模块 -->
         <dependency>
-            <groupId>me.zhengjie</groupId>
+            <groupId>me.guoguojie</groupId>
             <artifactId>eladmin-generator</artifactId>
             <version>2.6</version>
             <exclusions>
                 <exclusion>
-                    <groupId>me.zhengjie</groupId>
+                    <groupId>me.guoguojie</groupId>
                     <artifactId>eladmin-common</artifactId>
                 </exclusion>
             </exclusions>
@@ -34,7 +34,7 @@
 
         <!-- tools 模块包含了 common 和 logging 模块 -->
         <dependency>
-            <groupId>me.zhengjie</groupId>
+            <groupId>me.guoguojie</groupId>
             <artifactId>eladmin-tools</artifactId>
             <version>2.6</version>
         </dependency>

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;

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;

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;

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;

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;
 
 /**

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;
 

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;

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;
 

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;
 

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;

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;

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;