更改目录结构

eladmin-common/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>eladmin</artifactId>
-        <groupId>me.zhengjie</groupId>
+        <groupId>cn.ysk.cashier</groupId>
         <version>2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.annotation;
 
 import java.lang.annotation.*;
 

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

eladmin-common/src/main/java/cn/ysk/cashier/annotation/Limit.java

@@ -13,9 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.annotation;
+package cn.ysk.cashier.annotation;
+
+import cn.ysk.cashier.aspect.LimitType;
 
-import me.zhengjie.aspect.LimitType;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

eladmin-common/src/main/java/cn/ysk/cashier/annotation/rest/AnonymousDeleteMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.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 cn.ysk.cashier.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/cn/ysk/cashier/annotation/rest/AnonymousGetMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.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 cn.ysk.cashier.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/cn/ysk/cashier/annotation/rest/AnonymousPatchMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.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 cn.ysk.cashier.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/cn/ysk/cashier/annotation/rest/AnonymousPostMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.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 cn.ysk.cashier.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/cn/ysk/cashier/annotation/rest/AnonymousPutMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package me.zhengjie.annotation.rest;
+package cn.ysk.cashier.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 cn.ysk.cashier.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/cn/ysk/cashier/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 cn.ysk.cashier.aspect;
 
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.utils.StringUtils;
 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 cn.ysk.cashier.annotation.Limit;
+import cn.ysk.cashier.utils.RequestHolder;
 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(cn.ysk.cashier.annotation.Limit)")
     public void pointcut() {
     }
 

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.aspect;
 
 /**
  * 限流枚举

eladmin-common/src/main/java/cn/ysk/cashier/base/BaseDTO.java

@@ -1,4 +1,4 @@
-package me.zhengjie.base;
+package cn.ysk.cashier.base;
 
 import lombok.Getter;
 import lombok.Setter;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.base;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.base;
 
 import java.util.List;
 

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.config;
 
-import me.zhengjie.utils.SecurityUtils;
+import cn.ysk.cashier.utils.SecurityUtils;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.stereotype.Component;
 import java.util.Optional;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.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/cn/ysk/cashier/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 cn.ysk.cashier.config;
 
-import me.zhengjie.utils.SecurityUtils;
+import cn.ysk.cashier.utils.SecurityUtils;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.stereotype.Service;
 import java.util.Arrays;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.config;
 
 import lombok.Data;
-import me.zhengjie.utils.ElAdminConstant;
+import cn.ysk.cashier.utils.ElAdminConstant;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.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("cn.ysk.cashier.pojo");
+        ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.service");
         // 模块内的实体类
-        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("cn.ysk.cashier.mnt.domain");
+//        ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.quartz.domain");
+//        ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.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("cn.ysk.cashier.mnt");
+        ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.quartz");
+        ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.config");
+//        ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.system.service.dto");
         // key的序列化采用StringRedisSerializer
         template.setKeySerializer(new StringRedisSerializer());
         template.setHashKeySerializer(new StringRedisSerializer());

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.config;
 
 import cn.hutool.core.collection.CollUtil;
 import com.fasterxml.classmate.TypeResolver;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.exception;
 
 /**
  * 统一关于错误配置信息 异常

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.exception;
 
 import lombok.Getter;
 import org.springframework.http.HttpStatus;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.exception;
 
 import org.springframework.util.StringUtils;
 

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.exception;
 
 import org.springframework.util.StringUtils;
 

eladmin-common/src/main/java/cn/ysk/cashier/exception/NewBadRequestException.java

@@ -1,4 +1,4 @@
-package me.zhengjie.exception;
+package cn.ysk.cashier.exception;
 
 import lombok.Getter;
 import org.springframework.http.HttpStatus;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.exception.handler;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.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 cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.exception.EntityExistException;
+import cn.ysk.cashier.exception.EntityNotFoundException;
+import cn.ysk.cashier.utils.ThrowableUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.BadCredentialsException;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 /**
  * @author: liaojinlong

eladmin-common/src/main/java/cn/ysk/cashier/utils/CallBack.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 /**
  * @author: liaojinlong

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import java.io.Closeable;
 

eladmin-common/src/main/java/cn/ysk/cashier/utils/DateUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import java.time.*;
 import java.time.format.DateTimeFormatter;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 /**
  * 常用静态常量

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.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 cn.ysk.cashier.exception.BadRequestException;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.slf4j.Logger;

eladmin-common/src/main/java/cn/ysk/cashier/utils/ListUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;

eladmin-common/src/main/java/cn/ysk/cashier/utils/MD5Utils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import cn.hutool.core.util.ObjectUtil;
 

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import org.springframework.data.domain.Page;
 import java.util.*;

eladmin-common/src/main/java/cn/ysk/cashier/utils/PhoneUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java

@@ -13,14 +13,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.utils;
+package cn.ysk.cashier.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 cn.ysk.cashier.annotation.DataPermission;
+import cn.ysk.cashier.annotation.Query;
 import javax.persistence.criteria.*;
 import java.lang.reflect.Field;
 import java.util.*;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

eladmin-common/src/main/java/cn/ysk/cashier/utils/Result.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;

eladmin-common/src/main/java/cn/ysk/cashier/utils/RsaUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import org.apache.commons.codec.binary.Base64;
 import javax.crypto.Cipher;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.utils.enums.DataScopeEnum;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.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/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;

eladmin-common/src/main/java/cn/ysk/cashier/utils/StringUtils.java

@@ -13,16 +13,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import cn.hutool.http.HttpUtil;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.config.ElAdminProperties;
+import cn.ysk.cashier.config.ElAdminProperties;
 import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
 import net.dreamlu.mica.ip2region.core.IpInfo;
 import nl.basjes.parse.useragent.UserAgent;
@@ -33,11 +31,6 @@ import java.net.NetworkInterface;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-
-import java.util.List;
-
 /**
  * @author Zheng Jie
  * 字符串工具类, 继承org.apache.commons.lang3.StringUtils类

eladmin-common/src/main/java/cn/ysk/cashier/utils/Threads.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import java.util.concurrent.CompletableFuture;
 

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils;
 
 import cn.hutool.json.JSONArray;
 import java.io.BufferedReader;

eladmin-common/src/main/java/cn/ysk/cashier/utils/ValidationUtil.java

@@ -13,11 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ObjectUtil;
-import me.zhengjie.exception.BadRequestException;
+import cn.ysk.cashier.exception.BadRequestException;
 
 /**
  * 验证工具

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

eladmin-common/src/main/java/cn/ysk/cashier/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 cn.ysk.cashier.utils.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

eladmin-common/src/test/java/cn/ysk/cashier/utils/DateUtilsTest.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import org.junit.jupiter.api.Test;
 

eladmin-common/src/test/java/cn/ysk/cashier/utils/EncryptUtilsTest.java

@@ -1,8 +1,8 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import org.junit.jupiter.api.Test;
 
-import static me.zhengjie.utils.EncryptUtils.*;
+import static cn.ysk.cashier.utils.EncryptUtils.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EncryptUtilsTest {

eladmin-common/src/test/java/cn/ysk/cashier/utils/FileUtilTest.java

@@ -1,9 +1,9 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockMultipartFile;
 
-import static me.zhengjie.utils.FileUtil.*;
+import static cn.ysk.cashier.utils.FileUtil.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FileUtilTest {

eladmin-common/src/test/java/cn/ysk/cashier/utils/StringUtilsTest.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package cn.ysk.cashier.utils;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -6,11 +6,11 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static me.zhengjie.utils.StringUtils.getIp;
-import static me.zhengjie.utils.StringUtils.getWeekDay;
-import static me.zhengjie.utils.StringUtils.toCamelCase;
-import static me.zhengjie.utils.StringUtils.toCapitalizeCamelCase;
-import static me.zhengjie.utils.StringUtils.toUnderScoreCase;
+import static cn.ysk.cashier.utils.StringUtils.getIp;
+import static cn.ysk.cashier.utils.StringUtils.getWeekDay;
+import static cn.ysk.cashier.utils.StringUtils.toCamelCase;
+import static cn.ysk.cashier.utils.StringUtils.toCapitalizeCamelCase;
+import static cn.ysk.cashier.utils.StringUtils.toUnderScoreCase;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;