diff --git a/README.md b/README.md index abd474c4..8ab57135 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ ContiNew Starter 就是将脚手架项目中的通用基础配置进行了封装 ```xml - top.charles7c.continew + top.continew continew-starter {latest-version} @@ -96,7 +96,7 @@ ContiNew Starter 就是将脚手架项目中的通用基础配置进行了封装 - top.charles7c.continew + top.continew continew-starter-dependencies {latest-version} pom @@ -112,7 +112,7 @@ ContiNew Starter 就是将脚手架项目中的通用基础配置进行了封装 - top.charles7c.continew + top.continew continew-starter-web diff --git a/continew-starter-api-doc/pom.xml b/continew-starter-api-doc/pom.xml index b104a89f..adf812cd 100644 --- a/continew-starter-api-doc/pom.xml +++ b/continew-starter-api-doc/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java similarity index 95% rename from continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java rename to continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java index 37bcb240..ff6477c9 100644 --- a/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java +++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.apidoc.autoconfigure; +package top.continew.starter.apidoc.autoconfigure; import cn.hutool.core.map.MapUtil; import io.swagger.v3.oas.models.Components; @@ -38,9 +38,9 @@ import org.springframework.http.CacheControl; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; +import top.continew.starter.core.autoconfigure.project.ProjectProperties; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.util.GeneralPropertySourceFactory; import java.util.List; import java.util.Map; diff --git a/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java similarity index 90% rename from continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java rename to continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java index cf555b1c..89947f74 100644 --- a/continew-starter-api-doc/src/main/java/top/charles7c/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java +++ b/continew-starter-api-doc/src/main/java/top/continew/starter/apidoc/autoconfigure/SpringDocExtensionProperties.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.starter.apidoc.autoconfigure; +package top.continew.starter.apidoc.autoconfigure; import io.swagger.v3.oas.models.Components; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; /** * API 文档扩展配置属性 diff --git a/continew-starter-api-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-api-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4af5adbf..0a7a8b93 100644 --- a/continew-starter-api-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-api-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.apidoc.autoconfigure.SpringDocAutoConfiguration \ No newline at end of file +top.continew.starter.apidoc.autoconfigure.SpringDocAutoConfiguration \ No newline at end of file diff --git a/continew-starter-auth/continew-starter-auth-justauth/pom.xml b/continew-starter-auth/continew-starter-auth-justauth/pom.xml index 647fd7bc..3928cc06 100644 --- a/continew-starter-auth/continew-starter-auth-justauth/pom.xml +++ b/continew-starter-auth/continew-starter-auth-justauth/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-auth ${revision} @@ -26,7 +26,7 @@ - top.charles7c.continew + top.continew continew-starter-cache-redisson true diff --git a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/charles7c/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java similarity index 90% rename from continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/charles7c/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java rename to continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java index 6d9e3807..24101077 100644 --- a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/charles7c/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java +++ b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/autoconfigure/JustAuthAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.justauth.autoconfigure; +package top.continew.starter.auth.justauth.autoconfigure; import jakarta.annotation.PostConstruct; import me.zhyd.oauth.cache.AuthStateCache; @@ -25,8 +25,8 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; -import top.charles7c.continew.starter.auth.justauth.core.JustAuthStateCacheRedisImpl; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.auth.justauth.core.JustAuthStateCacheRedisImpl; +import top.continew.starter.core.constant.PropertiesConstants; /** * JustAuth 自动配置 diff --git a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/charles7c/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java similarity index 94% rename from continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/charles7c/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java rename to continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java index 1c9258d8..bda93263 100644 --- a/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/charles7c/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java +++ b/continew-starter-auth/continew-starter-auth-justauth/src/main/java/top/continew/starter/auth/justauth/core/JustAuthStateCacheRedisImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.justauth.core; +package top.continew.starter.auth.justauth.core; import me.zhyd.oauth.cache.AuthStateCache; -import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.cache.redisson.util.RedisUtils; import java.time.Duration; diff --git a/continew-starter-auth/continew-starter-auth-justauth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-auth/continew-starter-auth-justauth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index bbd7cc4f..48a9ed1d 100644 --- a/continew-starter-auth/continew-starter-auth-justauth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-auth/continew-starter-auth-justauth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -top.charles7c.continew.starter.auth.justauth.autoconfigure.JustAuthAutoConfiguration +top.continew.starter.auth.justauth.autoconfigure.JustAuthAutoConfiguration com.xkcoding.justauth.autoconfigure.JustAuthAutoConfiguration \ No newline at end of file diff --git a/continew-starter-auth/continew-starter-auth-satoken/pom.xml b/continew-starter-auth/continew-starter-auth-satoken/pom.xml index ddcca0fc..e1627150 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/pom.xml +++ b/continew-starter-auth/continew-starter-auth-satoken/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-auth ${revision} @@ -27,14 +27,14 @@ - top.charles7c.continew + top.continew continew-starter-cache-redisson true - top.charles7c.continew + top.continew continew-starter-web diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java similarity index 88% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java index 648a9569..aae34dca 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.autoconfigure; +package top.continew.starter.auth.satoken.autoconfigure; import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; @@ -32,10 +32,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.*; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import top.charles7c.continew.starter.auth.satoken.autoconfigure.dao.SaTokenDaoConfiguration; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; +import top.continew.starter.auth.satoken.autoconfigure.dao.SaTokenDaoConfiguration; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.GeneralPropertySourceFactory; /** * Sa-Token 自动配置 @@ -44,7 +44,7 @@ import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; * @since 1.0.0 */ @AutoConfiguration -@ComponentScan("top.charles7c.continew.starter.auth.satoken.exception") +@ComponentScan("top.continew.starter.auth.satoken.exception") @EnableConfigurationProperties(SaTokenExtensionProperties.class) @ConditionalOnProperty(prefix = "sa-token.extension", name = PropertiesConstants.ENABLED, havingValue = "true") @PropertySource(value = "classpath:default-auth-satoken.yml", factory = GeneralPropertySourceFactory.class) diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java similarity index 92% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java index a92626d5..dcda9a81 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenExtensionProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.autoconfigure; +package top.continew.starter.auth.satoken.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import top.charles7c.continew.starter.auth.satoken.autoconfigure.dao.SaTokenDaoProperties; +import top.continew.starter.auth.satoken.autoconfigure.dao.SaTokenDaoProperties; /** * SaToken 扩展配置属性 diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenSecurityProperties.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenSecurityProperties.java similarity index 93% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenSecurityProperties.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenSecurityProperties.java index 07db9dbc..06ea17b7 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/SaTokenSecurityProperties.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/SaTokenSecurityProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.autoconfigure; +package top.continew.starter.auth.satoken.autoconfigure; /** * SaToken 安全配置属性 diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java similarity index 95% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java index 6431caac..78f04b13 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.autoconfigure.dao; +package top.continew.starter.auth.satoken.autoconfigure.dao; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.dao.SaTokenDaoDefaultImpl; @@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.core.ResolvableType; -import top.charles7c.continew.starter.cache.redisson.autoconfigure.RedissonAutoConfiguration; +import top.continew.starter.cache.redisson.autoconfigure.RedissonAutoConfiguration; /** * SaToken 持久层配置 diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoProperties.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoProperties.java similarity index 87% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoProperties.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoProperties.java index 8fb996c2..b94bf695 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoProperties.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.autoconfigure.dao; +package top.continew.starter.auth.satoken.autoconfigure.dao; -import top.charles7c.continew.starter.auth.satoken.enums.SaTokenDaoType; +import top.continew.starter.auth.satoken.enums.SaTokenDaoType; /** * SaToken 持久层配置属性 diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java similarity index 96% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java index 9838583b..26d3a511 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/autoconfigure/dao/SaTokenDaoRedisImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.autoconfigure.dao; +package top.continew.starter.auth.satoken.autoconfigure.dao; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; -import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.cache.redisson.util.RedisUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/enums/SaTokenDaoType.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/enums/SaTokenDaoType.java similarity index 93% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/enums/SaTokenDaoType.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/enums/SaTokenDaoType.java index 81ae25d8..76f202df 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/enums/SaTokenDaoType.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/enums/SaTokenDaoType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.enums; +package top.continew.starter.auth.satoken.enums; /** * SaToken 持久层类型枚举 diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/exception/GlobalSaTokenExceptionHandler.java b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/exception/GlobalSaTokenExceptionHandler.java similarity index 96% rename from continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/exception/GlobalSaTokenExceptionHandler.java rename to continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/exception/GlobalSaTokenExceptionHandler.java index 9fd73e74..00eb22b9 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/charles7c/continew/starter/auth/satoken/exception/GlobalSaTokenExceptionHandler.java +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/java/top/continew/starter/auth/satoken/exception/GlobalSaTokenExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.auth.satoken.exception; +package top.continew.starter.auth.satoken.exception; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.web.model.R; /** * 全局 SaToken 异常处理器 diff --git a/continew-starter-auth/continew-starter-auth-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-auth/continew-starter-auth-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 667befd1..a9d58d95 100644 --- a/continew-starter-auth/continew-starter-auth-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-auth/continew-starter-auth-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.auth.satoken.autoconfigure.SaTokenAutoConfiguration \ No newline at end of file +top.continew.starter.auth.satoken.autoconfigure.SaTokenAutoConfiguration \ No newline at end of file diff --git a/continew-starter-auth/pom.xml b/continew-starter-auth/pom.xml index 165d749f..0593fff1 100644 --- a/continew-starter-auth/pom.xml +++ b/continew-starter-auth/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-cache/continew-starter-cache-jetcache/pom.xml b/continew-starter-cache/continew-starter-cache-jetcache/pom.xml index d05d8b7f..8f638da0 100644 --- a/continew-starter-cache/continew-starter-cache-jetcache/pom.xml +++ b/continew-starter-cache/continew-starter-cache-jetcache/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-cache ${revision} @@ -38,7 +38,7 @@ - top.charles7c.continew + top.continew continew-starter-cache-redisson diff --git a/continew-starter-cache/continew-starter-cache-jetcache/src/main/java/top/charles7c/continew/starter/cache/jetcache/autoconfigure/JetCacheAutoConfiguration.java b/continew-starter-cache/continew-starter-cache-jetcache/src/main/java/top/continew/starter/cache/jetcache/autoconfigure/JetCacheAutoConfiguration.java similarity index 91% rename from continew-starter-cache/continew-starter-cache-jetcache/src/main/java/top/charles7c/continew/starter/cache/jetcache/autoconfigure/JetCacheAutoConfiguration.java rename to continew-starter-cache/continew-starter-cache-jetcache/src/main/java/top/continew/starter/cache/jetcache/autoconfigure/JetCacheAutoConfiguration.java index 6d57acea..f4b4a862 100644 --- a/continew-starter-cache/continew-starter-cache-jetcache/src/main/java/top/charles7c/continew/starter/cache/jetcache/autoconfigure/JetCacheAutoConfiguration.java +++ b/continew-starter-cache/continew-starter-cache-jetcache/src/main/java/top/continew/starter/cache/jetcache/autoconfigure/JetCacheAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.cache.jetcache.autoconfigure; +package top.continew.starter.cache.jetcache.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; -import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; +import top.continew.starter.core.util.GeneralPropertySourceFactory; /** * JetCache 自动配置 diff --git a/continew-starter-cache/continew-starter-cache-jetcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-cache/continew-starter-cache-jetcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 7cb5d93b..a21332a5 100644 --- a/continew-starter-cache/continew-starter-cache-jetcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-cache/continew-starter-cache-jetcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.cache.jetcache.autoconfigure.JetCacheAutoConfiguration \ No newline at end of file +top.continew.starter.cache.jetcache.autoconfigure.JetCacheAutoConfiguration \ No newline at end of file diff --git a/continew-starter-cache/continew-starter-cache-redisson/pom.xml b/continew-starter-cache/continew-starter-cache-redisson/pom.xml index deb3109b..17e45a49 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/pom.xml +++ b/continew-starter-cache/continew-starter-cache-redisson/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-cache ${revision} diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java similarity index 97% rename from continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java rename to continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java index cf5867cc..5a16d472 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java +++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.cache.redisson.autoconfigure; +package top.continew.starter.cache.redisson.autoconfigure; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -33,8 +33,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.List; diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonProperties.java b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonProperties.java similarity index 97% rename from continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonProperties.java rename to continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonProperties.java index 2e8cc234..421c6f19 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/autoconfigure/RedissonProperties.java +++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/autoconfigure/RedissonProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.cache.redisson.autoconfigure; +package top.continew.starter.cache.redisson.autoconfigure; import org.redisson.config.ClusterServersConfig; import org.redisson.config.SentinelServersConfig; diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/util/RedisUtils.java b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java similarity index 97% rename from continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/util/RedisUtils.java rename to continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java index bbefe673..d367bc30 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/charles7c/continew/starter/cache/redisson/util/RedisUtils.java +++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.cache.redisson.util; +package top.continew.starter.cache.redisson.util; import cn.hutool.extra.spring.SpringUtil; import org.redisson.api.*; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.time.Duration; import java.util.Collection; diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-cache/continew-starter-cache-redisson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2937003e..d0e9b97b 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.cache.redisson.autoconfigure.RedissonAutoConfiguration \ No newline at end of file +top.continew.starter.cache.redisson.autoconfigure.RedissonAutoConfiguration \ No newline at end of file diff --git a/continew-starter-cache/continew-starter-cache-springcache/pom.xml b/continew-starter-cache/continew-starter-cache-springcache/pom.xml index 959d883d..b20ee0a9 100644 --- a/continew-starter-cache/continew-starter-cache-springcache/pom.xml +++ b/continew-starter-cache/continew-starter-cache-springcache/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-cache ${revision} @@ -15,7 +15,7 @@ - top.charles7c.continew + top.continew continew-starter-cache-redisson diff --git a/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/charles7c/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java b/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java similarity index 96% rename from continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/charles7c/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java rename to continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java index fd0b5ad4..0b324eca 100644 --- a/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/charles7c/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java +++ b/continew-starter-cache/continew-starter-cache-springcache/src/main/java/top/continew/starter/cache/springcache/autoconfigure/SpringCacheAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.cache.springcache.autoconfigure; +package top.continew.starter.cache.springcache.autoconfigure; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -35,7 +35,7 @@ import org.springframework.data.redis.cache.RedisCacheConfiguration; import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.StringRedisSerializer; -import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; +import top.continew.starter.core.util.GeneralPropertySourceFactory; import java.util.Map; diff --git a/continew-starter-cache/continew-starter-cache-springcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-cache/continew-starter-cache-springcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5f3d0c7f..4b212b52 100644 --- a/continew-starter-cache/continew-starter-cache-springcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-cache/continew-starter-cache-springcache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.cache.springcache.autoconfigure.SpringCacheAutoConfiguration \ No newline at end of file +top.continew.starter.cache.springcache.autoconfigure.SpringCacheAutoConfiguration \ No newline at end of file diff --git a/continew-starter-cache/pom.xml b/continew-starter-cache/pom.xml index f1fecf7f..39a65682 100644 --- a/continew-starter-cache/pom.xml +++ b/continew-starter-cache/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -22,7 +22,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml b/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml index fc317861..f52e305f 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml +++ b/continew-starter-captcha/continew-starter-captcha-behavior/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-captcha ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-starter-cache-redisson diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java similarity index 96% rename from continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java rename to continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java index ef7201f6..04cfc995 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java +++ b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.behavior.autoconfigure; +package top.continew.starter.captcha.behavior.autoconfigure; import cn.hutool.core.codec.Base64; import cn.hutool.core.io.FileUtil; @@ -36,8 +36,8 @@ import org.springframework.context.annotation.Import; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; -import top.charles7c.continew.starter.captcha.behavior.autoconfigure.cache.BehaviorCaptchaCacheConfiguration; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.captcha.behavior.autoconfigure.cache.BehaviorCaptchaCacheConfiguration; +import top.continew.starter.core.constant.PropertiesConstants; import java.util.HashMap; import java.util.Map; diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaProperties.java b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaProperties.java similarity index 97% rename from continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaProperties.java rename to continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaProperties.java index 6fda28f9..cbac1c19 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaProperties.java +++ b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/BehaviorCaptchaProperties.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.behavior.autoconfigure; +package top.continew.starter.captcha.behavior.autoconfigure; import com.anji.captcha.model.common.CaptchaTypeEnum; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.captcha.behavior.enums.StorageType; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.captcha.behavior.enums.StorageType; +import top.continew.starter.core.constant.PropertiesConstants; import java.awt.*; diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheConfiguration.java b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheConfiguration.java similarity index 92% rename from continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheConfiguration.java rename to continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheConfiguration.java index 8d6e4a6c..2843c849 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheConfiguration.java +++ b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.behavior.autoconfigure.cache; +package top.continew.starter.captcha.behavior.autoconfigure.cache; import cn.hutool.extra.spring.SpringUtil; import com.anji.captcha.service.CaptchaCacheService; @@ -31,9 +31,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.core.ResolvableType; -import top.charles7c.continew.starter.cache.redisson.autoconfigure.RedissonAutoConfiguration; -import top.charles7c.continew.starter.captcha.behavior.enums.StorageType; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.cache.redisson.autoconfigure.RedissonAutoConfiguration; +import top.continew.starter.captcha.behavior.enums.StorageType; +import top.continew.starter.core.constant.PropertiesConstants; /** * 行为验证码缓存配置 diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheServiceImpl.java b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheServiceImpl.java similarity index 86% rename from continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheServiceImpl.java rename to continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheServiceImpl.java index dfd48971..cecacef3 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheServiceImpl.java +++ b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/autoconfigure/cache/BehaviorCaptchaCacheServiceImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.behavior.autoconfigure.cache; +package top.continew.starter.captcha.behavior.autoconfigure.cache; import com.anji.captcha.service.CaptchaCacheService; -import top.charles7c.continew.starter.cache.redisson.util.RedisUtils; -import top.charles7c.continew.starter.captcha.behavior.enums.StorageType; +import top.continew.starter.cache.redisson.util.RedisUtils; +import top.continew.starter.captcha.behavior.enums.StorageType; import java.time.Duration; diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/enums/StorageType.java b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/enums/StorageType.java similarity index 93% rename from continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/enums/StorageType.java rename to continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/enums/StorageType.java index a85c88d3..084c2582 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/charles7c/continew/starter/captcha/behavior/enums/StorageType.java +++ b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/java/top/continew/starter/captcha/behavior/enums/StorageType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.behavior.enums; +package top.continew.starter.captcha.behavior.enums; /** * 缓存类型枚举 diff --git a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 64298ebd..f629ac78 100644 --- a/continew-starter-captcha/continew-starter-captcha-behavior/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-captcha/continew-starter-captcha-behavior/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.captcha.behavior.autoconfigure.BehaviorCaptchaAutoConfiguration \ No newline at end of file +top.continew.starter.captcha.behavior.autoconfigure.BehaviorCaptchaAutoConfiguration \ No newline at end of file diff --git a/continew-starter-captcha/continew-starter-captcha-graphic/pom.xml b/continew-starter-captcha/continew-starter-captcha-graphic/pom.xml index 012ba828..c0534384 100644 --- a/continew-starter-captcha/continew-starter-captcha-graphic/pom.xml +++ b/continew-starter-captcha/continew-starter-captcha-graphic/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-captcha ${revision} diff --git a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java similarity index 89% rename from continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java rename to continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java index f6af7615..24ab4e73 100644 --- a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java +++ b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.graphic.autoconfigure; +package top.continew.starter.captcha.graphic.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -24,8 +24,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import top.charles7c.continew.starter.captcha.graphic.core.GraphicCaptchaService; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.captcha.graphic.core.GraphicCaptchaService; +import top.continew.starter.core.constant.PropertiesConstants; /** * 图形验证码自动配置 diff --git a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaProperties.java b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaProperties.java similarity index 91% rename from continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaProperties.java rename to continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaProperties.java index 812771cb..1f9b76f2 100644 --- a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaProperties.java +++ b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/autoconfigure/GraphicCaptchaProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.graphic.autoconfigure; +package top.continew.starter.captcha.graphic.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.captcha.graphic.enums.GraphicCaptchaType; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.captcha.graphic.enums.GraphicCaptchaType; +import top.continew.starter.core.constant.PropertiesConstants; /** * 图形验证码配置属性 diff --git a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/core/GraphicCaptchaService.java b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/core/GraphicCaptchaService.java similarity index 91% rename from continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/core/GraphicCaptchaService.java rename to continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/core/GraphicCaptchaService.java index 7aae8351..e914f0e1 100644 --- a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/core/GraphicCaptchaService.java +++ b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/core/GraphicCaptchaService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.graphic.core; +package top.continew.starter.captcha.graphic.core; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.text.CharSequenceUtil; import com.wf.captcha.base.Captcha; -import top.charles7c.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaProperties; +import top.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaProperties; import java.awt.*; diff --git a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/enums/GraphicCaptchaType.java b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/enums/GraphicCaptchaType.java similarity index 95% rename from continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/enums/GraphicCaptchaType.java rename to continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/enums/GraphicCaptchaType.java index 54565e6b..402ceb2b 100644 --- a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/charles7c/continew/starter/captcha/graphic/enums/GraphicCaptchaType.java +++ b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/java/top/continew/starter/captcha/graphic/enums/GraphicCaptchaType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.captcha.graphic.enums; +package top.continew.starter.captcha.graphic.enums; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; diff --git a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 32a02773..3bd29a1b 100644 --- a/continew-starter-captcha/continew-starter-captcha-graphic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-captcha/continew-starter-captcha-graphic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaAutoConfiguration \ No newline at end of file +top.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaAutoConfiguration \ No newline at end of file diff --git a/continew-starter-captcha/pom.xml b/continew-starter-captcha/pom.xml index a9d95227..9a33074f 100644 --- a/continew-starter-captcha/pom.xml +++ b/continew-starter-captcha/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-core/pom.xml b/continew-starter-core/pom.xml index ebe827b4..1db90fbc 100644 --- a/continew-starter-core/pom.xml +++ b/continew-starter-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java similarity index 94% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java rename to continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java index 7f6b57be..f1f9023f 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.autoconfigure.project; +package top.continew.starter.core.autoconfigure.project; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectProperties.java b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectProperties.java similarity index 98% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectProperties.java rename to continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectProperties.java index 64bd6db4..00607b18 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/project/ProjectProperties.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/project/ProjectProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.autoconfigure.project; +package top.continew.starter.core.autoconfigure.project; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java similarity index 93% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java rename to continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java index 59950126..815828f6 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/AsyncAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.autoconfigure.threadpool; +package top.continew.starter.core.autoconfigure.threadpool; import cn.hutool.core.util.ArrayUtil; import org.slf4j.Logger; @@ -25,8 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.exception.BaseException; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.exception.BaseException; import java.util.Arrays; import java.util.concurrent.Executor; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java similarity index 95% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java rename to continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java index 7cb1f23a..606143ca 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.autoconfigure.threadpool; +package top.continew.starter.core.autoconfigure.threadpool; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; @@ -27,8 +27,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.util.ExceptionUtils; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.util.ExceptionUtils; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java similarity index 94% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java rename to continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java index 5ef16ed4..fc36b055 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/autoconfigure/threadpool/ThreadPoolProperties.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.autoconfigure.threadpool; +package top.continew.starter.core.autoconfigure.threadpool; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; /** * 线程池配置属性 diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/PropertiesConstants.java b/continew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java similarity index 98% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/PropertiesConstants.java rename to continew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java index a8c1d675..2935fc99 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/PropertiesConstants.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/constant/PropertiesConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.constant; +package top.continew.starter.core.constant; /** * 配置属性相关常量 diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConstants.java b/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java similarity index 99% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConstants.java rename to continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java index 4e3828b0..df63320c 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/constant/StringConstants.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/constant/StringConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.constant; +package top.continew.starter.core.constant; import cn.hutool.core.text.CharPool; import cn.hutool.core.text.StrPool; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BadRequestException.java b/continew-starter-core/src/main/java/top/continew/starter/core/exception/BadRequestException.java similarity index 95% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BadRequestException.java rename to continew-starter-core/src/main/java/top/continew/starter/core/exception/BadRequestException.java index 280e5f0b..1d862f21 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BadRequestException.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/exception/BadRequestException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.exception; +package top.continew.starter.core.exception; import java.io.Serial; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BaseException.java b/continew-starter-core/src/main/java/top/continew/starter/core/exception/BaseException.java similarity index 95% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BaseException.java rename to continew-starter-core/src/main/java/top/continew/starter/core/exception/BaseException.java index efd069e1..420097a2 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BaseException.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/exception/BaseException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.exception; +package top.continew.starter.core.exception; import java.io.Serial; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BusinessException.java b/continew-starter-core/src/main/java/top/continew/starter/core/exception/BusinessException.java similarity index 95% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BusinessException.java rename to continew-starter-core/src/main/java/top/continew/starter/core/exception/BusinessException.java index 73f6b1f5..9d56f684 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/exception/BusinessException.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/exception/BusinessException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.exception; +package top.continew.starter.core.exception; import java.io.Serial; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ClassUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/ClassUtils.java similarity index 96% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ClassUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/ClassUtils.java index 58b80e0b..e48185c6 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ClassUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/ClassUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util; +package top.continew.starter.core.util; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.TypeUtil; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ExceptionUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/ExceptionUtils.java similarity index 97% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ExceptionUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/ExceptionUtils.java index 1ba31b70..0414baaa 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ExceptionUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/ExceptionUtils.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util; +package top.continew.starter.core.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/GeneralPropertySourceFactory.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/GeneralPropertySourceFactory.java similarity index 97% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/GeneralPropertySourceFactory.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/GeneralPropertySourceFactory.java index 1cbb2ebb..14a1317e 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/GeneralPropertySourceFactory.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/GeneralPropertySourceFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util; +package top.continew.starter.core.util; import cn.hutool.core.text.CharSequenceUtil; import org.springframework.boot.env.YamlPropertySourceLoader; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java similarity index 94% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java index d9ce8e80..f9c264d3 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/IpUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util; +package top.continew.starter.core.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.net.NetUtil; @@ -23,7 +23,7 @@ import cn.hutool.extra.spring.SpringUtil; import cn.hutool.http.HtmlUtil; import net.dreamlu.mica.ip2region.core.Ip2regionSearcher; import net.dreamlu.mica.ip2region.core.IpInfo; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.Set; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ReflectUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/ReflectUtils.java similarity index 97% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ReflectUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/ReflectUtils.java index a5c9863f..c852bca3 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/ReflectUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/ReflectUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util; +package top.continew.starter.core.util; import cn.hutool.core.util.ReflectUtil; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/TemplateUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/TemplateUtils.java similarity index 97% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/TemplateUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/TemplateUtils.java index d2bb2d23..ebf876ca 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/TemplateUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/TemplateUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util; +package top.continew.starter.core.util; import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/URLUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/URLUtils.java similarity index 95% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/URLUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/URLUtils.java index 051aa0e2..d6a87979 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/URLUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/URLUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util; +package top.continew.starter.core.util; import cn.hutool.http.HttpUtil; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/CheckUtils.java similarity index 97% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/validate/CheckUtils.java index ce1f5b41..3883617d 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/CheckUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/CheckUtils.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util.validate; +package top.continew.starter.core.util.validate; import cn.hutool.core.text.CharSequenceUtil; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.exception.BusinessException; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.exception.BusinessException; import java.util.function.BooleanSupplier; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/ValidationUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/ValidationUtils.java similarity index 98% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/ValidationUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/validate/ValidationUtils.java index 2ec3a85d..8518e2f2 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/ValidationUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/ValidationUtils.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util.validate; +package top.continew.starter.core.util.validate; import cn.hutool.core.text.CharSequenceUtil; -import top.charles7c.continew.starter.core.exception.BadRequestException; +import top.continew.starter.core.exception.BadRequestException; import java.util.function.BooleanSupplier; diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/Validator.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/Validator.java similarity index 99% rename from continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/Validator.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/validate/Validator.java index 45aa235b..9fe230f5 100644 --- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/validate/Validator.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/validate/Validator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.core.util.validate; +package top.continew.starter.core.util.validate; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; diff --git a/continew-starter-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index c64a3c92..73f7d823 100644 --- a/continew-starter-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -top.charles7c.continew.starter.core.autoconfigure.project.ProjectAutoConfiguration -top.charles7c.continew.starter.core.autoconfigure.threadpool.ThreadPoolAutoConfiguration -top.charles7c.continew.starter.core.autoconfigure.threadpool.AsyncAutoConfiguration \ No newline at end of file +top.continew.starter.core.autoconfigure.project.ProjectAutoConfiguration +top.continew.starter.core.autoconfigure.threadpool.ThreadPoolAutoConfiguration +top.continew.starter.core.autoconfigure.threadpool.AsyncAutoConfiguration \ No newline at end of file diff --git a/continew-starter-data/continew-starter-data-core/pom.xml b/continew-starter-data/continew-starter-data-core/pom.xml index 78cce692..e48c7e15 100644 --- a/continew-starter-data/continew-starter-data-core/pom.xml +++ b/continew-starter-data/continew-starter-data-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-data ${revision} diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/Query.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/Query.java similarity index 91% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/Query.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/Query.java index b1900017..97f5dd83 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/Query.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/Query.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.core.annotation; +package top.continew.starter.data.core.annotation; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.data.core.enums.QueryType; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/QueryIgnore.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java similarity index 94% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/QueryIgnore.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java index 29da4096..12ed7f21 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/annotation/QueryIgnore.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/annotation/QueryIgnore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.core.annotation; +package top.continew.starter.data.core.annotation; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/DatabaseType.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java similarity index 93% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/DatabaseType.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java index 993cc94f..3c8100f1 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/DatabaseType.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.core.enums; +package top.continew.starter.data.core.enums; -import top.charles7c.continew.starter.data.core.function.ISqlFunction; +import top.continew.starter.data.core.function.ISqlFunction; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/QueryType.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/QueryType.java similarity index 97% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/QueryType.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/QueryType.java index 9d3eaeb5..bb336be7 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/enums/QueryType.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/QueryType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.core.enums; +package top.continew.starter.data.core.enums; /** * 查询类型枚举 diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/function/ISqlFunction.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java similarity index 94% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/function/ISqlFunction.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java index af958538..9f96cc49 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/function/ISqlFunction.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.core.function; +package top.continew.starter.data.core.function; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/util/MetaUtils.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java similarity index 95% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/util/MetaUtils.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java index 35d1b44c..91a085c7 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/util/MetaUtils.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/MetaUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.core.util; +package top.continew.starter.data.core.util; import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -22,8 +22,8 @@ import cn.hutool.db.Db; import cn.hutool.db.Entity; import cn.hutool.db.meta.Column; import cn.hutool.db.meta.MetaUtil; -import top.charles7c.continew.starter.core.exception.BusinessException; -import top.charles7c.continew.starter.data.core.enums.DatabaseType; +import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.data.core.enums.DatabaseType; import javax.sql.DataSource; import java.sql.Connection; diff --git a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/util/Table.java b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/Table.java similarity index 97% rename from continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/util/Table.java rename to continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/Table.java index 84b56e07..2b412111 100644 --- a/continew-starter-data/continew-starter-data-core/src/main/java/top/charles7c/continew/starter/data/core/util/Table.java +++ b/continew-starter-data/continew-starter-data-core/src/main/java/top/continew/starter/data/core/util/Table.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.core.util; +package top.continew.starter.data.core.util; import java.io.Serial; import java.io.Serializable; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml b/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml index 5370cfe9..f37d53bc 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml +++ b/continew-starter-data/continew-starter-data-mybatis-plus/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-data ${revision} @@ -33,7 +33,7 @@ - top.charles7c.continew + top.continew continew-starter-data-core diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java similarity index 88% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java index d4a89d67..3873ace1 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/ConditionalOnEnabledDataPermission.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure; +package top.continew.starter.data.mybatis.plus.autoconfigure; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; import java.lang.annotation.*; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java similarity index 95% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java index 390aaef8..5e2052de 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MyBatisPlusExtensionProperties.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure; +package top.continew.starter.data.mybatis.plus.autoconfigure; import com.baomidou.mybatisplus.annotation.DbType; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import top.charles7c.continew.starter.data.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties; +import top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorProperties; /** * MyBatis Plus 扩展配置属性 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java similarity index 90% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java index 648c2564..fb078a44 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/MybatisPlusAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure; +package top.continew.starter.data.mybatis.plus.autoconfigure; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -35,11 +35,11 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.transaction.annotation.EnableTransactionManagement; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; -import top.charles7c.continew.starter.data.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration; -import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; -import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionHandlerImpl; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.util.GeneralPropertySourceFactory; +import top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator.MyBatisPlusIdGeneratorConfiguration; +import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter; +import top.continew.starter.data.mybatis.plus.datapermission.DataPermissionHandlerImpl; /** * MyBatis Plus 自动配置 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java index f3ae614f..ad3c1a8a 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusCosIdIdentifierGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; +package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import me.ahoo.cosid.snowflake.SnowflakeId; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java similarity index 97% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java index c2ce9f62..3ecca0bf 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; +package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java similarity index 85% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java index 194138b6..63b9f60d 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/autoconfigure/idgenerator/MyBatisPlusIdGeneratorProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; +package top.continew.starter.data.mybatis.plus.autoconfigure.idgenerator; -import top.charles7c.continew.starter.data.mybatis.plus.enums.MyBatisPlusIdGeneratorType; +import top.continew.starter.data.mybatis.plus.enums.MyBatisPlusIdGeneratorType; /** * MyBatis ID 生成器配置属性 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/base/BaseMapper.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java similarity index 98% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/base/BaseMapper.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java index 854b9a69..f4239e5b 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/base/BaseMapper.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/BaseMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.base; +package top.continew.starter.data.mybatis.plus.base; import cn.hutool.core.util.ClassUtil; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/base/IBaseEnum.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/IBaseEnum.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/base/IBaseEnum.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/IBaseEnum.java index 9837ddb4..3e623892 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/base/IBaseEnum.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/base/IBaseEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.base; +package top.continew.starter.data.mybatis.plus.base; import com.baomidou.mybatisplus.annotation.IEnum; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermission.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermission.java similarity index 95% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermission.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermission.java index 6ba5bafb..7d387f82 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermission.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mybatis.plus.datapermission; import org.springframework.core.annotation.AliasFor; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java similarity index 96% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java index 0b8fd2ff..18f0fad1 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionCurrentUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mybatis.plus.datapermission; import java.util.Set; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java index ff8e2a43..7e9dddec 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mybatis.plus.datapermission; /** * 数据权限过滤器接口 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java similarity index 98% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java index 539a46cb..aa69e7fb 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mybatis.plus.datapermission; import cn.hutool.core.text.CharSequenceUtil; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -35,7 +35,7 @@ import net.sf.jsqlparser.statement.select.SelectExpressionItem; import net.sf.jsqlparser.statement.select.SubSelect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.lang.reflect.Method; import java.util.Collections; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataScope.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataScope.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataScope.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataScope.java index 2f847c68..7c48b339 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataScope.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/datapermission/DataScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.datapermission; +package top.continew.starter.data.mybatis.plus.datapermission; /** * 数据权限枚举 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java similarity index 93% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java index b740d9a1..b7b100cd 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/enums/MyBatisPlusIdGeneratorType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.enums; +package top.continew.starter.data.mybatis.plus.enums; /** * MyBatis ID 生成器类型枚举 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java similarity index 94% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java index bd514143..c79cbf10 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/query/QueryWrapperHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.query; +package top.continew.starter.data.mybatis.plus.query; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,12 +23,12 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.text.CharSequenceUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import top.charles7c.continew.starter.core.exception.BadRequestException; -import top.charles7c.continew.starter.core.util.ReflectUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.data.core.annotation.Query; -import top.charles7c.continew.starter.data.core.annotation.QueryIgnore; -import top.charles7c.continew.starter.data.core.enums.QueryType; +import top.continew.starter.core.exception.BadRequestException; +import top.continew.starter.core.util.ReflectUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.data.core.annotation.Query; +import top.continew.starter.data.core.annotation.QueryIgnore; +import top.continew.starter.data.core.enums.QueryType; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/service/IService.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java similarity index 92% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/service/IService.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java index 85abdf69..9a094911 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/service/IService.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/IService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.service; +package top.continew.starter.data.mybatis.plus.service; /** * 通用业务接口 diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java similarity index 82% rename from continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java rename to continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java index c6d6ae57..0399d18f 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/continew/starter/data/mybatis/plus/service/impl/ServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.starter.data.mybatis.plus.service.impl; +package top.continew.starter.data.mybatis.plus.service.impl; import cn.hutool.core.util.ClassUtil; -import top.charles7c.continew.starter.core.util.ReflectUtils; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; -import top.charles7c.continew.starter.data.mybatis.plus.service.IService; +import top.continew.starter.core.util.ReflectUtils; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.service.IService; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 500cbab7..4e24a969 100644 --- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.data.mybatis.plus.autoconfigure.MybatisPlusAutoConfiguration \ No newline at end of file +top.continew.starter.data.mybatis.plus.autoconfigure.MybatisPlusAutoConfiguration \ No newline at end of file diff --git a/continew-starter-data/pom.xml b/continew-starter-data/pom.xml index 71420d5a..c2987d03 100644 --- a/continew-starter-data/pom.xml +++ b/continew-starter-data/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml index 91a7af4c..c211d932 100644 --- a/continew-starter-dependencies/pom.xml +++ b/continew-starter-dependencies/pom.xml @@ -10,7 +10,7 @@ - top.charles7c.continew + top.continew continew-starter-dependencies ${revision} pom @@ -34,16 +34,6 @@ +8 https://github.com/Charles7c - - bull-bcls - Bull-BCLS - Tomcat416@163.com - - Java Development Engineer - - +8 - https://github.com/Bull-BCLS - https://github.com/Charles7c/continew-starter @@ -295,168 +285,168 @@ - top.charles7c.continew + top.continew continew-starter-extension-crud ${revision} - top.charles7c.continew + top.continew continew-starter-auth-justauth ${revision} - top.charles7c.continew + top.continew continew-starter-auth-satoken ${revision} - top.charles7c.continew + top.continew continew-starter-data-mybatis-plus ${revision} - top.charles7c.continew + top.continew continew-starter-data-core ${revision} - top.charles7c.continew + top.continew continew-starter-cache-jetcache ${revision} - top.charles7c.continew + top.continew continew-starter-cache-springcache ${revision} - top.charles7c.continew + top.continew continew-starter-cache-redisson ${revision} - top.charles7c.continew + top.continew continew-starter-messaging-sms ${revision} - top.charles7c.continew + top.continew continew-starter-messaging-mail ${revision} - top.charles7c.continew + top.continew continew-starter-captcha-behavior ${revision} - top.charles7c.continew + top.continew continew-starter-captcha-graphic ${revision} - top.charles7c.continew + top.continew continew-starter-file-excel ${revision} - top.charles7c.continew + top.continew continew-starter-storage-local ${revision} - top.charles7c.continew + top.continew continew-starter-log-httptrace-pro ${revision} - top.charles7c.continew + top.continew continew-starter-log-core ${revision} - top.charles7c.continew + top.continew continew-starter-web ${revision} - top.charles7c.continew + top.continew continew-starter-security-all ${revision} - top.charles7c.continew + top.continew continew-starter-security-crypto ${revision} - top.charles7c.continew + top.continew continew-starter-security-mask ${revision} - top.charles7c.continew + top.continew continew-starter-security-password ${revision} - top.charles7c.continew + top.continew continew-starter-api-doc ${revision} - top.charles7c.continew + top.continew continew-starter-json-jackson ${revision} - top.charles7c.continew + top.continew continew-starter-core ${revision} diff --git a/continew-starter-extension/continew-starter-extension-crud/pom.xml b/continew-starter-extension/continew-starter-extension-crud/pom.xml index 16f984dd..c9f1e869 100644 --- a/continew-starter-extension/continew-starter-extension-crud/pom.xml +++ b/continew-starter-extension/continew-starter-extension-crud/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-extension ${revision} @@ -26,25 +26,25 @@ - top.charles7c.continew + top.continew continew-starter-auth-satoken - top.charles7c.continew + top.continew continew-starter-data-mybatis-plus - top.charles7c.continew + top.continew continew-starter-file-excel - top.charles7c.continew + top.continew continew-starter-web diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/CrudRequestMapping.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/CrudRequestMapping.java similarity index 89% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/CrudRequestMapping.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/CrudRequestMapping.java index 02e70ad0..f616dd50 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/CrudRequestMapping.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/CrudRequestMapping.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.annotation; +package top.continew.starter.extension.crud.annotation; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.enums.Api; import java.lang.annotation.*; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/EnableCrudRestController.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/EnableCrudRestController.java similarity index 85% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/EnableCrudRestController.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/EnableCrudRestController.java index f65e7cfe..669ae3b0 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/EnableCrudRestController.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/EnableCrudRestController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.annotation; +package top.continew.starter.extension.crud.annotation; import org.springframework.context.annotation.Import; -import top.charles7c.continew.starter.extension.crud.autoconfigure.CrudRestControllerAutoConfiguration; +import top.continew.starter.extension.crud.autoconfigure.CrudRestControllerAutoConfiguration; import java.lang.annotation.*; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/TreeField.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/TreeField.java similarity index 96% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/TreeField.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/TreeField.java index d6ede6c2..f02b090c 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/TreeField.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/annotation/TreeField.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.annotation; +package top.continew.starter.extension.crud.annotation; import java.lang.annotation.*; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java similarity index 93% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java index 3702d044..4987183b 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRequestMappingHandlerMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.autoconfigure; +package top.continew.starter.extension.crud.autoconfigure; import cn.hutool.core.util.ArrayUtil; import org.springframework.core.annotation.AnnotatedElementUtils; @@ -24,9 +24,9 @@ import org.springframework.web.servlet.mvc.condition.RequestCondition; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.util.pattern.PathPatternParser; -import top.charles7c.continew.starter.core.util.ExceptionUtils; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.enums.Api; +import top.continew.starter.core.util.ExceptionUtils; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.enums.Api; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java similarity index 97% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java index 2e1e6834..70117f03 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/autoconfigure/CrudRestControllerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.autoconfigure; +package top.continew.starter.extension.crud.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/constant/ContainerPool.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/constant/ContainerPool.java similarity index 93% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/constant/ContainerPool.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/constant/ContainerPool.java index 8b960591..6d311298 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/constant/ContainerPool.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/constant/ContainerPool.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.constant; +package top.continew.starter.extension.crud.constant; /** * 数据源容器相关常量（Crane4j 数据填充组件使用） diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/controller/BaseController.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java similarity index 87% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/controller/BaseController.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java index 34d27e5c..7539f4eb 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/controller/BaseController.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/controller/BaseController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.controller; +package top.continew.starter.extension.crud.controller; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.lang.tree.Tree; @@ -26,16 +26,16 @@ import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.util.ValidateGroup; -import top.charles7c.continew.starter.extension.crud.enums.Api; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.extension.crud.annotation.CrudRequestMapping; +import top.continew.starter.extension.crud.util.ValidateGroup; +import top.continew.starter.extension.crud.enums.Api; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.query.SortQuery; +import top.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.web.model.R; import java.util.List; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/converter/ExcelBaseEnumConverter.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/converter/ExcelBaseEnumConverter.java similarity index 93% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/converter/ExcelBaseEnumConverter.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/converter/ExcelBaseEnumConverter.java index 24726f7c..eb6be790 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/converter/ExcelBaseEnumConverter.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/converter/ExcelBaseEnumConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.converter; +package top.continew.starter.extension.crud.converter; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ClassUtil; @@ -24,8 +24,8 @@ import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.data.mybatis.plus.base.IBaseEnum; /** * Easy Excel 枚举接口转换器 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/enums/Api.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/enums/Api.java similarity index 94% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/enums/Api.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/enums/Api.java index 69dc8c84..abbcec7c 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/enums/Api.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/enums/Api.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.enums; +package top.continew.starter.extension.crud.enums; /** * API 类型枚举 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/entity/BaseDO.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/entity/BaseDO.java similarity index 97% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/entity/BaseDO.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/entity/BaseDO.java index 46f55b2f..c0367c9b 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/entity/BaseDO.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/entity/BaseDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.model.entity; +package top.continew.starter.extension.crud.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/PageQuery.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/query/PageQuery.java similarity index 97% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/PageQuery.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/query/PageQuery.java index 566d5baa..563c95ce 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/PageQuery.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/query/PageQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.model.query; +package top.continew.starter.extension.crud.model.query; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/SortQuery.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java similarity index 94% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/SortQuery.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java index f085dfb1..d6c7229b 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/query/SortQuery.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/query/SortQuery.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.model.query; +package top.continew.starter.extension.crud.model.query; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.text.CharSequenceUtil; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.data.domain.Sort; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.io.Serial; import java.io.Serializable; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/req/BaseReq.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/req/BaseReq.java similarity index 93% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/req/BaseReq.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/req/BaseReq.java index 6d95eab1..7e334a9a 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/req/BaseReq.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/req/BaseReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.model.req; +package top.continew.starter.extension.crud.model.req; import java.io.Serial; import java.io.Serializable; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseDetailResp.java similarity index 94% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseDetailResp.java index b82bd7b2..dd58dcb7 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.model.resp; +package top.continew.starter.extension.crud.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -22,7 +22,7 @@ import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.constant.ContainerPool; +import top.continew.starter.extension.crud.constant.ContainerPool; import java.io.Serial; import java.time.LocalDateTime; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseResp.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseResp.java similarity index 95% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseResp.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseResp.java index 79bebdf8..458ead46 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseResp.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/BaseResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.model.resp; +package top.continew.starter.extension.crud.model.resp; import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Mapping; @@ -22,7 +22,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.continew.starter.extension.crud.constant.ContainerPool; +import top.continew.starter.extension.crud.constant.ContainerPool; import java.io.Serial; import java.io.Serializable; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageResp.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java similarity index 98% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageResp.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java index a7ef8fb8..2f859beb 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/PageResp.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/model/resp/PageResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.model.resp; +package top.continew.starter.extension.crud.model.resp; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/BaseService.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/BaseService.java similarity index 87% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/BaseService.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/BaseService.java index 28435f92..fc9a5d8c 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/BaseService.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/BaseService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.service; +package top.continew.starter.extension.crud.service; import cn.hutool.core.lang.tree.Tree; import jakarta.servlet.http.HttpServletResponse; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.query.SortQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; import java.util.List; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/CommonUserService.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/CommonUserService.java similarity index 88% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/CommonUserService.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/CommonUserService.java index 7d583e11..72f6b010 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/CommonUserService.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/CommonUserService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.service; +package top.continew.starter.extension.crud.service; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.MappingType; -import top.charles7c.continew.starter.extension.crud.constant.ContainerPool; +import top.continew.starter.extension.crud.constant.ContainerPool; /** * 公共用户业务接口 diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/impl/BaseServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java similarity index 89% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/impl/BaseServiceImpl.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java index 3fae9907..d585f17b 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/service/impl/BaseServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/service/impl/BaseServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.service.impl; +package top.continew.starter.extension.crud.service.impl; import cn.crane4j.core.support.OperateTemplate; import cn.hutool.core.bean.BeanUtil; @@ -31,22 +31,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.servlet.http.HttpServletResponse; import org.springframework.data.domain.Sort; import org.springframework.transaction.annotation.Transactional; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.util.ClassUtils; -import top.charles7c.continew.starter.core.util.ReflectUtils; -import top.charles7c.continew.starter.core.util.validate.ValidationUtils; -import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper; -import top.charles7c.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; -import top.charles7c.continew.starter.data.mybatis.plus.service.impl.ServiceImpl; -import top.charles7c.continew.starter.extension.crud.annotation.TreeField; -import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO; -import top.charles7c.continew.starter.extension.crud.model.req.BaseReq; -import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; -import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; -import top.charles7c.continew.starter.extension.crud.model.resp.PageResp; -import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.util.TreeUtils; -import top.charles7c.continew.starter.file.excel.util.ExcelUtils; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.util.ClassUtils; +import top.continew.starter.core.util.ReflectUtils; +import top.continew.starter.core.util.validate.ValidationUtils; +import top.continew.starter.data.mybatis.plus.base.BaseMapper; +import top.continew.starter.data.mybatis.plus.query.QueryWrapperHelper; +import top.continew.starter.data.mybatis.plus.service.impl.ServiceImpl; +import top.continew.starter.extension.crud.annotation.TreeField; +import top.continew.starter.extension.crud.model.entity.BaseDO; +import top.continew.starter.extension.crud.model.req.BaseReq; +import top.continew.starter.extension.crud.model.query.PageQuery; +import top.continew.starter.extension.crud.model.query.SortQuery; +import top.continew.starter.extension.crud.model.resp.PageResp; +import top.continew.starter.extension.crud.service.BaseService; +import top.continew.starter.extension.crud.util.TreeUtils; +import top.continew.starter.file.excel.util.ExcelUtils; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/TreeUtils.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/TreeUtils.java similarity index 93% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/TreeUtils.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/TreeUtils.java index cd888bf5..8db19fab 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/TreeUtils.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/TreeUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.util; +package top.continew.starter.extension.crud.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; @@ -22,8 +22,8 @@ import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; import cn.hutool.core.util.ReflectUtil; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; -import top.charles7c.continew.starter.extension.crud.annotation.TreeField; +import top.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.extension.crud.annotation.TreeField; import java.util.ArrayList; import java.util.List; diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/ValidateGroup.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java similarity index 94% rename from continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/ValidateGroup.java rename to continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java index 389f975a..9cd85d33 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/util/ValidateGroup.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/continew/starter/extension/crud/util/ValidateGroup.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.extension.crud.util; +package top.continew.starter.extension.crud.util; import jakarta.validation.groups.Default; diff --git a/continew-starter-extension/pom.xml b/continew-starter-extension/pom.xml index 265c9564..18b788c4 100644 --- a/continew-starter-extension/pom.xml +++ b/continew-starter-extension/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -20,7 +20,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-file/continew-starter-file-excel/pom.xml b/continew-starter-file/continew-starter-file-excel/pom.xml index 0b29f565..a062a7ce 100644 --- a/continew-starter-file/continew-starter-file-excel/pom.xml +++ b/continew-starter-file/continew-starter-file-excel/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-file ${revision} diff --git a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/converter/ExcelBigNumberConverter.java b/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelBigNumberConverter.java similarity index 97% rename from continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/converter/ExcelBigNumberConverter.java rename to continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelBigNumberConverter.java index 77c63e5b..59662fd0 100644 --- a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/converter/ExcelBigNumberConverter.java +++ b/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/converter/ExcelBigNumberConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.file.excel.converter; +package top.continew.starter.file.excel.converter; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.NumberUtil; diff --git a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java b/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/util/ExcelUtils.java similarity index 93% rename from continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java rename to continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/util/ExcelUtils.java index b865051f..0ac894eb 100644 --- a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java +++ b/continew-starter-file/continew-starter-file-excel/src/main/java/top/continew/starter/file/excel/util/ExcelUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.file.excel.util; +package top.continew.starter.file.excel.util; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; @@ -24,8 +24,8 @@ import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import top.charles7c.continew.starter.core.exception.BaseException; -import top.charles7c.continew.starter.file.excel.converter.ExcelBigNumberConverter; +import top.continew.starter.core.exception.BaseException; +import top.continew.starter.file.excel.converter.ExcelBigNumberConverter; import java.util.Date; import java.util.List; diff --git a/continew-starter-file/pom.xml b/continew-starter-file/pom.xml index 3a23aec8..1b93a554 100644 --- a/continew-starter-file/pom.xml +++ b/continew-starter-file/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -20,7 +20,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-json/continew-starter-json-jackson/pom.xml b/continew-starter-json/continew-starter-json-jackson/pom.xml index e673266f..8cb94187 100644 --- a/continew-starter-json/continew-starter-json-jackson/pom.xml +++ b/continew-starter-json/continew-starter-json-jackson/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-json ${revision} diff --git a/continew-starter-json/continew-starter-json-jackson/src/main/java/top/charles7c/continew/starter/json/jackson/autoconfigure/JacksonAutoConfiguration.java b/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/autoconfigure/JacksonAutoConfiguration.java similarity index 94% rename from continew-starter-json/continew-starter-json-jackson/src/main/java/top/charles7c/continew/starter/json/jackson/autoconfigure/JacksonAutoConfiguration.java rename to continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/autoconfigure/JacksonAutoConfiguration.java index dd5fe743..0a2f6198 100644 --- a/continew-starter-json/continew-starter-json-jackson/src/main/java/top/charles7c/continew/starter/json/jackson/autoconfigure/JacksonAutoConfiguration.java +++ b/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/autoconfigure/JacksonAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.json.jackson.autoconfigure; +package top.continew.starter.json.jackson.autoconfigure; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; @@ -30,8 +30,8 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; -import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; -import top.charles7c.continew.starter.json.jackson.serializer.BigNumberSerializer; +import top.continew.starter.core.util.GeneralPropertySourceFactory; +import top.continew.starter.json.jackson.serializer.BigNumberSerializer; import java.math.BigInteger; import java.time.LocalDate; diff --git a/continew-starter-json/continew-starter-json-jackson/src/main/java/top/charles7c/continew/starter/json/jackson/serializer/BigNumberSerializer.java b/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/serializer/BigNumberSerializer.java similarity index 96% rename from continew-starter-json/continew-starter-json-jackson/src/main/java/top/charles7c/continew/starter/json/jackson/serializer/BigNumberSerializer.java rename to continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/serializer/BigNumberSerializer.java index e8801432..85c36f9d 100644 --- a/continew-starter-json/continew-starter-json-jackson/src/main/java/top/charles7c/continew/starter/json/jackson/serializer/BigNumberSerializer.java +++ b/continew-starter-json/continew-starter-json-jackson/src/main/java/top/continew/starter/json/jackson/serializer/BigNumberSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.json.jackson.serializer; +package top.continew.starter.json.jackson.serializer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/continew-starter-json/continew-starter-json-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-json/continew-starter-json-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f45b4413..f4365304 100644 --- a/continew-starter-json/continew-starter-json-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-json/continew-starter-json-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.json.jackson.autoconfigure.JacksonAutoConfiguration \ No newline at end of file +top.continew.starter.json.jackson.autoconfigure.JacksonAutoConfiguration \ No newline at end of file diff --git a/continew-starter-json/pom.xml b/continew-starter-json/pom.xml index 2823ef43..80ccd859 100644 --- a/continew-starter-json/pom.xml +++ b/continew-starter-json/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -20,7 +20,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-log/continew-starter-log-core/pom.xml b/continew-starter-log/continew-starter-log-core/pom.xml index 9ac7a889..a972b57f 100644 --- a/continew-starter-log/continew-starter-log-core/pom.xml +++ b/continew-starter-log/continew-starter-log-core/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-log ${revision} diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/annotation/Log.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/annotation/Log.java similarity index 93% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/annotation/Log.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/annotation/Log.java index c04171fd..b8cef4fe 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/annotation/Log.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/annotation/Log.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.annotation; +package top.continew.starter.log.core.annotation; -import top.charles7c.continew.starter.log.core.enums.Include; +import top.continew.starter.log.core.enums.Include; import java.lang.annotation.*; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/LogDao.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/dao/LogDao.java similarity index 90% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/LogDao.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/dao/LogDao.java index 9dde1f25..f305e677 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/LogDao.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/dao/LogDao.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.dao; +package top.continew.starter.log.core.dao; -import top.charles7c.continew.starter.log.core.model.LogRecord; +import top.continew.starter.log.core.model.LogRecord; import java.util.Collections; import java.util.List; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java similarity index 92% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java index e83bbab3..8471456b 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/dao/impl/LogDaoDefaultImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.dao.impl; +package top.continew.starter.log.core.dao.impl; -import top.charles7c.continew.starter.log.core.dao.LogDao; -import top.charles7c.continew.starter.log.core.model.LogRecord; +import top.continew.starter.log.core.dao.LogDao; +import top.continew.starter.log.core.model.LogRecord; import java.util.LinkedList; import java.util.List; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/enums/Include.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/enums/Include.java similarity index 97% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/enums/Include.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/enums/Include.java index 55fd4d99..0b2f83af 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/enums/Include.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/enums/Include.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.enums; +package top.continew.starter.log.core.enums; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRecord.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogRecord.java similarity index 97% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRecord.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogRecord.java index 8b25c159..e1955b7e 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRecord.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogRecord.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.model; +package top.continew.starter.log.core.model; -import top.charles7c.continew.starter.log.core.enums.Include; +import top.continew.starter.log.core.enums.Include; import java.time.Clock; import java.time.Duration; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRequest.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogRequest.java similarity index 94% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRequest.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogRequest.java index e3f7b629..92d20d8c 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogRequest.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogRequest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.model; +package top.continew.starter.log.core.model; import cn.hutool.core.text.CharSequenceUtil; import org.springframework.http.HttpHeaders; -import top.charles7c.continew.starter.core.util.IpUtils; -import top.charles7c.continew.starter.log.core.enums.Include; -import top.charles7c.continew.starter.web.util.ServletUtils; +import top.continew.starter.core.util.IpUtils; +import top.continew.starter.log.core.enums.Include; +import top.continew.starter.web.util.ServletUtils; import java.net.URI; import java.util.Map; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogResponse.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogResponse.java similarity index 94% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogResponse.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogResponse.java index 27d5e9b0..524a8774 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/LogResponse.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/LogResponse.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.model; +package top.continew.starter.log.core.model; -import top.charles7c.continew.starter.log.core.enums.Include; +import top.continew.starter.log.core.enums.Include; import java.util.*; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpRequest.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/RecordableHttpRequest.java similarity index 96% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpRequest.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/RecordableHttpRequest.java index f9cbf7f1..b5bd3899 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpRequest.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/RecordableHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.model; +package top.continew.starter.log.core.model; import java.net.URI; import java.util.Map; diff --git a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpResponse.java b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/RecordableHttpResponse.java similarity index 95% rename from continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpResponse.java rename to continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/RecordableHttpResponse.java index 654cd3fe..a1ae77ee 100644 --- a/continew-starter-log/continew-starter-log-core/src/main/java/top/charles7c/continew/starter/log/core/model/RecordableHttpResponse.java +++ b/continew-starter-log/continew-starter-log-core/src/main/java/top/continew/starter/log/core/model/RecordableHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.core.model; +package top.continew.starter.log.core.model; import java.util.Map; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml b/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml index 523d3385..4348ef61 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml +++ b/continew-starter-log/continew-starter-log-httptrace-pro/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-log ${revision} @@ -27,7 +27,7 @@ - top.charles7c.continew + top.continew continew-starter-log-core diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java similarity index 88% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java rename to continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java index cdda05f8..bf90f3d6 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/ConditionalOnEnabledLog.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.httptracepro.autoconfigure; +package top.continew.starter.log.httptracepro.autoconfigure; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; import java.lang.annotation.*; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java similarity index 87% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java rename to continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java index 5e234ba1..cd207cc9 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.httptracepro.autoconfigure; +package top.continew.starter.log.httptracepro.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -26,10 +26,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import top.charles7c.continew.starter.log.core.dao.LogDao; -import top.charles7c.continew.starter.log.core.dao.impl.LogDaoDefaultImpl; -import top.charles7c.continew.starter.log.httptracepro.handler.LogFilter; -import top.charles7c.continew.starter.log.httptracepro.handler.LogInterceptor; +import top.continew.starter.log.core.dao.LogDao; +import top.continew.starter.log.core.dao.impl.LogDaoDefaultImpl; +import top.continew.starter.log.httptracepro.handler.LogFilter; +import top.continew.starter.log.httptracepro.handler.LogInterceptor; /** * 日志自动配置 diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogProperties.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogProperties.java similarity index 89% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogProperties.java rename to continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogProperties.java index cf657d90..8c734559 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/autoconfigure/LogProperties.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/autoconfigure/LogProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.httptracepro.autoconfigure; +package top.continew.starter.log.httptracepro.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.log.core.enums.Include; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.log.core.enums.Include; import java.util.HashSet; import java.util.Set; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogFilter.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogFilter.java similarity index 95% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogFilter.java rename to continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogFilter.java index 51dae673..e565f070 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogFilter.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.httptracepro.handler; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -26,8 +26,8 @@ import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.ContentCachingResponseWrapper; import org.springframework.web.util.WebUtils; -import top.charles7c.continew.starter.log.core.enums.Include; -import top.charles7c.continew.starter.log.httptracepro.autoconfigure.LogProperties; +import top.continew.starter.log.core.enums.Include; +import top.continew.starter.log.httptracepro.autoconfigure.LogProperties; import java.io.IOException; import java.net.URI; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogInterceptor.java similarity index 95% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java rename to continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogInterceptor.java index 31d9b740..a28f94dc 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/LogInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.httptracepro.handler; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.extra.spring.SpringUtil; @@ -30,12 +30,12 @@ import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.lang.NonNull; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; -import top.charles7c.continew.starter.log.core.annotation.Log; -import top.charles7c.continew.starter.log.core.dao.LogDao; -import top.charles7c.continew.starter.log.core.enums.Include; -import top.charles7c.continew.starter.log.core.model.LogRecord; -import top.charles7c.continew.starter.log.core.model.LogResponse; -import top.charles7c.continew.starter.log.httptracepro.autoconfigure.LogProperties; +import top.continew.starter.log.core.annotation.Log; +import top.continew.starter.log.core.dao.LogDao; +import top.continew.starter.log.core.enums.Include; +import top.continew.starter.log.core.model.LogRecord; +import top.continew.starter.log.core.model.LogResponse; +import top.continew.starter.log.httptracepro.autoconfigure.LogProperties; import java.time.Clock; import java.util.Set; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java similarity index 94% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java rename to continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java index 0db5788e..71cea0b1 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.httptracepro.handler; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; @@ -24,8 +24,8 @@ import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.UriUtils; import org.springframework.web.util.WebUtils; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.log.core.model.RecordableHttpRequest; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.log.core.model.RecordableHttpRequest; import java.net.URI; import java.net.URISyntaxException; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java similarity index 88% rename from continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java rename to continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java index 1a6ea919..7927bd29 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/continew/starter/log/httptracepro/handler/RecordableServletHttpResponse.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.log.httptracepro.handler; +package top.continew.starter.log.httptracepro.handler; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; @@ -22,9 +22,9 @@ import cn.hutool.json.JSONUtil; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.util.ContentCachingResponseWrapper; import org.springframework.web.util.WebUtils; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.log.core.model.RecordableHttpResponse; -import top.charles7c.continew.starter.web.util.ServletUtils; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.log.core.model.RecordableHttpResponse; +import top.continew.starter.web.util.ServletUtils; import java.util.*; diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 63de7bbe..c87053f0 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.log.httptracepro.autoconfigure.LogAutoConfiguration \ No newline at end of file +top.continew.starter.log.httptracepro.autoconfigure.LogAutoConfiguration \ No newline at end of file diff --git a/continew-starter-log/pom.xml b/continew-starter-log/pom.xml index 4bcfe863..02bf4b02 100644 --- a/continew-starter-log/pom.xml +++ b/continew-starter-log/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-starter-web diff --git a/continew-starter-messaging/continew-starter-messaging-mail/pom.xml b/continew-starter-messaging/continew-starter-messaging-mail/pom.xml index dc53280a..56c8242d 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/pom.xml +++ b/continew-starter-messaging/continew-starter-messaging-mail/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-messaging ${revision} diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/charles7c/continew/starter/messaging/mail/autoconfigure/MailAutoConfiguration.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/autoconfigure/MailAutoConfiguration.java similarity index 90% rename from continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/charles7c/continew/starter/messaging/mail/autoconfigure/MailAutoConfiguration.java rename to continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/autoconfigure/MailAutoConfiguration.java index 3f73ce5b..608a0694 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/charles7c/continew/starter/messaging/mail/autoconfigure/MailAutoConfiguration.java +++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/autoconfigure/MailAutoConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.starter.messaging.mail.autoconfigure; +package top.continew.starter.messaging.mail.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.PropertySource; -import top.charles7c.continew.starter.core.util.GeneralPropertySourceFactory; +import top.continew.starter.core.util.GeneralPropertySourceFactory; /** * 邮件自动配置 diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/charles7c/continew/starter/messaging/mail/util/MailUtils.java b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java similarity index 98% rename from continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/charles7c/continew/starter/messaging/mail/util/MailUtils.java rename to continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java index aa5b3dc9..3554177d 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/charles7c/continew/starter/messaging/mail/util/MailUtils.java +++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/java/top/continew/starter/messaging/mail/util/MailUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.messaging.mail.util; +package top.continew.starter.messaging.mail.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; @@ -25,7 +25,7 @@ import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/continew-starter-messaging/continew-starter-messaging-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-messaging/continew-starter-messaging-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index edc6f607..24ae849e 100644 --- a/continew-starter-messaging/continew-starter-messaging-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-messaging/continew-starter-messaging-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.messaging.mail.autoconfigure.MailAutoConfiguration \ No newline at end of file +top.continew.starter.messaging.mail.autoconfigure.MailAutoConfiguration \ No newline at end of file diff --git a/continew-starter-messaging/continew-starter-messaging-sms/pom.xml b/continew-starter-messaging/continew-starter-messaging-sms/pom.xml index b0caa0cc..0fb6dfce 100644 --- a/continew-starter-messaging/continew-starter-messaging-sms/pom.xml +++ b/continew-starter-messaging/continew-starter-messaging-sms/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-messaging ${revision} diff --git a/continew-starter-messaging/pom.xml b/continew-starter-messaging/pom.xml index b7825e34..8174bd02 100644 --- a/continew-starter-messaging/pom.xml +++ b/continew-starter-messaging/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -21,7 +21,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-security/continew-starter-security-all/pom.xml b/continew-starter-security/continew-starter-security-all/pom.xml index f8f33ce4..b8fab446 100644 --- a/continew-starter-security/continew-starter-security-all/pom.xml +++ b/continew-starter-security/continew-starter-security-all/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-security ${revision} @@ -15,19 +15,19 @@ - top.charles7c.continew + top.continew continew-starter-security-crypto - top.charles7c.continew + top.continew continew-starter-security-mask - top.charles7c.continew + top.continew continew-starter-security-password diff --git a/continew-starter-security/continew-starter-security-crypto/pom.xml b/continew-starter-security/continew-starter-security-crypto/pom.xml index 359c6b18..b08549a4 100644 --- a/continew-starter-security/continew-starter-security-crypto/pom.xml +++ b/continew-starter-security/continew-starter-security-crypto/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-security ${revision} diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/annotation/FieldEncrypt.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/annotation/FieldEncrypt.java similarity index 86% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/annotation/FieldEncrypt.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/annotation/FieldEncrypt.java index b60f24e5..dccb566c 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/annotation/FieldEncrypt.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/annotation/FieldEncrypt.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.annotation; +package top.continew.starter.security.crypto.annotation; -import top.charles7c.continew.starter.security.crypto.encryptor.IEncryptor; -import top.charles7c.continew.starter.security.crypto.enums.Algorithm; +import top.continew.starter.security.crypto.encryptor.IEncryptor; +import top.continew.starter.security.crypto.enums.Algorithm; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java similarity index 88% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java index a34e9ad3..c1f1fa2e 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.autoconfigure; +package top.continew.starter.security.crypto.autoconfigure; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; @@ -24,9 +24,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.security.crypto.core.MyBatisDecryptInterceptor; -import top.charles7c.continew.starter.security.crypto.core.MyBatisEncryptInterceptor; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.security.crypto.core.MyBatisDecryptInterceptor; +import top.continew.starter.security.crypto.core.MyBatisEncryptInterceptor; /** * 加/解密自动配置 diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/autoconfigure/CryptoProperties.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoProperties.java similarity index 92% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/autoconfigure/CryptoProperties.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoProperties.java index a4df2104..3ff0a896 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/autoconfigure/CryptoProperties.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/autoconfigure/CryptoProperties.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.autoconfigure; +package top.continew.starter.security.crypto.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; /** * 加/解密配置属性 diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java similarity index 92% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java index 441ac25c..e2f97ce0 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/AbstractMyBatisInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.core; +package top.continew.starter.security.crypto.core; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -23,11 +23,11 @@ import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.plugin.*; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.exception.BusinessException; -import top.charles7c.continew.starter.security.crypto.annotation.FieldEncrypt; -import top.charles7c.continew.starter.security.crypto.encryptor.IEncryptor; -import top.charles7c.continew.starter.security.crypto.enums.Algorithm; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.security.crypto.annotation.FieldEncrypt; +import top.continew.starter.security.crypto.encryptor.IEncryptor; +import top.continew.starter.security.crypto.enums.Algorithm; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/MyBatisDecryptInterceptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisDecryptInterceptor.java similarity index 90% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/MyBatisDecryptInterceptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisDecryptInterceptor.java index 96bfcb0c..21e5a35f 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/MyBatisDecryptInterceptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisDecryptInterceptor.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.core; +package top.continew.starter.security.crypto.core; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; import org.apache.ibatis.executor.resultset.ResultSetHandler; import org.apache.ibatis.plugin.*; import org.apache.ibatis.type.SimpleTypeRegistry; -import top.charles7c.continew.starter.security.crypto.annotation.FieldEncrypt; -import top.charles7c.continew.starter.security.crypto.autoconfigure.CryptoProperties; -import top.charles7c.continew.starter.security.crypto.encryptor.IEncryptor; +import top.continew.starter.security.crypto.annotation.FieldEncrypt; +import top.continew.starter.security.crypto.autoconfigure.CryptoProperties; +import top.continew.starter.security.crypto.encryptor.IEncryptor; import java.lang.reflect.Field; import java.sql.Statement; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/MyBatisEncryptInterceptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisEncryptInterceptor.java similarity index 95% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/MyBatisEncryptInterceptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisEncryptInterceptor.java index e25bfff0..f906c7ae 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/core/MyBatisEncryptInterceptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/core/MyBatisEncryptInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.core; +package top.continew.starter.security.crypto.core; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; @@ -28,9 +28,9 @@ import org.apache.ibatis.plugin.*; import org.apache.ibatis.session.ResultHandler; import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.type.SimpleTypeRegistry; -import top.charles7c.continew.starter.security.crypto.annotation.FieldEncrypt; -import top.charles7c.continew.starter.security.crypto.autoconfigure.CryptoProperties; -import top.charles7c.continew.starter.security.crypto.encryptor.IEncryptor; +import top.continew.starter.security.crypto.annotation.FieldEncrypt; +import top.continew.starter.security.crypto.autoconfigure.CryptoProperties; +import top.continew.starter.security.crypto.encryptor.IEncryptor; import java.lang.reflect.Field; import java.util.*; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/AbstractSymmetricCryptoEncryptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/AbstractSymmetricCryptoEncryptor.java similarity index 94% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/AbstractSymmetricCryptoEncryptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/AbstractSymmetricCryptoEncryptor.java index 56c8840c..9591e46a 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/AbstractSymmetricCryptoEncryptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/AbstractSymmetricCryptoEncryptor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.encryptor; +package top.continew.starter.security.crypto.encryptor; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; import cn.hutool.crypto.symmetric.SymmetricCrypto; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.nio.charset.StandardCharsets; import java.util.Map; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/AesEncryptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/AesEncryptor.java similarity index 94% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/AesEncryptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/AesEncryptor.java index 08bafe6a..6f5633e3 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/AesEncryptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/AesEncryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.encryptor; +package top.continew.starter.security.crypto.encryptor; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/Base64Encryptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/Base64Encryptor.java similarity index 95% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/Base64Encryptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/Base64Encryptor.java index 488aac13..c6748589 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/Base64Encryptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/Base64Encryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.encryptor; +package top.continew.starter.security.crypto.encryptor; import cn.hutool.core.codec.Base64; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/DesEncryptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/DesEncryptor.java similarity index 94% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/DesEncryptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/DesEncryptor.java index ec15dd36..790595b6 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/DesEncryptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/DesEncryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.encryptor; +package top.continew.starter.security.crypto.encryptor; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/IEncryptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/IEncryptor.java similarity index 95% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/IEncryptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/IEncryptor.java index 61672ddc..3d2c3b55 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/IEncryptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/IEncryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.encryptor; +package top.continew.starter.security.crypto.encryptor; /** * 加/解密接口 diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/PbeWithMd5AndDesEncryptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/PbeWithMd5AndDesEncryptor.java similarity index 94% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/PbeWithMd5AndDesEncryptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/PbeWithMd5AndDesEncryptor.java index cff73dea..84ba72a5 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/PbeWithMd5AndDesEncryptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/PbeWithMd5AndDesEncryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.encryptor; +package top.continew.starter.security.crypto.encryptor; import cn.hutool.crypto.symmetric.SymmetricAlgorithm; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/RsaEncryptor.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/RsaEncryptor.java similarity index 95% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/RsaEncryptor.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/RsaEncryptor.java index e49c4214..7ca34bae 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/encryptor/RsaEncryptor.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/encryptor/RsaEncryptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.encryptor; +package top.continew.starter.security.crypto.encryptor; import cn.hutool.core.codec.Base64; import cn.hutool.crypto.SecureUtil; diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/enums/Algorithm.java b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/enums/Algorithm.java similarity index 91% rename from continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/enums/Algorithm.java rename to continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/enums/Algorithm.java index f8c63ea0..549be9fa 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/java/top/charles7c/continew/starter/security/crypto/enums/Algorithm.java +++ b/continew-starter-security/continew-starter-security-crypto/src/main/java/top/continew/starter/security/crypto/enums/Algorithm.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.crypto.enums; +package top.continew.starter.security.crypto.enums; -import top.charles7c.continew.starter.security.crypto.encryptor.*; +import top.continew.starter.security.crypto.encryptor.*; /** * 加密/解密算法枚举 diff --git a/continew-starter-security/continew-starter-security-crypto/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-security/continew-starter-security-crypto/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index c4a825ee..8ec4466c 100644 --- a/continew-starter-security/continew-starter-security-crypto/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-security/continew-starter-security-crypto/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.security.crypto.autoconfigure.CryptoAutoConfiguration \ No newline at end of file +top.continew.starter.security.crypto.autoconfigure.CryptoAutoConfiguration \ No newline at end of file diff --git a/continew-starter-security/continew-starter-security-mask/pom.xml b/continew-starter-security/continew-starter-security-mask/pom.xml index 7e53b964..ce9e5cf4 100644 --- a/continew-starter-security/continew-starter-security-mask/pom.xml +++ b/continew-starter-security/continew-starter-security-mask/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-security ${revision} diff --git a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/annotation/JsonMask.java b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/annotation/JsonMask.java similarity index 83% rename from continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/annotation/JsonMask.java rename to continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/annotation/JsonMask.java index b13c7bf9..7ae13684 100644 --- a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/annotation/JsonMask.java +++ b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/annotation/JsonMask.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.mask.annotation; +package top.continew.starter.security.mask.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.security.mask.core.JsonMaskSerializer; -import top.charles7c.continew.starter.security.mask.enums.MaskType; -import top.charles7c.continew.starter.security.mask.strategy.IMaskStrategy; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.security.mask.core.JsonMaskSerializer; +import top.continew.starter.security.mask.enums.MaskType; +import top.continew.starter.security.mask.strategy.IMaskStrategy; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/core/JsonMaskSerializer.java b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/core/JsonMaskSerializer.java similarity index 91% rename from continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/core/JsonMaskSerializer.java rename to continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/core/JsonMaskSerializer.java index d5b9da33..8bbf3294 100644 --- a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/core/JsonMaskSerializer.java +++ b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/core/JsonMaskSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.mask.core; +package top.continew.starter.security.mask.core; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ObjectUtil; @@ -25,9 +25,9 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.security.mask.annotation.JsonMask; -import top.charles7c.continew.starter.security.mask.strategy.IMaskStrategy; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.security.mask.annotation.JsonMask; +import top.continew.starter.security.mask.strategy.IMaskStrategy; import java.io.IOException; import java.util.Objects; diff --git a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/enums/MaskType.java b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/enums/MaskType.java similarity index 96% rename from continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/enums/MaskType.java rename to continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/enums/MaskType.java index 54efa932..56874d15 100644 --- a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/enums/MaskType.java +++ b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/enums/MaskType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.mask.enums; +package top.continew.starter.security.mask.enums; import cn.hutool.core.text.CharSequenceUtil; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.security.mask.strategy.IMaskStrategy; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.security.mask.strategy.IMaskStrategy; /** * 脱敏类型 diff --git a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/strategy/IMaskStrategy.java b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/strategy/IMaskStrategy.java similarity index 94% rename from continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/strategy/IMaskStrategy.java rename to continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/strategy/IMaskStrategy.java index 7134c816..edaf146f 100644 --- a/continew-starter-security/continew-starter-security-mask/src/main/java/top/charles7c/continew/starter/security/mask/strategy/IMaskStrategy.java +++ b/continew-starter-security/continew-starter-security-mask/src/main/java/top/continew/starter/security/mask/strategy/IMaskStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.mask.strategy; +package top.continew.starter.security.mask.strategy; /** * 脱敏策略 diff --git a/continew-starter-security/continew-starter-security-password/pom.xml b/continew-starter-security/continew-starter-security-password/pom.xml index 5591cf1c..cf05ebd2 100644 --- a/continew-starter-security/continew-starter-security-password/pom.xml +++ b/continew-starter-security/continew-starter-security-password/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-security ${revision} diff --git a/continew-starter-security/continew-starter-security-password/src/main/java/top/charles7c/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java b/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java similarity index 95% rename from continew-starter-security/continew-starter-security-password/src/main/java/top/charles7c/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java rename to continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java index 11c8a622..13a5d273 100644 --- a/continew-starter-security/continew-starter-security-password/src/main/java/top/charles7c/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java +++ b/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.password.autoconfigure; +package top.continew.starter.security.password.autoconfigure; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -30,8 +30,8 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.factory.PasswordEncoderFactories; import org.springframework.security.crypto.password.*; import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.util.validate.CheckUtils; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.util.validate.CheckUtils; import java.util.HashMap; import java.util.List; @@ -55,8 +55,8 @@ import java.util.Map; @EnableConfigurationProperties(PasswordEncoderProperties.class) @ConditionalOnProperty(prefix = PropertiesConstants.PASSWORD, name = PropertiesConstants.ENABLED, havingValue = "true") public class PasswordEncoderAutoConfiguration { - private static final Logger log = LoggerFactory.getLogger(PasswordEncoderAutoConfiguration.class); + private static final Logger log = LoggerFactory.getLogger(PasswordEncoderAutoConfiguration.class); private final PasswordEncoderProperties properties; public PasswordEncoderAutoConfiguration(PasswordEncoderProperties properties) { diff --git a/continew-starter-security/continew-starter-security-password/src/main/java/top/charles7c/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java b/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java similarity index 90% rename from continew-starter-security/continew-starter-security-password/src/main/java/top/charles7c/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java rename to continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java index 1a539c09..6b552ef2 100644 --- a/continew-starter-security/continew-starter-security-password/src/main/java/top/charles7c/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java +++ b/continew-starter-security/continew-starter-security-password/src/main/java/top/continew/starter/security/password/autoconfigure/PasswordEncoderProperties.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.security.password.autoconfigure; +package top.continew.starter.security.password.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; /** * 密码编解码配置属性 diff --git a/continew-starter-security/continew-starter-security-password/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-security/continew-starter-security-password/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 2923ec65..2f8e9a6b 100644 --- a/continew-starter-security/continew-starter-security-password/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-security/continew-starter-security-password/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.security.password.autoconfigure.PasswordEncoderAutoConfiguration \ No newline at end of file +top.continew.starter.security.password.autoconfigure.PasswordEncoderAutoConfiguration \ No newline at end of file diff --git a/continew-starter-security/pom.xml b/continew-starter-security/pom.xml index cd8a400b..de64c35f 100644 --- a/continew-starter-security/pom.xml +++ b/continew-starter-security/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -23,7 +23,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-storage/continew-starter-storage-local/pom.xml b/continew-starter-storage/continew-starter-storage-local/pom.xml index 6f6348b0..0ee4e8ea 100644 --- a/continew-starter-storage/continew-starter-storage-local/pom.xml +++ b/continew-starter-storage/continew-starter-storage-local/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-storage ${revision} diff --git a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java similarity index 93% rename from continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java rename to continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java index 08eeb580..19700481 100644 --- a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java +++ b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/local/autoconfigure/LocalStorageAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.storage.local.autoconfigure; +package top.continew.starter.storage.local.autoconfigure; import cn.hutool.core.text.CharSequenceUtil; import jakarta.annotation.PostConstruct; @@ -26,8 +26,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.Map; diff --git a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageProperties.java b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/local/autoconfigure/LocalStorageProperties.java similarity index 94% rename from continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageProperties.java rename to continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/local/autoconfigure/LocalStorageProperties.java index a82535ee..a8255430 100644 --- a/continew-starter-storage/continew-starter-storage-local/src/main/java/top/charles7c/continew/starter/storage/local/autoconfigure/LocalStorageProperties.java +++ b/continew-starter-storage/continew-starter-storage-local/src/main/java/top/continew/starter/storage/local/autoconfigure/LocalStorageProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.storage.local.autoconfigure; +package top.continew.starter.storage.local.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.util.unit.DataSize; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; import java.util.HashMap; import java.util.Map; diff --git a/continew-starter-storage/continew-starter-storage-local/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-storage/continew-starter-storage-local/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 198f26c8..93613475 100644 --- a/continew-starter-storage/continew-starter-storage-local/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-storage/continew-starter-storage-local/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -top.charles7c.continew.starter.storage.local.autoconfigure.LocalStorageAutoConfiguration \ No newline at end of file +top.continew.starter.storage.local.autoconfigure.LocalStorageAutoConfiguration \ No newline at end of file diff --git a/continew-starter-storage/pom.xml b/continew-starter-storage/pom.xml index 5ee7fd53..3c34cc51 100644 --- a/continew-starter-storage/pom.xml +++ b/continew-starter-storage/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -20,7 +20,7 @@ - top.charles7c.continew + top.continew continew-starter-core diff --git a/continew-starter-web/pom.xml b/continew-starter-web/pom.xml index 8ba5db00..88e2317f 100644 --- a/continew-starter-web/pom.xml +++ b/continew-starter-web/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter ${revision} @@ -53,13 +53,13 @@ - top.charles7c.continew + top.continew continew-starter-api-doc - top.charles7c.continew + top.continew continew-starter-json-jackson diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/annotation/EnableGlobalExceptionHandler.java b/continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalExceptionHandler.java similarity index 86% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/annotation/EnableGlobalExceptionHandler.java rename to continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalExceptionHandler.java index bbdffea8..78371cbc 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/annotation/EnableGlobalExceptionHandler.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/annotation/EnableGlobalExceptionHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.annotation; +package top.continew.starter.web.annotation; import org.springframework.context.annotation.Import; -import top.charles7c.continew.starter.web.autoconfigure.exception.GlobalExceptionHandlerAutoConfiguration; +import top.continew.starter.web.autoconfigure.exception.GlobalExceptionHandlerAutoConfiguration; import java.lang.annotation.*; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java similarity index 94% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java index e9da787c..6e46a975 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.cors; +package top.continew.starter.web.autoconfigure.cors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,8 +28,8 @@ import org.springframework.context.annotation.Lazy; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.StringConstants; /** * 跨域自动配置 diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/cors/CorsProperties.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java similarity index 92% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/cors/CorsProperties.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java index dc3d987b..f6f0ab18 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/cors/CorsProperties.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/cors/CorsProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.cors; +package top.continew.starter.web.autoconfigure.cors; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.ArrayList; import java.util.Collections; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalErrorHandler.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalErrorHandler.java similarity index 97% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalErrorHandler.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalErrorHandler.java index 916683fa..6a1b0ffc 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalErrorHandler.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalErrorHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.exception; +package top.continew.starter.web.autoconfigure.exception; import cn.hutool.core.bean.BeanUtil; import cn.hutool.json.JSONUtil; @@ -33,7 +33,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.web.model.R; import java.io.IOException; import java.util.List; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java similarity index 95% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java index 4c2c3cd8..98398eb5 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.exception; +package top.continew.starter.web.autoconfigure.exception; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; @@ -33,10 +33,10 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; import org.springframework.web.multipart.MaxUploadSizeExceededException; -import top.charles7c.continew.starter.core.constant.StringConstants; -import top.charles7c.continew.starter.core.exception.BadRequestException; -import top.charles7c.continew.starter.core.exception.BusinessException; -import top.charles7c.continew.starter.web.model.R; +import top.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.exception.BadRequestException; +import top.continew.starter.core.exception.BusinessException; +import top.continew.starter.web.model.R; /** * 全局异常处理器 diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandlerAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalExceptionHandlerAutoConfiguration.java similarity index 97% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandlerAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalExceptionHandlerAutoConfiguration.java index e2df7733..93bc3899 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/exception/GlobalExceptionHandlerAutoConfiguration.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/exception/GlobalExceptionHandlerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.exception; +package top.continew.starter.web.autoconfigure.exception; import jakarta.annotation.PostConstruct; import jakarta.validation.Validation; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogProperties.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogProperties.java similarity index 96% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogProperties.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogProperties.java index 1d21813d..a65b623e 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogProperties.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.trace; +package top.continew.starter.web.autoconfigure.trace; /** * TLog 配置属性 diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogServletFilter.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogServletFilter.java similarity index 97% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogServletFilter.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogServletFilter.java index c2eecc17..9f7ffbb8 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogServletFilter.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogServletFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.trace; +package top.continew.starter.web.autoconfigure.trace; import cn.hutool.core.text.CharSequenceUtil; import com.yomahub.tlog.context.TLogContext; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogWebCommon.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogWebCommon.java similarity index 97% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogWebCommon.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogWebCommon.java index a2ac1d60..14d4c0f3 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TLogWebCommon.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TLogWebCommon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.trace; +package top.continew.starter.web.autoconfigure.trace; import com.yomahub.tlog.constant.TLogConstants; import com.yomahub.tlog.core.rpc.TLogLabelBean; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java similarity index 96% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java index a6b2a245..5a18e09a 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.trace; +package top.continew.starter.web.autoconfigure.trace; import com.yomahub.tlog.id.TLogIdGenerator; import com.yomahub.tlog.id.TLogIdGeneratorLoader; @@ -31,7 +31,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.core.Ordered; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; /** * 链路跟踪自动配置 diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceIdGenerator.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceIdGenerator.java similarity index 93% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceIdGenerator.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceIdGenerator.java index b62617ad..0c9edfa3 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceIdGenerator.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceIdGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.trace; +package top.continew.starter.web.autoconfigure.trace; import com.yomahub.tlog.id.TLogIdGenerator; import com.yomahub.tlog.id.snowflake.UniqueIdGenerator; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceProperties.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceProperties.java similarity index 92% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceProperties.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceProperties.java index b90df2c7..e88e1fbb 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/trace/TraceProperties.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/trace/TraceProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.trace; +package top.continew.starter.web.autoconfigure.trace; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; /** * 链路跟踪配置属性 diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java similarity index 92% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java index 3cc8d106..ae752e6b 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.xss; +package top.continew.starter.web.autoconfigure.xss; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.core.constant.PropertiesConstants; /** * XSS 过滤自动配置 diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssFilter.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssFilter.java similarity index 98% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssFilter.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssFilter.java index d0d00d23..413f521d 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssFilter.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.xss; +package top.continew.starter.web.autoconfigure.xss; import cn.hutool.core.collection.CollectionUtil; import jakarta.servlet.*; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssProperties.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssProperties.java similarity index 91% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssProperties.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssProperties.java index cb0f3009..c456b676 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssProperties.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssProperties.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.xss; +package top.continew.starter.web.autoconfigure.xss; import org.springframework.boot.context.properties.ConfigurationProperties; -import top.charles7c.continew.starter.core.constant.PropertiesConstants; -import top.charles7c.continew.starter.web.enums.XssMode; +import top.continew.starter.core.constant.PropertiesConstants; +import top.continew.starter.web.enums.XssMode; import java.util.ArrayList; import java.util.List; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssServletRequestWrapper.java b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssServletRequestWrapper.java similarity index 97% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssServletRequestWrapper.java rename to continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssServletRequestWrapper.java index 0957a190..707b9b76 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/autoconfigure/xss/XssServletRequestWrapper.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/autoconfigure/xss/XssServletRequestWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.autoconfigure.xss; +package top.continew.starter.web.autoconfigure.xss; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.io.IoUtil; @@ -27,7 +27,7 @@ import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; -import top.charles7c.continew.starter.web.enums.XssMode; +import top.continew.starter.web.enums.XssMode; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/enums/XssMode.java b/continew-starter-web/src/main/java/top/continew/starter/web/enums/XssMode.java similarity index 94% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/enums/XssMode.java rename to continew-starter-web/src/main/java/top/continew/starter/web/enums/XssMode.java index 5582b844..4ccbaa11 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/enums/XssMode.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/enums/XssMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.enums; +package top.continew.starter.web.enums; /** * API 类型枚举 diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/model/R.java b/continew-starter-web/src/main/java/top/continew/starter/web/model/R.java similarity index 98% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/model/R.java rename to continew-starter-web/src/main/java/top/continew/starter/web/model/R.java index a07dbfff..55903429 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/model/R.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/model/R.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.model; +package top.continew.starter.web.model; import cn.hutool.core.date.DateUtil; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/FileUploadUtils.java b/continew-starter-web/src/main/java/top/continew/starter/web/util/FileUploadUtils.java similarity index 98% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/FileUploadUtils.java rename to continew-starter-web/src/main/java/top/continew/starter/web/util/FileUploadUtils.java index b4529e25..2bb3dc79 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/FileUploadUtils.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/util/FileUploadUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.util; +package top.continew.starter.web.util; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/ServletUtils.java b/continew-starter-web/src/main/java/top/continew/starter/web/util/ServletUtils.java similarity index 96% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/ServletUtils.java rename to continew-starter-web/src/main/java/top/continew/starter/web/util/ServletUtils.java index 382e1df9..9d302c21 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/ServletUtils.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/util/ServletUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.util; +package top.continew.starter.web.util; import cn.hutool.core.map.MapUtil; import cn.hutool.http.useragent.UserAgent; @@ -23,7 +23,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.*; diff --git a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/SpringWebUtils.java b/continew-starter-web/src/main/java/top/continew/starter/web/util/SpringWebUtils.java similarity index 97% rename from continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/SpringWebUtils.java rename to continew-starter-web/src/main/java/top/continew/starter/web/util/SpringWebUtils.java index 471c1a80..4ce6689c 100644 --- a/continew-starter-web/src/main/java/top/charles7c/continew/starter/web/util/SpringWebUtils.java +++ b/continew-starter-web/src/main/java/top/continew/starter/web/util/SpringWebUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.continew.starter.web.util; +package top.continew.starter.web.util; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -26,7 +26,7 @@ import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; import org.springframework.web.util.UrlPathHelper; -import top.charles7c.continew.starter.core.constant.StringConstants; +import top.continew.starter.core.constant.StringConstants; import java.util.Map; diff --git a/continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 5be50379..44b71c06 100644 --- a/continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/continew-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -top.charles7c.continew.starter.web.autoconfigure.cors.CorsAutoConfiguration -top.charles7c.continew.starter.web.autoconfigure.trace.TraceAutoConfiguration -top.charles7c.continew.starter.web.autoconfigure.xss.XssAutoConfiguration \ No newline at end of file +top.continew.starter.web.autoconfigure.cors.CorsAutoConfiguration +top.continew.starter.web.autoconfigure.trace.TraceAutoConfiguration +top.continew.starter.web.autoconfigure.xss.XssAutoConfiguration \ No newline at end of file diff --git a/pom.xml b/pom.xml index f6852511..72568bc7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - top.charles7c.continew + top.continew continew-starter-dependencies ${revision} ./continew-starter-dependencies