diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 87b5c37..d8fa304 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -11,6 +11,14 @@ + + + + + + + + diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 9febb5a..fb94664 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,6 +1,9 @@ \ No newline at end of file diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDict.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDict.java index d035835..836d387 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDict.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDict.java @@ -1,4 +1,4 @@ -package org.leocoder.common.anno; +package org.leocoder.thin.common.anno; import java.lang.annotation.*; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDictClass.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDictClass.java index 75fb1e4..4f51602 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDictClass.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderDictClass.java @@ -1,4 +1,4 @@ -package org.leocoder.common.anno; +package org.leocoder.thin.common.anno; import java.lang.annotation.*; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderIgnoreR.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderIgnoreR.java index 27823df..78acc6a 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderIgnoreR.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderIgnoreR.java @@ -1,4 +1,4 @@ -package org.leocoder.common.anno; +package org.leocoder.thin.common.anno; import java.lang.annotation.*; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderLimit.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderLimit.java index 3b6d709..eac6513 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderLimit.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderLimit.java @@ -1,8 +1,8 @@ -package org.leocoder.common.anno; +package org.leocoder.thin.common.anno; -import org.leocoder.common.constants.CoderCacheConstants; -import org.leocoder.common.enmus.limit.LimitType; +import org.leocoder.thin.common.constants.CoderCacheConstants; +import org.leocoder.thin.common.enmus.limit.LimitType; import java.lang.annotation.*; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderRepeatSubmit.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderRepeatSubmit.java index 80176e3..9778861 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderRepeatSubmit.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/anno/CoderRepeatSubmit.java @@ -1,6 +1,7 @@ -package org.leocoder.common.anno; +package org.leocoder.thin.common.anno; -import org.leocoder.common.constants.CoderCacheConstants; + +import org.leocoder.thin.common.constants.CoderCacheConstants; import java.lang.annotation.*; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/AsyncConfig.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/AsyncConfig.java index abb46a8..e83eb6b 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/AsyncConfig.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/AsyncConfig.java @@ -1,4 +1,4 @@ -package org.leocoder.common.config; +package org.leocoder.thin.common.config; import cn.hutool.core.lang.UUID; import org.slf4j.MDC; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/JacksonConfig.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/JacksonConfig.java index 5c3ca47..f2d6ed7 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/JacksonConfig.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/JacksonConfig.java @@ -1,4 +1,4 @@ -package org.leocoder.common.config; +package org.leocoder.thin.common.config; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/LongSerializerConfig.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/LongSerializerConfig.java index 9758075..41cdfb4 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/LongSerializerConfig.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/LongSerializerConfig.java @@ -1,4 +1,4 @@ -package org.leocoder.common.config; +package org.leocoder.thin.common.config; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/RedisConfig.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/RedisConfig.java index 9ec1a90..6993a30 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/RedisConfig.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/RedisConfig.java @@ -1,4 +1,4 @@ -package org.leocoder.common.config; +package org.leocoder.thin.common.config; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -32,9 +32,12 @@ import java.time.format.DateTimeFormatter; @Configuration public class RedisConfig implements CachingConfigurer { - private static final String STANDARD_PATTERN = "yyyy-MM-dd HH:mm:ss"; // 标准日期 - private static final String DATE_PATTERN = "yyyy-MM-dd"; // 年月日格式 - private static final String TIME_PATTERN = "HH:mm:ss"; // 时间格式 + // 标准日期 + private static final String STANDARD_PATTERN = "yyyy-MM-dd HH:mm:ss"; + // 年月日格式 + private static final String DATE_PATTERN = "yyyy-MM-dd"; + // 时间格式 + private static final String TIME_PATTERN = "HH:mm:ss"; @Bean public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/WebConfig.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/WebConfig.java index 5704571..9d9ff89 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/WebConfig.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/config/WebConfig.java @@ -1,10 +1,10 @@ -package org.leocoder.common.config; +package org.leocoder.thin.common.config; -import org.leocoder.common.filter.XssFilter; -import org.leocoder.common.interceptor.CoderIpBlockListInterceptor; -import org.leocoder.common.interceptor.CoderTrackIdInterceptor; -import org.leocoder.common.interceptor.CoderWebInvokeTimeInterceptor; -import org.leocoder.common.utils.string.CutOutUtil; +import org.leocoder.thin.common.filter.XssFilter; +import org.leocoder.thin.common.interceptor.CoderIpBlockListInterceptor; +import org.leocoder.thin.common.interceptor.CoderTrackIdInterceptor; +import org.leocoder.thin.common.interceptor.CoderWebInvokeTimeInterceptor; +import org.leocoder.thin.common.utils.string.CutOutUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; @@ -18,8 +18,8 @@ import java.util.List; import java.util.Map; /** - * @description [防止SQL注入、XSS攻击、CSRF/CROS恶意访问，需要guava包依赖] * @author : Leocoder + * @description [防止SQL注入、XSS攻击、CSRF/CROS恶意访问，需要guava包依赖] */ @Configuration public class WebConfig implements WebMvcConfigurer { @@ -33,7 +33,7 @@ public class WebConfig implements WebMvcConfigurer { * @author : Leocoder */ @Bean - public CoderIpBlockListInterceptor CoderIpBlockListInterceptor(){ + public CoderIpBlockListInterceptor CoderIpBlockListInterceptor() { return new CoderIpBlockListInterceptor(); } @@ -55,9 +55,11 @@ public class WebConfig implements WebMvcConfigurer { filterRegistrationBean.setFilter(new XssFilter()); filterRegistrationBean.setOrder(1); filterRegistrationBean.setEnabled(true); - filterRegistrationBean.setUrlPatterns(List.of("/*")); // 使用List代替数组 + // 使用List代替数组 + filterRegistrationBean.setUrlPatterns(List.of("/*")); Map initParameters = new HashMap<>(); - initParameters.put("excludes", "/favicon.ico,/img/*,/js/*,/css/*,/captcha/*,/auth/*"); // 使用逗号分隔的字符串 + // 使用逗号分隔的字符串 + initParameters.put("excludes", "/favicon.ico,/img/*,/js/*,/css/*,/captcha/*,/auth/*"); initParameters.put("isIncludeRichText", "true"); filterRegistrationBean.setInitParameters(initParameters); return filterRegistrationBean; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderCacheConstants.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderCacheConstants.java index 5291d64..6382284 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderCacheConstants.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderCacheConstants.java @@ -1,4 +1,4 @@ -package org.leocoder.common.constants; +package org.leocoder.thin.common.constants; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderConstants.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderConstants.java index 385e6f2..d484ad0 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderConstants.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/CoderConstants.java @@ -1,4 +1,4 @@ -package org.leocoder.common.constants; +package org.leocoder.thin.common.constants; /** * @description [通用常量信息] @@ -126,9 +126,4 @@ public class CoderConstants { */ public static final String CODER_COMMON = "CODER_COMMON"; - /** - * AES 密码加密密钥 - */ - public static final String AES_PWD_SECRET_KEY = "CODERADMINccoder"; - } diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/SaTokenSessionConstants.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/SaTokenSessionConstants.java index c8c815a..ca61654 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/SaTokenSessionConstants.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/constants/SaTokenSessionConstants.java @@ -1,4 +1,4 @@ -package org.leocoder.common.constants; +package org.leocoder.thin.common.constants; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/common/IResultEnum.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/common/IResultEnum.java index e873a29..f890c25 100644 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/common/IResultEnum.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/common/IResultEnum.java @@ -1,4 +1,4 @@ -package org.leocoder.common.enmus.common; +package org.leocoder.thin.common.enmus.common; /** * @author : Leocoder @@ -16,8 +16,6 @@ public interface IResultEnum { String USER = "101"; // 用户 String ROLE = "102"; // 角色 String PERMISSION = "103"; // 菜单 - String DEPT = "104"; // 部门 - String POST = "105"; // 岗位 String LOGIN_LOG = "106"; // 登录日志 String OPER_LOG = "107"; // 操作日志 diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/limit/LimitType.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/limit/LimitType.java index 2499abe..d599a96 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/limit/LimitType.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/limit/LimitType.java @@ -1,4 +1,4 @@ -package org.leocoder.common.enmus.limit; +package org.leocoder.thin.common.enmus.limit; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/BusinessStatus.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/BusinessStatus.java index 4042147..2a2f9dc 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/BusinessStatus.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/BusinessStatus.java @@ -1,4 +1,4 @@ -package org.leocoder.common.enmus.log; +package org.leocoder.thin.common.enmus.log; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/ClientType.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/ClientType.java index 7d78f51..2e83143 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/ClientType.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/enmus/log/ClientType.java @@ -1,4 +1,4 @@ -package org.leocoder.common.enmus.log; +package org.leocoder.thin.common.enmus.log; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/BusinessException.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/BusinessException.java index 5e13a01..d02bd59 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/BusinessException.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/BusinessException.java @@ -1,7 +1,7 @@ -package org.leocoder.common.exception; +package org.leocoder.thin.common.exception; import lombok.Getter; -import org.leocoder.common.enmus.common.IResultEnum; +import org.leocoder.thin.common.enmus.common.IResultEnum; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RateLimiterException.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RateLimiterException.java index db8ae3a..6bc6237 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RateLimiterException.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RateLimiterException.java @@ -1,7 +1,7 @@ -package org.leocoder.common.exception; +package org.leocoder.thin.common.exception; import lombok.Getter; -import org.leocoder.common.enmus.common.IResultEnum; +import org.leocoder.thin.common.enmus.common.IResultEnum; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RepeatSubmitException.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RepeatSubmitException.java index c472cf9..9c7b9f5 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RepeatSubmitException.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/RepeatSubmitException.java @@ -1,7 +1,7 @@ -package org.leocoder.common.exception; +package org.leocoder.thin.common.exception; import lombok.Getter; -import org.leocoder.common.enmus.common.IResultEnum; +import org.leocoder.thin.common.enmus.common.IResultEnum; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/ParamsException.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/ParamsException.java index 80b9be1..a964919 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/ParamsException.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/ParamsException.java @@ -1,7 +1,7 @@ -package org.leocoder.common.exception.coder; +package org.leocoder.thin.common.exception.coder; import lombok.Getter; -import org.leocoder.common.enmus.common.IResultEnum; +import org.leocoder.thin.common.enmus.common.IResultEnum; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/YUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/YUtil.java index c3291ce..d2b3c0f 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/YUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/exception/coder/YUtil.java @@ -1,8 +1,8 @@ -package org.leocoder.common.exception.coder; +package org.leocoder.thin.common.exception.coder; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.leocoder.common.enmus.common.IResultEnum; +import org.leocoder.thin.common.enmus.common.IResultEnum; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/RepeatedlyRequestWrapper.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/RepeatedlyRequestWrapper.java index 8c54652..d5a70ad 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/RepeatedlyRequestWrapper.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/RepeatedlyRequestWrapper.java @@ -1,4 +1,4 @@ -package org.leocoder.common.filter; +package org.leocoder.thin.common.filter; import cn.hutool.core.io.IoUtil; import jakarta.servlet.ReadListener; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssFilter.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssFilter.java index 0a92754..e0c7ed7 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssFilter.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssFilter.java @@ -1,4 +1,4 @@ -package org.leocoder.common.filter; +package org.leocoder.thin.common.filter; import jakarta.servlet.*; import jakarta.servlet.annotation.WebFilter; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssHttpServletRequestWrapper.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssHttpServletRequestWrapper.java index a28df58..01613a8 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssHttpServletRequestWrapper.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package org.leocoder.common.filter; +package org.leocoder.thin.common.filter; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderIpBlockListInterceptor.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderIpBlockListInterceptor.java index b97e5c8..ec4da63 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderIpBlockListInterceptor.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderIpBlockListInterceptor.java @@ -1,4 +1,4 @@ -package org.leocoder.common.interceptor; +package org.leocoder.thin.common.interceptor; import cn.hutool.core.collection.CollectionUtil; import jakarta.annotation.Nullable; @@ -6,12 +6,12 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.leocoder.common.constants.CoderCacheConstants; -import org.leocoder.common.constants.CoderConstants; -import org.leocoder.common.exception.coder.ParamsException; -import org.leocoder.common.utils.cache.RedisLimitUtil; -import org.leocoder.common.utils.cache.RedisUtil; -import org.leocoder.common.utils.ip.IpUtil; +import org.leocoder.thin.common.constants.CoderCacheConstants; +import org.leocoder.thin.common.constants.CoderConstants; +import org.leocoder.thin.common.exception.coder.ParamsException; +import org.leocoder.thin.common.utils.cache.RedisLimitUtil; +import org.leocoder.thin.common.utils.cache.RedisUtil; +import org.leocoder.thin.common.utils.ip.IpUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderTrackIdInterceptor.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderTrackIdInterceptor.java index 86f7cd4..8f7280b 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderTrackIdInterceptor.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderTrackIdInterceptor.java @@ -1,4 +1,4 @@ -package org.leocoder.common.interceptor; +package org.leocoder.thin.common.interceptor; import cn.hutool.core.lang.UUID; import jakarta.annotation.Nullable; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderWebInvokeTimeInterceptor.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderWebInvokeTimeInterceptor.java index 63f4b64..cd8e0f3 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderWebInvokeTimeInterceptor.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/interceptor/CoderWebInvokeTimeInterceptor.java @@ -1,4 +1,4 @@ -package org.leocoder.common.interceptor; +package org.leocoder.thin.common.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; @@ -8,8 +8,8 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import net.dreamlu.mica.core.utils.StringUtil; import org.apache.commons.lang3.time.StopWatch; -import org.leocoder.common.filter.RepeatedlyRequestWrapper; -import org.leocoder.common.utils.json.JsonUtil; +import org.leocoder.thin.common.filter.RepeatedlyRequestWrapper; +import org.leocoder.thin.common.utils.json.JsonUtil; import org.springframework.http.MediaType; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/resultex/ErrorHandler.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/resultex/ErrorHandler.java index 07e78be..55f31f0 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/resultex/ErrorHandler.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/resultex/ErrorHandler.java @@ -1,7 +1,7 @@ -package org.leocoder.common.resultex; +package org.leocoder.thin.common.resultex; import lombok.Data; -import org.leocoder.common.enmus.common.IResultEnum; +import org.leocoder.thin.common.enmus.common.IResultEnum; /** * @author : Leocoder @@ -26,7 +26,7 @@ public class ErrorHandler { /** * 方法封装 : - * - R 大量的大量的入侵 + * - ResultUtils 大量的大量的入侵 * - 解决调用方便的问题 */ // 错误为什么传递status。成功只有一种，但是错误有N状态 diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUser.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUser.java index 770a336..33bd7d1 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUser.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUser.java @@ -1,4 +1,4 @@ -package org.leocoder.common.satoken; +package org.leocoder.thin.common.satoken; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUtil.java index 66cda02..71f55fa 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderLoginUtil.java @@ -1,9 +1,9 @@ -package org.leocoder.common.satoken; +package org.leocoder.thin.common.satoken; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; import lombok.extern.slf4j.Slf4j; -import org.leocoder.common.constants.SaTokenSessionConstants; +import org.leocoder.thin.common.constants.SaTokenSessionConstants; import java.time.LocalDateTime; @@ -121,21 +121,6 @@ public class CoderLoginUtil { return getLoginUser().getCreateTime(); } - /** - * @description [获取当前用户部门ID-此表也可改为城市信息] - * @author : Leocoder - */ - public static Long getDeptId() { - return getLoginUser().getDeptId(); - } - - /** - * @description [获取当前用户部门名称] - * @author : Leocoder - */ - public static String getDeptName() { - return getLoginUser().getDeptName(); - } /** * @description [获取当前用户登录IP] diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderPasswordUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderPasswordUtil.java index ee9fab1..e35c311 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderPasswordUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/satoken/CoderPasswordUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.satoken; +package org.leocoder.thin.common.satoken; import cn.dev33.satoken.secure.SaSecureUtil; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/LocalCacheUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/LocalCacheUtil.java index f929109..0d63fec 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/LocalCacheUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/LocalCacheUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.cache; +package org.leocoder.thin.common.utils.cache; import org.springframework.cache.Cache; import org.springframework.cache.support.SimpleValueWrapper; @@ -10,7 +10,10 @@ import java.util.Objects; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; - +/** + * @author : Leocoder + * @description [LocalCacheUtil] + */ @Component public class LocalCacheUtil implements Cache { diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisLimitUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisLimitUtil.java index f057ec1..b51c189 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisLimitUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisLimitUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.cache; +package org.leocoder.thin.common.utils.cache; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisUtil.java index 3ed512f..d02e909 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/cache/RedisUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.cache; +package org.leocoder.thin.common.utils.cache; import jakarta.annotation.Resource; import org.springframework.data.redis.core.*; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/CalendarUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/CalendarUtil.java index 44a0914..16fba45 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/CalendarUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/CalendarUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.date; +package org.leocoder.thin.common.utils.date; import java.time.LocalDate; import java.time.temporal.ChronoUnit; @@ -73,16 +73,20 @@ public class CalendarUtil { // 母亲节：5月的第二个星期日 LocalDate mothersDay = LocalDate.of(year, 5, 1) .with(TemporalAdjusters.firstDayOfNextMonth()) - .minusDays(1) // 回到5月的最后一天 + // 回到5月的最后一天 + .minusDays(1) .with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.SUNDAY)) - .minusWeeks(1); // 向前推一周到第二个星期日 + // 向前推一周到第二个星期日 + .minusWeeks(1); // 父亲节：6月的第三个星期日 LocalDate fathersDay = LocalDate.of(year, 6, 1) .with(TemporalAdjusters.firstDayOfNextMonth()) - .minusDays(1) // 回到6月的最后一天 + // 回到6月的最后一天 + .minusDays(1) .with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.SUNDAY)) - .minusWeeks(2); // 向前推两周到第三个星期日 + // 向前推两周到第三个星期日 + .minusWeeks(2); parentDays.put("mothersDay", mothersDay); parentDays.put("fathersDay", fathersDay); @@ -126,12 +130,14 @@ public class CalendarUtil { // 母亲节：5月的第二个星期日 LocalDate mothersDay = LocalDate.of(year, 5, 1) .with(TemporalAdjusters.nextOrSame(java.time.DayOfWeek.SUNDAY)) - .plusWeeks(1); // 5月的第一个星期日之后的第一个星期日（即第二个） + // 5月的第一个星期日之后的第一个星期日（即第二个） + .plusWeeks(1); // 父亲节：6月的第三个星期日 LocalDate fathersDay = LocalDate.of(year, 6, 1) .with(TemporalAdjusters.nextOrSame(java.time.DayOfWeek.SUNDAY)) - .plusWeeks(2); // 6月的第一个星期日之后的第二个星期日（注意这里实际是第三个，因为已经是第一个月了） + // 6月的第一个星期日之后的第二个星期日（注意这里实际是第三个，因为已经是第一个月了） + .plusWeeks(2); // 设置参考日期 LocalDate referenceDate = LocalDate.of(year, month, day); @@ -211,7 +217,8 @@ public class CalendarUtil { if (sameDayHoliday.isPresent()) { // 如果存在与参考日期相同的节假日 map.put("name", sameDayHoliday.get().getName()); - map.put("number", 0); // 同一天，所以天数为0 + // 同一天，所以天数为0 + map.put("number", 0); } else { // 如果没有找到与参考日期相同的节假日，则查找最近的未来节假日 Optional nextHoliday = holidays.stream() diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/DateUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/DateUtil.java index 7ae9dfb..1d7ac53 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/DateUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/date/DateUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.date; +package org.leocoder.thin.common.utils.date; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/decimal/BigDecimalUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/decimal/BigDecimalUtil.java index 4f5888e..afa5a39 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/decimal/BigDecimalUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/decimal/BigDecimalUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.decimal; +package org.leocoder.thin.common.utils.decimal; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileTypeUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileTypeUtil.java index 577108a..746ea73 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileTypeUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileTypeUtil.java @@ -1,7 +1,7 @@ -package org.leocoder.common.utils.file; +package org.leocoder.thin.common.utils.file; import org.apache.commons.lang3.StringUtils; -import org.leocoder.common.exception.coder.YUtil; +import org.leocoder.thin.common.exception.coder.YUtil; import org.springframework.web.multipart.MultipartFile; import java.io.File; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileUtil.java index 6a3f04c..658b842 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FileUtil.java @@ -1,7 +1,7 @@ -package org.leocoder.common.utils.file; +package org.leocoder.thin.common.utils.file; import jakarta.servlet.http.HttpServletResponse; -import org.leocoder.common.utils.ip.ServletUtil; +import org.leocoder.thin.common.utils.ip.ServletUtil; import java.io.File; import java.io.FileInputStream; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FormatLogUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FormatLogUtil.java index 9396679..3f07c1a 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FormatLogUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/FormatLogUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.file; +package org.leocoder.thin.common.utils.file; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/TextUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/TextUtil.java index b4a0330..80a162e 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/TextUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/TextUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.file; +package org.leocoder.thin.common.utils.file; import lombok.extern.slf4j.Slf4j; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/UploadUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/UploadUtil.java index daf7255..cde1722 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/UploadUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/UploadUtil.java @@ -1,9 +1,9 @@ -package org.leocoder.common.utils.file; +package org.leocoder.thin.common.utils.file; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.leocoder.common.exception.coder.YUtil; -import org.leocoder.common.utils.id.UUIDUtil; +import org.leocoder.thin.common.exception.coder.YUtil; +import org.leocoder.thin.common.utils.id.UUIDUtil; import org.springframework.web.multipart.MultipartFile; import java.io.File; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/ZipUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/ZipUtil.java index ca33baa..719dc38 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/ZipUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/file/ZipUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.file; +package org.leocoder.thin.common.utils.file; import java.io.File; import java.io.FileInputStream; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/EscapeUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/EscapeUtil.java index 23eb16f..fb146e0 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/EscapeUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/EscapeUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.html; +package org.leocoder.thin.common.utils.html; import org.apache.commons.lang3.StringUtils; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/HTMLFilter.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/HTMLFilter.java index 68f4dfe..2759da5 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/HTMLFilter.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.html; +package org.leocoder.thin.common.utils.html; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/http/HttpUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/http/HttpUtil.java index 78159c1..efc2c4a 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/http/HttpUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/http/HttpUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.http; +package org.leocoder.thin.common.utils.http; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/i18n/I18nUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/i18n/I18nUtil.java index e5fa2f7..e6ebd09 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/i18n/I18nUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/i18n/I18nUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.i18n; +package org.leocoder.thin.common.utils.i18n; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/IdUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/IdUtil.java index 48128d6..e466c2a 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/IdUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/IdUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.id; +package org.leocoder.thin.common.utils.id; import java.util.UUID; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/SnowFlakeUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/SnowFlakeUtil.java index 9c473fe..b166525 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/SnowFlakeUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/SnowFlakeUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.id; +package org.leocoder.thin.common.utils.id; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/UUIDUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/UUIDUtil.java index 66b2373..8f52b7e 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/UUIDUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/id/UUIDUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.id; +package org.leocoder.thin.common.utils.id; import java.util.UUID; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpAddressUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpAddressUtil.java index 2e5033d..cf662b5 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpAddressUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpAddressUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.ip; +package org.leocoder.thin.common.utils.ip; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpUtil.java index 9e105ab..441e5cb 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/IpUtil.java @@ -1,7 +1,7 @@ -package org.leocoder.common.utils.ip; +package org.leocoder.thin.common.utils.ip; import jakarta.servlet.http.HttpServletRequest; -import org.leocoder.common.utils.html.HTMLFilter; +import org.leocoder.thin.common.utils.html.HTMLFilter; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/ServletUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/ServletUtil.java index 2136489..fe631b6 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/ServletUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/ip/ServletUtil.java @@ -1,9 +1,9 @@ -package org.leocoder.common.utils.ip; +package org.leocoder.thin.common.utils.ip; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; -import org.leocoder.common.utils.string.ConvertUtil; +import org.leocoder.thin.common.utils.string.ConvertUtil; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -13,6 +13,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; /** + * @author Leocoder * @description [客户端工具类-登录使用获取request] */ public class ServletUtil { diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/json/JsonUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/json/JsonUtil.java index a4af0d6..c4711a5 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/json/JsonUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/json/JsonUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.json; +package org.leocoder.thin.common.utils.json; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; @@ -8,9 +8,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -/* - * @description [全局异常解析JSON] +/** * @author : Leocoder + * @description [全局异常解析JSON] */ @Slf4j public class JsonUtil { diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/list/ListUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/list/ListUtil.java index e491463..f62f75d 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/list/ListUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/list/ListUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.list; +package org.leocoder.thin.common.utils.list; import java.util.*; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenBatchUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenBatchUtil.java index d462768..623a572 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenBatchUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenBatchUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.number; +package org.leocoder.thin.common.utils.number; /** * @author : Leocoder @@ -32,15 +32,15 @@ public class GenBatchUtil { } public static void main(String[] args) { - GenBatchUtil batchUtil = new GenBatchUtil(); - String serialNumber = batchUtil.getBatchNumber("Coder", 12, 10); // 生成12位流水编号 - System.out.println(serialNumber); // 输出生成的12位流水编号 - - String serialNumber8 = batchUtil.getBatchNumber("Coder", 8, 16); // 生成8位流水编号 - System.out.println(serialNumber8); // 输出生成的8位流水编号 - - int coder = batchUtil.getSortNumber("Coder", serialNumber8); - System.out.println(coder); + // GenBatchUtil batchUtil = new GenBatchUtil(); + // String serialNumber = batchUtil.getBatchNumber("Coder", 12, 10); // 生成12位流水编号 + // System.out.println(serialNumber); // 输出生成的12位流水编号 + // + // String serialNumber8 = batchUtil.getBatchNumber("Coder", 8, 16); // 生成8位流水编号 + // System.out.println(serialNumber8); // 输出生成的8位流水编号 + // + // int coder = batchUtil.getSortNumber("Coder", serialNumber8); + // System.out.println(coder); } } diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenOrderUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenOrderUtil.java index 27e2cef..d737a9a 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenOrderUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/GenOrderUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.number; +package org.leocoder.thin.common.utils.number; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/VerifyCodeUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/VerifyCodeUtil.java index 6671f16..de43619 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/VerifyCodeUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/number/VerifyCodeUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.number; +package org.leocoder.thin.common.utils.number; import java.util.Random; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/pwd/MD5Util.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/pwd/MD5Util.java index dd76ec3..a736966 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/pwd/MD5Util.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/pwd/MD5Util.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.pwd; +package org.leocoder.thin.common.utils.pwd; import java.math.BigInteger; import java.nio.charset.StandardCharsets; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/ConvertUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/ConvertUtil.java index e7f7e91..82728c2 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/ConvertUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/ConvertUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.string; +package org.leocoder.thin.common.utils.string; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/CutOutUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/CutOutUtil.java index b0b086b..4cac44c 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/CutOutUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/CutOutUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.string; +package org.leocoder.thin.common.utils.string; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StrFormatter.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StrFormatter.java index 3cc44a5..03633c7 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StrFormatter.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StrFormatter.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.string; +package org.leocoder.thin.common.utils.string; import org.apache.commons.lang3.StringUtils; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StringUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StringUtil.java index d417784..b91c7bc 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StringUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/StringUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.string; +package org.leocoder.thin.common.utils.string; import org.apache.commons.lang3.StringUtils; import org.springframework.util.AntPathMatcher; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/XORCommandUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/XORCommandUtil.java index 2693347..1d3e9ba 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/XORCommandUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/string/XORCommandUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.string; +package org.leocoder.thin.common.utils.string; /** * @author : Leocoder diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/valid/ValidatorUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/valid/ValidatorUtil.java index 093a063..a838720 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/valid/ValidatorUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/valid/ValidatorUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.common.utils.valid; +package org.leocoder.thin.common.utils.valid; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/web/WebUtil.java b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/web/WebUtil.java index 24059b5..3094836 100755 --- a/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/web/WebUtil.java +++ b/coder-common-thin-common/src/main/java/org/leocoder/thin/common/utils/web/WebUtil.java @@ -1,10 +1,14 @@ -package org.leocoder.common.utils.web; +package org.leocoder.thin.common.utils.web; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; +/** + * @author : Leocoder + * @description [WebUtil] + */ public class WebUtil { /** diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderLongBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderLongBo.java index 14fe2a0..984a337 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderLongBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderLongBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.element; +package org.leocoder.thin.domain.model.bo.element; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderStringBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderStringBo.java index 2768afd..b5011d4 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderStringBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/CascaderStringBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.element; +package org.leocoder.thin.domain.model.bo.element; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectLongBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectLongBo.java index 7054f6b..7bafa09 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectLongBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectLongBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.element; +package org.leocoder.thin.domain.model.bo.element; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectStringBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectStringBo.java index 6d1bc06..28f521e 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectStringBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/SelectStringBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.element; +package org.leocoder.thin.domain.model.bo.element; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferLongBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferLongBo.java index 3f0b145..1349654 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferLongBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferLongBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.element; +package org.leocoder.thin.domain.model.bo.element; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferStringBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferStringBo.java index 23123bb..6153926 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferStringBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/element/TransferStringBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.element; +package org.leocoder.thin.domain.model.bo.element; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysLoginBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysLoginBo.java index 3b34c86..3062a35 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysLoginBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysLoginBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.system; +package org.leocoder.thin.domain.model.bo.system; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysMenuBo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysMenuBo.java index dd157a9..c788dd0 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysMenuBo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/bo/system/SysMenuBo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.bo.system; +package org.leocoder.thin.domain.model.bo.system; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/base/BaseVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/base/BaseVo.java index 25798ae..52c3f6a 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/base/BaseVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/base/BaseVo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.vo.base; +package org.leocoder.thin.domain.model.vo.base; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenColumnVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenColumnVo.java index 94a446d..546ea4d 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenColumnVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenColumnVo.java @@ -1,10 +1,10 @@ -package org.leocoder.domain.model.vo.gen; +package org.leocoder.thin.domain.model.vo.gen; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; import java.util.Date; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenTableVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenTableVo.java index 2b120c1..efe7c52 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenTableVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/gen/GenTableVo.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.model.vo.gen; +package org.leocoder.thin.domain.model.vo.gen; import lombok.Data; import lombok.EqualsAndHashCode; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; /** * @author Leocoder diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SymbolValidateResultVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SymbolValidateResultVo.java index ccba24b..ed78cc0 100644 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SymbolValidateResultVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SymbolValidateResultVo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysFileVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysFileVo.java index 4fc8aee..9232624 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysFileVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysFileVo.java @@ -1,10 +1,10 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; /** * @description [文件资源表-模型][Vo类] diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginLogVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginLogVo.java index 1875dc9..78dcca0 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginLogVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginLogVo.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import lombok.Data; import lombok.EqualsAndHashCode; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; /** * @author Leocoder diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginUserVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginUserVo.java index efe25d6..d6be60c 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginUserVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginUserVo.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import lombok.Data; import lombok.EqualsAndHashCode; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; /** * @author Leocoder diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginVo.java index b2464e0..3cbc6e2 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysLoginVo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysMenuVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysMenuVo.java index 45f82aa..e14af78 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysMenuVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysMenuVo.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import lombok.Data; import lombok.EqualsAndHashCode; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; /** * @author Leocoder diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysOperLogVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysOperLogVo.java index 903759f..2745496 100644 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysOperLogVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysOperLogVo.java @@ -1,9 +1,10 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; -import org.leocoder.domain.model.vo.base.BaseVo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; +import org.leocoder.thin.domain.model.vo.base.BaseVo; + import java.time.LocalDateTime; /** diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPictureVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPictureVo.java index 5f5fdfa..377516b 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPictureVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPictureVo.java @@ -1,10 +1,10 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; import java.util.Date; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPwdVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPwdVo.java index 8da95de..439a4b2 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPwdVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysPwdVo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRegisterVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRegisterVo.java index 54ee61a..2e42a4e 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRegisterVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRegisterVo.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRoleVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRoleVo.java index d38db03..cd228e3 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRoleVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysRoleVo.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import lombok.Data; import lombok.EqualsAndHashCode; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; /** * @author Leocoder diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysUserOnlineVo.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysUserOnlineVo.java index c9c9f44..22c0709 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysUserOnlineVo.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/model/vo/system/SysUserOnlineVo.java @@ -1,10 +1,10 @@ -package org.leocoder.domain.model.vo.system; +package org.leocoder.thin.domain.model.vo.system; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; /** * @author Leocoder diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenColumn.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenColumn.java index d915f64..2e0427c 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenColumn.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenColumn.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.gen; +package org.leocoder.thin.domain.pojo.gen; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenTable.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenTable.java index 9a1344d..af94d63 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenTable.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/GenTable.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.gen; +package org.leocoder.thin.domain.pojo.gen; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableColumn.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableColumn.java index 9c82765..01bdf01 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableColumn.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableColumn.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.gen; +package org.leocoder.thin.domain.pojo.gen; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableData.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableData.java index ed2eaee..0ceca90 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableData.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/gen/TableData.java @@ -1,10 +1,10 @@ -package org.leocoder.domain.pojo.gen; +package org.leocoder.thin.domain.pojo.gen; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.leocoder.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; import java.util.List; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysFile.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysFile.java index bda64eb..6c5b148 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysFile.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysFile.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.system; +package org.leocoder.thin.domain.pojo.system; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginLog.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginLog.java index 370bfba..ffec58b 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginLog.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginLog.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.system; +package org.leocoder.thin.domain.pojo.system; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginUser.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginUser.java index d0beb71..ecb733e 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginUser.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysLoginUser.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.system; +package org.leocoder.thin.domain.pojo.system; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysMenu.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysMenu.java index cc9be7b..16bdedc 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysMenu.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysMenu.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.system; +package org.leocoder.thin.domain.pojo.system; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysPicture.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysPicture.java index d6b5d16..063282e 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysPicture.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysPicture.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.system; +package org.leocoder.thin.domain.pojo.system; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysRole.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysRole.java index e140533..e683fec 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysRole.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysRole.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.system; +package org.leocoder.thin.domain.pojo.system; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysUserRole.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysUserRole.java index 46fc84a..c3e9f76 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysUserRole.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/pojo/system/SysUserRole.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.pojo.system; +package org.leocoder.thin.domain.pojo.system; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidPhone.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidPhone.java index f4f7775..4ef08b8 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidPhone.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidPhone.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.validator.anno; +package org.leocoder.thin.domain.validator.anno; import jakarta.validation.Constraint; import jakarta.validation.Payload; -import org.leocoder.domain.validator.valid.PhoneValidator; +import org.leocoder.thin.domain.validator.valid.PhoneValidator; import java.lang.annotation.*; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidURL.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidURL.java index c3601c4..0725b1f 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidURL.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/anno/ValidURL.java @@ -1,7 +1,7 @@ -package org.leocoder.domain.validator.anno; +package org.leocoder.thin.domain.validator.anno; import jakarta.validation.Constraint; -import org.leocoder.domain.validator.valid.URLValidator; +import org.leocoder.thin.domain.validator.valid.URLValidator; import java.lang.annotation.*; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/utils/ValidatorUtil.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/utils/ValidatorUtil.java index 0141f2b..8e40799 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/utils/ValidatorUtil.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/utils/ValidatorUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.domain.validator.utils; +package org.leocoder.thin.domain.validator.utils; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/PhoneValidator.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/PhoneValidator.java index 7d09b65..0e8a317 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/PhoneValidator.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/PhoneValidator.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.validator.valid; +package org.leocoder.thin.domain.validator.valid; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.leocoder.domain.validator.anno.ValidPhone; +import org.leocoder.thin.domain.validator.anno.ValidPhone; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/URLValidator.java b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/URLValidator.java index 913e3f0..467faa6 100755 --- a/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/URLValidator.java +++ b/coder-common-thin-model/src/main/java/org/leocoder/thin/domain/validator/valid/URLValidator.java @@ -1,8 +1,8 @@ -package org.leocoder.domain.validator.valid; +package org.leocoder.thin.domain.validator.valid; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; -import org.leocoder.domain.validator.anno.ValidURL; +import org.leocoder.thin.domain.validator.anno.ValidURL; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/anno/EnableMybatisPlus.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/anno/EnableMybatisPlus.java index 1dc2228..4f35ba4 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/anno/EnableMybatisPlus.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/anno/EnableMybatisPlus.java @@ -1,6 +1,6 @@ -package org.leocoder.mp.anno; +package org.leocoder.thin.mybatisplus.anno; -import org.leocoder.mp.config.MyBatisPlusConfiguration; +import org.leocoder.thin.mybatisplus.config.MyBatisPlusConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/CommonMetaObjectHandler.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/CommonMetaObjectHandler.java index 41728cc..680ba62 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/CommonMetaObjectHandler.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/CommonMetaObjectHandler.java @@ -1,4 +1,4 @@ -package org.leocoder.mp.config; +package org.leocoder.thin.mybatisplus.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/MyBatisPlusConfiguration.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/MyBatisPlusConfiguration.java index a44bf92..b692a5a 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/MyBatisPlusConfiguration.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/config/MyBatisPlusConfiguration.java @@ -1,4 +1,4 @@ -package org.leocoder.mp.config; +package org.leocoder.thin.mybatisplus.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; @@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; */ @Configuration @EnableTransactionManagement -// 多包名使用 例如 org.leocoder.domain.**.mapper,com.xxx.**.mapper +// 多包名使用 例如 org.leocoder.thin.domain.**.mapper,com.xxx.**.mapper @MapperScan("org.leocoder.**.mapper") public class MyBatisPlusConfiguration { diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/handler/CustomIdGenerator.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/handler/CustomIdGenerator.java index 4a0f839..4a83bfe 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/handler/CustomIdGenerator.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/handler/CustomIdGenerator.java @@ -1,9 +1,13 @@ -package org.leocoder.mp.handler; +package org.leocoder.thin.mybatisplus.handler; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import java.util.Random; +/*** + * @description [CustomIdGenerator] + * @author Leocoder + */ public class CustomIdGenerator implements IdentifierGenerator { @Override diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysFileMapper.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysFileMapper.java index f9b43e7..50a2490 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysFileMapper.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysFileMapper.java @@ -1,8 +1,8 @@ -package org.leocoder.mp.mapper.system; +package org.leocoder.thin.mybatisplus.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.leocoder.domain.pojo.system.SysFile; +import org.leocoder.thin.domain.pojo.system.SysFile; /** * @description [文件资源表-数据库连接层] diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginLogMapper.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginLogMapper.java index 8937ef2..4ff6b1f 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginLogMapper.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginLogMapper.java @@ -1,8 +1,8 @@ -package org.leocoder.mp.mapper.system; +package org.leocoder.thin.mybatisplus.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.leocoder.domain.pojo.system.SysLoginLog; +import org.leocoder.thin.domain.pojo.system.SysLoginLog; /** * @author Leocoder diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginUserMapper.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginUserMapper.java index a48023d..4950f1e 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginUserMapper.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysLoginUserMapper.java @@ -1,11 +1,11 @@ -package org.leocoder.mp.mapper.system; +package org.leocoder.thin.mybatisplus.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.leocoder.domain.model.vo.system.SysLoginUserVo; -import org.leocoder.domain.pojo.system.SysLoginUser; +import org.leocoder.thin.domain.model.vo.system.SysLoginUserVo; +import org.leocoder.thin.domain.pojo.system.SysLoginUser; import java.util.List; diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysMenuMapper.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysMenuMapper.java index 66117e7..b7e396c 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysMenuMapper.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysMenuMapper.java @@ -1,12 +1,12 @@ -package org.leocoder.mp.mapper.system; +package org.leocoder.thin.mybatisplus.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.leocoder.domain.model.bo.element.CascaderLongBo; -import org.leocoder.domain.model.bo.system.SysMenuBo; -import org.leocoder.domain.model.vo.system.SysMenuVo; -import org.leocoder.domain.pojo.system.SysMenu; +import org.leocoder.thin.domain.model.bo.element.CascaderLongBo; +import org.leocoder.thin.domain.model.bo.system.SysMenuBo; +import org.leocoder.thin.domain.model.vo.system.SysMenuVo; +import org.leocoder.thin.domain.pojo.system.SysMenu; import java.util.List; diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysPictureMapper.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysPictureMapper.java index 1cfcd94..0822a83 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysPictureMapper.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysPictureMapper.java @@ -1,8 +1,8 @@ -package org.leocoder.mp.mapper.system; +package org.leocoder.thin.mybatisplus.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.leocoder.domain.pojo.system.SysPicture; +import org.leocoder.thin.domain.pojo.system.SysPicture; /** * @description [图库表-数据库连接层] diff --git a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysRoleMapper.java b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysRoleMapper.java index 42fc54d..bb9a3fc 100755 --- a/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysRoleMapper.java +++ b/coder-common-thin-mybatisplus/src/main/java/org/leocoder/thin/mybatisplus/mapper/system/SysRoleMapper.java @@ -1,15 +1,15 @@ -package org.leocoder.mp.mapper.system; +package org.leocoder.thin.mybatisplus.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.leocoder.domain.model.bo.element.SelectLongBo; -import org.leocoder.domain.model.bo.element.TransferLongBo; -import org.leocoder.domain.model.vo.base.BaseVo; -import org.leocoder.domain.model.vo.system.SysRoleVo; -import org.leocoder.domain.pojo.system.SysRole; -import org.leocoder.domain.pojo.system.SysUserRole; +import org.leocoder.thin.domain.model.bo.element.SelectLongBo; +import org.leocoder.thin.domain.model.bo.element.TransferLongBo; +import org.leocoder.thin.domain.model.vo.base.BaseVo; +import org.leocoder.thin.domain.model.vo.system.SysRoleVo; +import org.leocoder.thin.domain.pojo.system.SysRole; +import org.leocoder.thin.domain.pojo.system.SysUserRole; import java.util.List; diff --git a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysFileMapper.xml b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysFileMapper.xml index 081c4b4..4d6f101 100644 --- a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysFileMapper.xml +++ b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysFileMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginLogMapper.xml b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginLogMapper.xml index a960040..c8be6fe 100644 --- a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginLogMapper.xml +++ b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginLogMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginUserMapper.xml b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginUserMapper.xml index cce144f..ba383dc 100644 --- a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginUserMapper.xml +++ b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysLoginUserMapper.xml @@ -1,9 +1,9 @@ - + - SELECT t1.user_id AS userId, t1.dept_id AS deptId, @@ -57,7 +57,7 @@ - SELECT t1.user_id AS userId, t1.dept_id AS deptId, diff --git a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysMenuMapper.xml b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysMenuMapper.xml index 663e416..c531e4b 100644 --- a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysMenuMapper.xml @@ -1,9 +1,9 @@ - + - SELECT t1.menu_id AS menuId, t1.menu_name AS menuName, @@ -80,7 +80,7 @@ - SELECT menu_name AS label, menu_id AS value, @@ -95,7 +95,7 @@ - SELECT DISTINCT(t1.menu_id) AS menuId, t1.menu_name AS menuName, @@ -131,7 +131,7 @@ - SELECT menu_id AS menuId, menu_name AS menuName, @@ -160,7 +160,7 @@ - SELECT t1.menu_id AS menuId, t1.parent_id AS parentId diff --git a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysPictureMapper.xml b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysPictureMapper.xml index d54dd0b..650af36 100644 --- a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysPictureMapper.xml +++ b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysPictureMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysRoleMapper.xml b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysRoleMapper.xml index 508e545..ad49fe1 100644 --- a/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/coder-common-thin-mybatisplus/src/main/resources/mapper/system/SysRoleMapper.xml @@ -1,9 +1,9 @@ - + - SELECT t1.role_id AS roleId, t1.role_name AS roleName, @@ -56,7 +56,7 @@ - SELECT user_id AS userId, role_id AS roleId @@ -67,7 +67,7 @@ - SELECT role_name AS label, role_id AS value @@ -140,7 +140,7 @@ - SELECT t1.role_name AS label, t1.role_id AS value diff --git a/coder-common-thin-plugins/coder-common-thin-desensitize/pom.xml b/coder-common-thin-plugins/coder-common-thin-desensitize/pom.xml index 768f058..03e848d 100644 --- a/coder-common-thin-plugins/coder-common-thin-desensitize/pom.xml +++ b/coder-common-thin-plugins/coder-common-thin-desensitize/pom.xml @@ -6,15 +6,26 @@ org.leocoder.thin coder-common-thin-plugins - 1.0.0 + ${revision} - coder-common-thin-desensitize - - 17 - 17 - UTF-8 - + coder-common-thin-desensitize + coder-common-thin-desensitize + 数据脱敏插件 + + + + + org.leocoder.thin + coder-common-thin-common + ${revision} + + + + org.springframework.boot + spring-boot-starter-aop + + \ No newline at end of file diff --git a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/CoderDesensitize.java b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/CoderDesensitize.java index f09a293..94182e3 100755 --- a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/CoderDesensitize.java +++ b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/CoderDesensitize.java @@ -1,9 +1,9 @@ -package org.leocoder.desensitize.anno; +package org.leocoder.thin.desensitize.anno; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.leocoder.desensitize.config.DesensitizeJsonSerializer; -import org.leocoder.desensitize.enums.DesensitizeRuleEnum; +import org.leocoder.thin.desensitize.config.DesensitizeJsonSerializer; +import org.leocoder.thin.desensitize.enums.DesensitizeRuleEnum; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/EnableCoderDesensitize.java b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/EnableCoderDesensitize.java index 67bd520..b98808a 100755 --- a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/EnableCoderDesensitize.java +++ b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/anno/EnableCoderDesensitize.java @@ -1,6 +1,6 @@ -package org.leocoder.desensitize.anno; +package org.leocoder.thin.desensitize.anno; -import org.leocoder.desensitize.config.DesensitizeJsonSerializer; +import org.leocoder.thin.desensitize.config.DesensitizeJsonSerializer; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/config/DesensitizeJsonSerializer.java b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/config/DesensitizeJsonSerializer.java index a351397..5806a55 100755 --- a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/config/DesensitizeJsonSerializer.java +++ b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/config/DesensitizeJsonSerializer.java @@ -1,4 +1,4 @@ -package org.leocoder.desensitize.config; +package org.leocoder.thin.desensitize.config; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.DesensitizedUtil; @@ -10,13 +10,11 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -import org.leocoder.common.satoken.CoderLoginUtil; -import org.leocoder.desensitize.anno.CoderDesensitize; -import org.leocoder.desensitize.enums.DesensitizeRuleEnum; -import org.springframework.util.CollectionUtils; +import org.leocoder.thin.common.satoken.CoderLoginUtil; +import org.leocoder.thin.desensitize.anno.CoderDesensitize; +import org.leocoder.thin.desensitize.enums.DesensitizeRuleEnum; import java.io.IOException; -import java.util.List; import java.util.Objects; /** @@ -47,17 +45,6 @@ public class DesensitizeJsonSerializer extends JsonSerializer implements // 无脱敏部门数据，直接写入原始值 jsonGenerator.writeString(str); return; - } else { - Long deptId = CoderLoginUtil.getDeptId(); - if(!CollectionUtils.isEmpty(List.of(deptIds))) { - List deptIdList = List.of(deptIds); - boolean desensitizeDeptId = deptIdList.contains(deptId); - if(!desensitizeDeptId) { - // 无脱敏部门数据，直接写入原始值 - jsonGenerator.writeString(str); - return; - } - } } } catch (Exception ignored) { diff --git a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/enums/DesensitizeRuleEnum.java b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/enums/DesensitizeRuleEnum.java index 42792de..6263761 100755 --- a/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/enums/DesensitizeRuleEnum.java +++ b/coder-common-thin-plugins/coder-common-thin-desensitize/src/main/java/org/leocoder/thin/desensitize/enums/DesensitizeRuleEnum.java @@ -1,4 +1,4 @@ -package org.leocoder.desensitize.enums; +package org.leocoder.thin.desensitize.enums; import lombok.AllArgsConstructor; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/pom.xml b/coder-common-thin-plugins/coder-common-thin-easyexcel/pom.xml index fb42085..0c8e856 100644 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/pom.xml +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/pom.xml @@ -6,15 +6,30 @@ org.leocoder.thin coder-common-thin-plugins - 1.0.0 + ${revision} + + coder-common-thin-easyexcel coder-common-thin-easyexcel + EasyExcel导入导出插件 - - 17 - 17 - UTF-8 - - + + + + org.leocoder.thin + coder-common-thin-common + ${revision} + + + + com.alibaba + easyexcel + + + + org.springframework.boot + spring-boot-starter-aop + + \ No newline at end of file diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/anno/EnableCoderEasyExcel.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/anno/EnableCoderEasyExcel.java index 5685404..3c3ac36 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/anno/EnableCoderEasyExcel.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/anno/EnableCoderEasyExcel.java @@ -1,8 +1,8 @@ -package org.leocoder.easyexcel.anno; +package org.leocoder.thin.easyexcel.anno; -import org.leocoder.easyexcel.bigdata.BigDataEasyExcelUtil; -import org.leocoder.easyexcel.column.ColumnExcelUtil; -import org.leocoder.easyexcel.core.utils.EasyExcelUtil; +import org.leocoder.thin.easyexcel.bigdata.BigDataEasyExcelUtil; +import org.leocoder.thin.easyexcel.column.ColumnExcelUtil; +import org.leocoder.thin.easyexcel.core.utils.EasyExcelUtil; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/BigDataEasyExcelUtil.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/BigDataEasyExcelUtil.java index 4c11be1..0dd34b0 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/BigDataEasyExcelUtil.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/BigDataEasyExcelUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.bigdata; +package org.leocoder.thin.easyexcel.bigdata; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/SplitList.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/SplitList.java index c6d742a..0687dd3 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/SplitList.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/bigdata/SplitList.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.bigdata; +package org.leocoder.thin.easyexcel.bigdata; import java.util.ArrayList; import java.util.Arrays; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/ColumnExcelUtil.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/ColumnExcelUtil.java index e144a85..776d15d 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/ColumnExcelUtil.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/ColumnExcelUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.column; +package org.leocoder.thin.easyexcel.column; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomColumnWidthHandler.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomColumnWidthHandler.java index 91aeca9..81d8f08 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomColumnWidthHandler.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomColumnWidthHandler.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.column; +package org.leocoder.thin.easyexcel.column; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.Head; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomStyle.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomStyle.java index 74ad9ed..a6b1a26 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomStyle.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/column/CustomStyle.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.column; +package org.leocoder.thin.easyexcel.column; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.WriteCellData; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/enums/ExcelTemplateEnum.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/enums/ExcelTemplateEnum.java index 71f808b..27a24c6 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/enums/ExcelTemplateEnum.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/enums/ExcelTemplateEnum.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.core.enums; +package org.leocoder.thin.easyexcel.core.enums; import lombok.Getter; diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/listener/UploadDataListener.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/listener/UploadDataListener.java index f6d7695..1d2cee8 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/listener/UploadDataListener.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/listener/UploadDataListener.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.core.listener; +package org.leocoder.thin.easyexcel.core.listener; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; @@ -48,6 +48,5 @@ public class UploadDataListener extends AnalysisEventListener { if (exception instanceof ExcelDataConvertException excelDataConvertException) { throw new RuntimeException("第" + excelDataConvertException.getRowIndex() + "行" + excelDataConvertException.getColumnIndex() + "列" + "数据解析异常"); } - // 其他异常... } } diff --git a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/utils/EasyExcelUtil.java b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/utils/EasyExcelUtil.java index cf45a1c..d58ac1c 100755 --- a/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/utils/EasyExcelUtil.java +++ b/coder-common-thin-plugins/coder-common-thin-easyexcel/src/main/java/org/leocoder/thin/easyexcel/core/utils/EasyExcelUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.easyexcel.core.utils; +package org.leocoder.thin.easyexcel.core.utils; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcelFactory; @@ -9,8 +9,8 @@ import com.alibaba.excel.write.metadata.fill.FillConfig; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.leocoder.easyexcel.core.enums.ExcelTemplateEnum; -import org.leocoder.easyexcel.core.listener.UploadDataListener; +import org.leocoder.thin.easyexcel.core.enums.ExcelTemplateEnum; +import org.leocoder.thin.easyexcel.core.listener.UploadDataListener; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; diff --git a/coder-common-thin-plugins/coder-common-thin-limit/pom.xml b/coder-common-thin-plugins/coder-common-thin-limit/pom.xml index fcfb7ac..0eb778e 100644 --- a/coder-common-thin-plugins/coder-common-thin-limit/pom.xml +++ b/coder-common-thin-plugins/coder-common-thin-limit/pom.xml @@ -6,15 +6,27 @@ org.leocoder.thin coder-common-thin-plugins - 1.0.0 + ${revision} - coder-common-thin-limit - - 17 - 17 - UTF-8 - + coder-common-thin-limit + coder-common-thin-limit + 限流插件 + + + + + org.leocoder.thin + coder-common-thin-common + ${revision} + + + + org.springframework.boot + spring-boot-starter-aop + + + \ No newline at end of file diff --git a/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/anno/EnableCoderLimit.java b/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/anno/EnableCoderLimit.java index 4220e86..7d110de 100755 --- a/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/anno/EnableCoderLimit.java +++ b/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/anno/EnableCoderLimit.java @@ -1,6 +1,6 @@ -package org.leocoder.limit.anno; +package org.leocoder.thin.limit.anno; -import org.leocoder.limit.config.CoderRedisLimitUtil; +import org.leocoder.thin.limit.config.CoderRedisLimitUtil; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/aspect/CoderLimitAspect.java b/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/aspect/CoderLimitAspect.java index fb5b0ed..7c26bf0 100755 --- a/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/aspect/CoderLimitAspect.java +++ b/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/aspect/CoderLimitAspect.java @@ -1,4 +1,4 @@ -package org.leocoder.limit.aspect; +package org.leocoder.thin.limit.aspect; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -6,11 +6,11 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; -import org.leocoder.common.anno.CoderLimit; -import org.leocoder.common.enmus.limit.LimitType; -import org.leocoder.common.exception.coder.ParamsException; -import org.leocoder.common.utils.ip.IpUtil; -import org.leocoder.limit.config.CoderRedisLimitUtil; +import org.leocoder.thin.common.anno.CoderLimit; +import org.leocoder.thin.common.enmus.limit.LimitType; +import org.leocoder.thin.common.exception.coder.ParamsException; +import org.leocoder.thin.common.utils.ip.IpUtil; +import org.leocoder.thin.limit.config.CoderRedisLimitUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; diff --git a/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/config/CoderRedisLimitUtil.java b/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/config/CoderRedisLimitUtil.java index 3613493..b0ad662 100755 --- a/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/config/CoderRedisLimitUtil.java +++ b/coder-common-thin-plugins/coder-common-thin-limit/src/main/java/org/leocoder/thin/limit/config/CoderRedisLimitUtil.java @@ -1,4 +1,4 @@ -package org.leocoder.limit.config; +package org.leocoder.thin.limit.config; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/coder-common-thin-plugins/coder-common-thin-repect/pom.xml b/coder-common-thin-plugins/coder-common-thin-repect/pom.xml index 332929a..812c33b 100644 --- a/coder-common-thin-plugins/coder-common-thin-repect/pom.xml +++ b/coder-common-thin-plugins/coder-common-thin-repect/pom.xml @@ -6,15 +6,25 @@ org.leocoder.thin coder-common-thin-plugins - 1.0.0 + ${revision} + + coder-common-thin-repect coder-common-thin-repect + 防重复提交插件 - - 17 - 17 - UTF-8 - - + + + + org.leocoder.thin + coder-common-thin-common + ${revision} + + + + org.springframework.boot + spring-boot-starter-aop + + \ No newline at end of file diff --git a/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/anno/EnableCoderRepeatSubmit.java b/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/anno/EnableCoderRepeatSubmit.java index 0ca8901..511d05e 100755 --- a/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/anno/EnableCoderRepeatSubmit.java +++ b/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/anno/EnableCoderRepeatSubmit.java @@ -1,7 +1,7 @@ -package org.leocoder.repect.anno; +package org.leocoder.thin.repect.anno; -import org.leocoder.repect.aspect.RedisService; -import org.leocoder.repect.aspect.RepeatSubmitAspect; +import org.leocoder.thin.repect.aspect.RedisService; +import org.leocoder.thin.repect.aspect.RepeatSubmitAspect; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RedisService.java b/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RedisService.java index 3a2d18a..b4c959a 100755 --- a/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RedisService.java +++ b/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RedisService.java @@ -1,6 +1,6 @@ -package org.leocoder.repect.aspect; +package org.leocoder.thin.repect.aspect; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.*; import org.springframework.stereotype.Component; @@ -12,10 +12,10 @@ import java.util.concurrent.TimeUnit; * @description [RedisService] */ @Component +@RequiredArgsConstructor public class RedisService { - @Autowired - public RedisTemplate redisTemplate; + public final RedisTemplate redisTemplate; /** * @param key 缓存的键值 diff --git a/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RepeatSubmitAspect.java b/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RepeatSubmitAspect.java index e899001..7d1b379 100755 --- a/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RepeatSubmitAspect.java +++ b/coder-common-thin-plugins/coder-common-thin-repect/src/main/java/org/leocoder/thin/repect/aspect/RepeatSubmitAspect.java @@ -1,4 +1,4 @@ -package org.leocoder.repect.aspect; +package org.leocoder.thin.repect.aspect; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -7,10 +7,10 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; -import org.leocoder.common.anno.CoderRepeatSubmit; -import org.leocoder.common.constants.CoderCacheConstants; -import org.leocoder.common.exception.RepeatSubmitException; -import org.leocoder.common.utils.ip.IpUtil; +import org.leocoder.thin.common.anno.CoderRepeatSubmit; +import org.leocoder.thin.common.constants.CoderCacheConstants; +import org.leocoder.thin.common.exception.RepeatSubmitException; +import org.leocoder.thin.common.utils.ip.IpUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.annotation.Order;