diff --git a/README-zh.md b/README-zh.md index e78fe60501a076c8d885e54d5c21e16c9386ac0b..5d1a63e329f44daab6f692fc24d25344964b8391 100644 --- a/README-zh.md +++ b/README-zh.md @@ -333,8 +333,8 @@ spring-boot-plus/bootstrap/src/main/java/io/geekidea/springbootplus/SpringBootPl @EnableTransactionManagement @EnableConfigurationProperties @ServletComponentScan -@MapperScan({"io.geekidea.springbootplus.**.mapper", "com.example.**.mapper"}) -@SpringBootApplication(scanBasePackages = {"io.geekidea.springbootplus", "com.example"}) +@MapperScan({"io.geekidea.boot.**.mapper", "com.example.**.mapper"}) +@SpringBootApplication(scanBasePackages = {"io.geekidea.boot", "com.example"}) public class SpringBootPlusApplication { public static void main(String[] args) { diff --git a/README.md b/README.md index 47fde71ca511bb9a862fda50bab5e3ace9a45492..7ec23a7be3db2cf5bf05bcc86b0f510fe12df38e 100644 --- a/README.md +++ b/README.md @@ -335,8 +335,8 @@ spring-boot-plus/bootstrap/src/main/java/io/geekidea/springbootplus/SpringBootPl @EnableTransactionManagement @EnableConfigurationProperties @ServletComponentScan -@MapperScan({"io.geekidea.springbootplus.**.mapper", "com.example.**.mapper"}) -@SpringBootApplication(scanBasePackages = {"io.geekidea.springbootplus", "com.example"}) +@MapperScan({"io.geekidea.boot.**.mapper", "com.example.**.mapper"}) +@SpringBootApplication(scanBasePackages = {"io.geekidea.boot", "com.example"}) public class SpringBootPlusApplication { public static void main(String[] args) { diff --git a/admin/pom.xml b/admin/pom.xml index fca4af827d8aaf61a3e9eaa65aa591cb0751c4a3..d981fbf6122d67d52ca24d4d6616ab27cfd07cee 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -20,9 +20,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT admin diff --git a/admin/src/main/java/io/geekidea/springbootplus/admin/SpringBootPlusAdminApplication.java b/admin/src/main/java/io/geekidea/boot/admin/SpringBootPlusAdminApplication.java similarity index 95% rename from admin/src/main/java/io/geekidea/springbootplus/admin/SpringBootPlusAdminApplication.java rename to admin/src/main/java/io/geekidea/boot/admin/SpringBootPlusAdminApplication.java index 0096867965e84ee0e9685896112e191ea0f63552..0be70e4c00cc8d84df95d6e414d5ef26850ebbd4 100644 --- a/admin/src/main/java/io/geekidea/springbootplus/admin/SpringBootPlusAdminApplication.java +++ b/admin/src/main/java/io/geekidea/boot/admin/SpringBootPlusAdminApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.admin; +package io.geekidea.boot.admin; import de.codecentric.boot.admin.server.config.EnableAdminServer; import lombok.extern.slf4j.Slf4j; @@ -43,6 +43,7 @@ public class SpringBootPlusAdminApplication { ConfigurableEnvironment environment = context.getEnvironment(); String serverPort = environment.getProperty("server.port"); log.info("SpringBootAdmin: http://localhost:" + serverPort); + log.info("登录账号密码: admin/admin"); } } diff --git a/admin/src/main/java/io/geekidea/springbootplus/admin/config/AdminWebMvcConfig.java b/admin/src/main/java/io/geekidea/boot/admin/config/AdminWebMvcConfig.java similarity index 96% rename from admin/src/main/java/io/geekidea/springbootplus/admin/config/AdminWebMvcConfig.java rename to admin/src/main/java/io/geekidea/boot/admin/config/AdminWebMvcConfig.java index 70112385f2b19e55b31e8a778eba162c60e69ec2..8cc3ca64a24934ec3899d786a9877edd03626eb6 100644 --- a/admin/src/main/java/io/geekidea/springbootplus/admin/config/AdminWebMvcConfig.java +++ b/admin/src/main/java/io/geekidea/boot/admin/config/AdminWebMvcConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.admin.config; +package io.geekidea.boot.admin.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; diff --git a/admin/src/main/java/io/geekidea/springbootplus/admin/config/SecuritySecureConfig.java b/admin/src/main/java/io/geekidea/boot/admin/config/SecuritySecureConfig.java similarity index 98% rename from admin/src/main/java/io/geekidea/springbootplus/admin/config/SecuritySecureConfig.java rename to admin/src/main/java/io/geekidea/boot/admin/config/SecuritySecureConfig.java index 1d7df8232759ec173e5923324dfaadbb4e1bcd92..4529dc74bfd16afe7fb71e56b3970c785dd53cba 100644 --- a/admin/src/main/java/io/geekidea/springbootplus/admin/config/SecuritySecureConfig.java +++ b/admin/src/main/java/io/geekidea/boot/admin/config/SecuritySecureConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.admin.config; +package io.geekidea.boot.admin.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.beans.factory.annotation.Value; diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 60b39a76a05dd1cd00f9b3b36ce2cf1190de9876..4098a7ec7f0e0f5bfdba7db821397f10299d349e 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -20,9 +20,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT bootstrap @@ -36,19 +36,19 @@ ${spring-boot-admin.version} - io.geekidea.springbootplus + io.geekidea.boot framework - io.geekidea.springbootplus + io.geekidea.boot example - io.geekidea.springbootplus + io.geekidea.boot system - io.geekidea.springbootplus + io.geekidea.boot scheduled diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java b/bootstrap/src/main/java/io/geekidea/boot/SpringBootPlusApplication.java similarity index 86% rename from bootstrap/src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java rename to bootstrap/src/main/java/io/geekidea/boot/SpringBootPlusApplication.java index 82dda088a7834b058b9f9bb62504fe2352af3c9d..ccc44f36f432df0eb02d16d950627ee1a2e572e3 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java +++ b/bootstrap/src/main/java/io/geekidea/boot/SpringBootPlusApplication.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus; +package io.geekidea.boot; -import io.geekidea.springbootplus.framework.util.PrintApplicationInfo; +import io.geekidea.boot.framework.util.PrintApplicationInfo; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -38,8 +38,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement @EnableConfigurationProperties @ServletComponentScan -@MapperScan({"io.geekidea.springbootplus.**.mapper", "com.example.**.mapper"}) -@SpringBootApplication(scanBasePackages = {"io.geekidea.springbootplus", "com.example"}) +@MapperScan({"io.geekidea.boot.**.mapper", "com.example.**.mapper"}) +@SpringBootApplication(scanBasePackages = {"io.geekidea.boot", "com.example"}) public class SpringBootPlusApplication { public static void main(String[] args) { diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/aop/LogAop.java b/bootstrap/src/main/java/io/geekidea/boot/aop/LogAop.java similarity index 88% rename from bootstrap/src/main/java/io/geekidea/springbootplus/aop/LogAop.java rename to bootstrap/src/main/java/io/geekidea/boot/aop/LogAop.java index 31b6ab248c38cb419681f072aece5fdb49411ba9..b8a2416bffabd70c76fe48bbfb0aa7654ce0032a 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/aop/LogAop.java +++ b/bootstrap/src/main/java/io/geekidea/boot/aop/LogAop.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.geekidea.springbootplus.aop; +package io.geekidea.boot.aop; -import io.geekidea.springbootplus.framework.log.aop.BaseLogAop; -import io.geekidea.springbootplus.framework.log.bean.OperationLogInfo; -import io.geekidea.springbootplus.framework.log.bean.RequestInfo; +import io.geekidea.boot.framework.log.aop.BaseLogAop; +import io.geekidea.boot.framework.log.bean.OperationLogInfo; +import io.geekidea.boot.framework.log.bean.RequestInfo; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; @@ -47,7 +47,7 @@ public class LogAop extends BaseLogAop { * 切点 */ private static final String POINTCUT = - "execution(public * io.geekidea.springbootplus..*.controller..*.*(..)) || " + + "execution(public * io.geekidea.boot..*.controller..*.*(..)) || " + "execution(public * com.example..*.controller..*.*(..))"; @Around(POINTCUT) diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/JacksonConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/JacksonConfig.java similarity index 87% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/JacksonConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/JacksonConfig.java index 9efd9775fc74fdc45707fae4847de8b0db5330c7..370ba48fb2c5d9ca2315777a8b018ee8a1dd8f38 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/JacksonConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/JacksonConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -28,13 +28,13 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import io.geekidea.springbootplus.config.constant.DatePattern; -import io.geekidea.springbootplus.framework.config.jackson.deserializer.JacksonDateDeserializer; -import io.geekidea.springbootplus.framework.config.jackson.deserializer.JacksonDoubleDeserializer; -import io.geekidea.springbootplus.framework.config.jackson.serializer.JacksonDateSerializer; -import io.geekidea.springbootplus.framework.config.jackson.serializer.JacksonIntegerDeserializer; -import io.geekidea.springbootplus.framework.core.xss.XssJacksonDeserializer; -import io.geekidea.springbootplus.framework.core.xss.XssJacksonSerializer; +import io.geekidea.boot.config.constant.DatePattern; +import io.geekidea.boot.framework.config.jackson.deserializer.JacksonDateDeserializer; +import io.geekidea.boot.framework.config.jackson.deserializer.JacksonDoubleDeserializer; +import io.geekidea.boot.framework.config.jackson.serializer.JacksonDateSerializer; +import io.geekidea.boot.framework.config.jackson.serializer.JacksonIntegerDeserializer; +import io.geekidea.boot.framework.core.xss.XssJacksonDeserializer; +import io.geekidea.boot.framework.core.xss.XssJacksonSerializer; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/MybatisPlusConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/MybatisPlusConfig.java similarity index 97% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/MybatisPlusConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/MybatisPlusConfig.java index fe7f3d5586cad62224c831b1349cedb6773f0f37..e0eef01793caa9018525192096de7cd1538af217 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/MybatisPlusConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/MybatisPlusConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisCacheConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/RedisCacheConfig.java similarity index 98% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisCacheConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/RedisCacheConfig.java index 2a1e8ffb4f9f90d9e3a94b6f95d2ba8f3f28819f..650f543a32c281fa0127ac29dfbab96feb34b352 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisCacheConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/RedisCacheConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurerSupport; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisTemplateConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/RedisTemplateConfig.java similarity index 98% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisTemplateConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/RedisTemplateConfig.java index 7e66baba628f2f39024cad89df4c194306e63b62..833d8eb3ad166efeff5cbba8c5f2f6c57ab091b7 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/RedisTemplateConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/RedisTemplateConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/RestTemplateConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/RestTemplateConfig.java similarity index 97% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/RestTemplateConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/RestTemplateConfig.java index baf2b99fec1526576fd777e53938619af219f630..186bafd90bd792123763c2fa6d6a7a88ff6b2902 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/RestTemplateConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/RestTemplateConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/ShiroConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/ShiroConfig.java similarity index 93% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/ShiroConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/ShiroConfig.java index e3598f5afa1264af978953fedf2530c1f2f9e24a..899fdf84a07e38f5ad24ce426b72b3e66f676496 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/ShiroConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/ShiroConfig.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import com.alibaba.fastjson.JSON; -import io.geekidea.springbootplus.config.properties.JwtProperties; -import io.geekidea.springbootplus.config.properties.ShiroPermissionProperties; -import io.geekidea.springbootplus.config.properties.ShiroProperties; -import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService; -import io.geekidea.springbootplus.framework.shiro.exception.ShiroConfigException; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtCredentialsMatcher; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtFilter; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtRealm; -import io.geekidea.springbootplus.framework.shiro.service.ShiroLoginService; -import io.geekidea.springbootplus.framework.util.IniUtil; +import io.geekidea.boot.config.properties.JwtProperties; +import io.geekidea.boot.config.properties.ShiroPermissionProperties; +import io.geekidea.boot.config.properties.ShiroProperties; +import io.geekidea.boot.framework.shiro.cache.LoginRedisService; +import io.geekidea.boot.framework.shiro.exception.ShiroConfigException; +import io.geekidea.boot.framework.shiro.jwt.JwtCredentialsMatcher; +import io.geekidea.boot.framework.shiro.jwt.JwtFilter; +import io.geekidea.boot.framework.shiro.jwt.JwtRealm; +import io.geekidea.boot.framework.shiro.service.ShiroLoginService; +import io.geekidea.boot.framework.util.IniUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusConfig.java similarity index 94% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusConfig.java index 4cfd1008cfe38d2874d162c835862665e96a1383..611653bcdc8f820e19233beee7e6a473389fc11a 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import lombok.extern.slf4j.Slf4j; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusCorsConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusCorsConfig.java similarity index 95% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusCorsConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusCorsConfig.java index 077f512169162fd157fe463ef1b71bf9c05e0c2b..e9a35e7561f08735d7d9b595c1bc71e7ace3380f 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusCorsConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusCorsConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; -import io.geekidea.springbootplus.config.properties.SpringBootPlusCorsProperties; +import io.geekidea.boot.config.properties.SpringBootPlusCorsProperties; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusWebMvcConfig.java b/bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusWebMvcConfig.java similarity index 89% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusWebMvcConfig.java rename to bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusWebMvcConfig.java index 67498454a315cd6f13897802426bb2df28c0358c..bc86f3c55fc6b0828dff659d8c49d6d5c469387c 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/SpringBootPlusWebMvcConfig.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/SpringBootPlusWebMvcConfig.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import com.alibaba.fastjson.JSON; -import io.geekidea.springbootplus.config.properties.SpringBootPlusFilterProperties; -import io.geekidea.springbootplus.config.properties.SpringBootPlusInterceptorProperties; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.core.filter.RequestDetailFilter; -import io.geekidea.springbootplus.framework.core.interceptor.PermissionInterceptor; -import io.geekidea.springbootplus.framework.core.xss.XssFilter; -import io.geekidea.springbootplus.framework.util.IniUtil; -import io.geekidea.springbootplus.system.interceptor.DownloadInterceptor; -import io.geekidea.springbootplus.system.interceptor.ResourceInterceptor; -import io.geekidea.springbootplus.system.interceptor.UploadInterceptor; +import io.geekidea.boot.config.properties.SpringBootPlusFilterProperties; +import io.geekidea.boot.config.properties.SpringBootPlusInterceptorProperties; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.core.filter.RequestDetailFilter; +import io.geekidea.boot.framework.core.interceptor.PermissionInterceptor; +import io.geekidea.boot.framework.core.xss.XssFilter; +import io.geekidea.boot.framework.util.IniUtil; +import io.geekidea.boot.system.interceptor.DownloadInterceptor; +import io.geekidea.boot.system.interceptor.ResourceInterceptor; +import io.geekidea.boot.system.interceptor.UploadInterceptor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/config/Swagger2Config.java b/bootstrap/src/main/java/io/geekidea/boot/config/Swagger2Config.java similarity index 98% rename from bootstrap/src/main/java/io/geekidea/springbootplus/config/Swagger2Config.java rename to bootstrap/src/main/java/io/geekidea/boot/config/Swagger2Config.java index ac027f3c53de0da352ceaeb261821ccbf1b044d5..c1f7894ecadcffaac738d8bebbb3aa88ea73d2b8 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/config/Swagger2Config.java +++ b/bootstrap/src/main/java/io/geekidea/boot/config/Swagger2Config.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config; +package io.geekidea.boot.config; import com.fasterxml.jackson.databind.introspect.AnnotatedField; import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition; @@ -22,8 +22,8 @@ import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; -import io.geekidea.springbootplus.config.properties.SwaggerProperties; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusConfigException; +import io.geekidea.boot.config.properties.SwaggerProperties; +import io.geekidea.boot.framework.common.exception.SpringBootPlusConfigException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; diff --git a/bootstrap/src/main/java/io/geekidea/springbootplus/handler/GlobalExceptionHandler.java b/bootstrap/src/main/java/io/geekidea/boot/handler/GlobalExceptionHandler.java similarity index 92% rename from bootstrap/src/main/java/io/geekidea/springbootplus/handler/GlobalExceptionHandler.java rename to bootstrap/src/main/java/io/geekidea/boot/handler/GlobalExceptionHandler.java index 9c8828d234486012cae923070a567344e101d0b9..c3757cf11d7329c05a23e1ec683c4397c29de854 100644 --- a/bootstrap/src/main/java/io/geekidea/springbootplus/handler/GlobalExceptionHandler.java +++ b/bootstrap/src/main/java/io/geekidea/boot/handler/GlobalExceptionHandler.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.geekidea.springbootplus.handler; +package io.geekidea.boot.handler; import com.alibaba.fastjson.JSON; import com.auth0.jwt.exceptions.JWTDecodeException; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.exception.BusinessException; -import io.geekidea.springbootplus.framework.common.exception.DaoException; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException; -import io.geekidea.springbootplus.framework.core.bean.RequestDetail; -import io.geekidea.springbootplus.framework.core.util.RequestDetailThreadLocal; -import io.geekidea.springbootplus.system.exception.SysLoginException; -import io.geekidea.springbootplus.system.exception.VerificationCodeException; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.exception.BusinessException; +import io.geekidea.boot.framework.common.exception.DaoException; +import io.geekidea.boot.framework.common.exception.SpringBootPlusException; +import io.geekidea.boot.framework.core.bean.RequestDetail; +import io.geekidea.boot.framework.core.util.RequestDetailThreadLocal; +import io.geekidea.boot.system.exception.SysLoginException; +import io.geekidea.boot.system.exception.VerificationCodeException; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authz.UnauthenticatedException; diff --git a/bootstrap/src/test/java/io/geekidea/springbootplus/test/BaseTest.java b/bootstrap/src/test/java/io/geekidea/boot/test/BaseTest.java similarity index 90% rename from bootstrap/src/test/java/io/geekidea/springbootplus/test/BaseTest.java rename to bootstrap/src/test/java/io/geekidea/boot/test/BaseTest.java index 22dcddf24f0f9716a5c92d42965569df7174514b..3c9743208a747cbfc19442bbc728633eed2e94cd 100644 --- a/bootstrap/src/test/java/io/geekidea/springbootplus/test/BaseTest.java +++ b/bootstrap/src/test/java/io/geekidea/boot/test/BaseTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.test; +package io.geekidea.boot.test; -import io.geekidea.springbootplus.SpringBootPlusApplication; +import io.geekidea.boot.SpringBootPlusApplication; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; diff --git a/bootstrap/src/test/java/io/geekidea/springbootplus/test/FooBarMapperTest.java b/bootstrap/src/test/java/io/geekidea/boot/test/FooBarMapperTest.java similarity index 97% rename from bootstrap/src/test/java/io/geekidea/springbootplus/test/FooBarMapperTest.java rename to bootstrap/src/test/java/io/geekidea/boot/test/FooBarMapperTest.java index f53872c876f2620b60e83a65f93240466c2c621f..a827743217345f340e786e043c63b99f881a8d7a 100644 --- a/bootstrap/src/test/java/io/geekidea/springbootplus/test/FooBarMapperTest.java +++ b/bootstrap/src/test/java/io/geekidea/boot/test/FooBarMapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.test; +package io.geekidea.boot.test; import com.example.foobar.entity.FooBar; import com.example.foobar.mapper.FooBarMapper; diff --git a/config/pom.xml b/config/pom.xml index 0280db6619ddf7ef20cae6a3f5fff69854c003a1..8b5698e9f7f90871e6fdccf53ef4db292a3f17e9 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT config diff --git a/config/src/main/java/io/geekidea/springbootplus/config/constant/CacheKey.java b/config/src/main/java/io/geekidea/boot/config/constant/CacheKey.java similarity index 93% rename from config/src/main/java/io/geekidea/springbootplus/config/constant/CacheKey.java rename to config/src/main/java/io/geekidea/boot/config/constant/CacheKey.java index 8d348c8f5dacfb5f5993b80ee59ccfb34dbcefc9..7585cfa4b6299592b08fb45689e8d6158bccd3fe 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/constant/CacheKey.java +++ b/config/src/main/java/io/geekidea/boot/config/constant/CacheKey.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.constant; +package io.geekidea.boot.config.constant; /** * 可排序查询参数对象 diff --git a/config/src/main/java/io/geekidea/springbootplus/config/constant/CommonConstant.java b/config/src/main/java/io/geekidea/boot/config/constant/CommonConstant.java similarity index 98% rename from config/src/main/java/io/geekidea/springbootplus/config/constant/CommonConstant.java rename to config/src/main/java/io/geekidea/boot/config/constant/CommonConstant.java index 634d3d27bc7ef9e18a95950b1dd43cbfdabad897..78999d43dbb8432d527637eb7eed86ad30e7bba3 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/constant/CommonConstant.java +++ b/config/src/main/java/io/geekidea/boot/config/constant/CommonConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.constant; +package io.geekidea.boot.config.constant; /** * 公共常量 diff --git a/config/src/main/java/io/geekidea/springbootplus/config/constant/CommonRedisKey.java b/config/src/main/java/io/geekidea/boot/config/constant/CommonRedisKey.java similarity index 96% rename from config/src/main/java/io/geekidea/springbootplus/config/constant/CommonRedisKey.java rename to config/src/main/java/io/geekidea/boot/config/constant/CommonRedisKey.java index f3d79bd1105177fbef18d5e9a765f9389dd9b8e4..77cdae77191efed958fc9359b4e0fdd4c0c60d8b 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/constant/CommonRedisKey.java +++ b/config/src/main/java/io/geekidea/boot/config/constant/CommonRedisKey.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.constant; +package io.geekidea.boot.config.constant; /** *

diff --git a/config/src/main/java/io/geekidea/springbootplus/config/constant/DatePattern.java b/config/src/main/java/io/geekidea/boot/config/constant/DatePattern.java similarity index 96% rename from config/src/main/java/io/geekidea/springbootplus/config/constant/DatePattern.java rename to config/src/main/java/io/geekidea/boot/config/constant/DatePattern.java index a7d5735e6da3fcd4a4452b0e66d23af49e703122..3478c6598b18519695adfe07e365efd3911f9804 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/constant/DatePattern.java +++ b/config/src/main/java/io/geekidea/boot/config/constant/DatePattern.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.constant; +package io.geekidea.boot.config.constant; /** *

diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/JwtProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/JwtProperties.java similarity index 94% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/JwtProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/JwtProperties.java index c66377eff9ef0b4ec838fb9d14ab23c9e9f595f6..8d04832b8cc703a0d3c5213c1db01293f08dc98b 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/JwtProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/JwtProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; -import io.geekidea.springbootplus.config.constant.CommonConstant; +import io.geekidea.boot.config.constant.CommonConstant; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroPermissionProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/ShiroPermissionProperties.java similarity index 94% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroPermissionProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/ShiroPermissionProperties.java index 39847e93d0764479131c567dc7ed370c4c876739..1754442e42663d0e3da0741a9735469f8e4a415c 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroPermissionProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/ShiroPermissionProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/ShiroProperties.java similarity index 96% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/ShiroProperties.java index 3acc6ba3e8c3ed6ae871e60bde2fdd4c8e31fd57..bcf9e35a93b1b0bc0bccae20d92e86f53e5b56da 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/ShiroProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/ShiroProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusAopProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusAopProperties.java similarity index 98% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusAopProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusAopProperties.java index d294b60ff5582fcdb5cdfc321d3f54675249c85d..d3a087261153c2b2b6b68efc893fb2347ff0ba69 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusAopProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusAopProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusCorsProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusCorsProperties.java similarity index 97% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusCorsProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusCorsProperties.java index b6eda2b46a2a4b366cdd0202c78274c04e67355e..83585a642336ac1e9836692a50783b105ebbc968 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusCorsProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusCorsProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusFilterProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusFilterProperties.java similarity index 96% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusFilterProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusFilterProperties.java index 16fc40d8868e1b64a2dde4d23171ad3dfeb04fd7..258c69df3a2f6f3bd8e5ec3ee0fc5fe0ff4ab90e 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusFilterProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusFilterProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusInterceptorProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusInterceptorProperties.java similarity index 97% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusInterceptorProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusInterceptorProperties.java index 5224a78361db7b1af7fe5ce7e89501ef7c61a93f..1855b5e32a3598d4338a21f6b93b587f98c8cfba 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusInterceptorProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusInterceptorProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusProperties.java similarity index 98% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusProperties.java index b486ad9ea78403db3ae767fab5ff2dcad9e79c1b..b0c75dda999aefd1b71153c2a439f3ce74052251 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusStaticProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusStaticProperties.java similarity index 96% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusStaticProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusStaticProperties.java index 5e338c8bb9c3e9bff9e5ead51dbd9dff74a787b4..94cc0017ea23c150fc621fd0e36f307715f8c187 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/SpringBootPlusStaticProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/SpringBootPlusStaticProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/config/src/main/java/io/geekidea/springbootplus/config/properties/SwaggerProperties.java b/config/src/main/java/io/geekidea/boot/config/properties/SwaggerProperties.java similarity index 98% rename from config/src/main/java/io/geekidea/springbootplus/config/properties/SwaggerProperties.java rename to config/src/main/java/io/geekidea/boot/config/properties/SwaggerProperties.java index c400475b0e237c05106db583e31cbcf4838c078f..a5a3a3406194c9d2839b0b10f1a1511bfc65032a 100644 --- a/config/src/main/java/io/geekidea/springbootplus/config/properties/SwaggerProperties.java +++ b/config/src/main/java/io/geekidea/boot/config/properties/SwaggerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.config.properties; +package io.geekidea.boot.config.properties; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/config/src/main/resources/config/application.yml b/config/src/main/resources/config/application.yml index 831a00dd3f2aded5fb2c8642442062d5a57391f9..a90e6875b6546c344f4597d1fdabb0f70843cdc9 100644 --- a/config/src/main/resources/config/application.yml +++ b/config/src/main/resources/config/application.yml @@ -236,7 +236,7 @@ mybatis-plus: # 启动时是否检查MyBatis XML文件是否存在 check-config-location: true # 支持统配符 * 或者 ; 分割 - typeEnumsPackage: io.geekidea.springbootplus.*.enums + typeEnumsPackage: io.geekidea.boot.*.enums # MyBatis原生配置 configuration: # 字段名称下划线转驼峰命名 @@ -302,7 +302,7 @@ spring-boot-plus: enable: true base: # 扫描的包，多个包使用逗号隔开 - package: io.geekidea.springbootplus,com.example + package: io.geekidea.boot,com.example contact: email: geekidea@qq.com name: springboot.plus diff --git a/config/src/main/resources/config/logback.xml b/config/src/main/resources/config/logback.xml index dbe0c96888696319c216883b9cdaeb735418b7d0..df5b4ce76e711c875fa340fad2b72c65d1d95aae 100644 --- a/config/src/main/resources/config/logback.xml +++ b/config/src/main/resources/config/logback.xml @@ -89,7 +89,7 @@ - + diff --git a/distribution/pom.xml b/distribution/pom.xml index 85b89ce7093952e654538001ea2bea925f549b6d..3ecb1e0aaa176b5c8177186dec95309f62d6ba95 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT distribution @@ -35,7 +35,7 @@ release - io.geekidea.springbootplus + io.geekidea.boot bootstrap diff --git a/distribution/release.xml b/distribution/release.xml index b46646fa5909374d972b798f056f7d18f61adef7..81ce21de57b23ce17586b2e006a140c3d56b7375 100644 --- a/distribution/release.xml +++ b/distribution/release.xml @@ -67,7 +67,7 @@ true - io.geekidea.springbootplus:bootstrap + io.geekidea.boot:bootstrap diff --git a/docs/db/mysql_spring_boot_plus.sql b/docs/db/mysql_spring_boot_plus.sql index 1c9f6167cd7295a20602b7dc32e87f47786bde42..d05adc6a9e5c821a4fc4ea5a73c62272143b51ad 100644 --- a/docs/db/mysql_spring_boot_plus.sql +++ b/docs/db/mysql_spring_boot_plus.sql @@ -406,5 +406,5 @@ INSERT INTO sys_login_log (id, request_id, username, ip, area, operator, token, INSERT INTO sys_login_log (id, request_id, username, ip, area, operator, token, type, success, code, exception_message, user_agent, browser_name, browser_version, engine_name, engine_version, os_name, platform_name, mobile, device_name, device_model, remark, create_time, update_time) VALUES (3, '1242814069371625474', 'admin', '127.0.0.1', '本机地址', null, null, 1, 0, null, '用户名或密码错误', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36', 'Chrome', '80.0.3987.149', 'Webkit', '537.36', 'OSX', 'Mac', 0, null, null, null, '2020-03-25 22:02:25', null); INSERT INTO sys_login_log (id, request_id, username, ip, area, operator, token, type, success, code, exception_message, user_agent, browser_name, browser_version, engine_name, engine_version, os_name, platform_name, mobile, device_name, device_model, remark, create_time, update_time) VALUES (4, '1242814192096960513', null, '127.0.0.1', '本机地址', null, null, 2, 0, null, 'token不能为空', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36', 'Chrome', '80.0.3987.149', 'Webkit', '537.36', 'OSX', 'Mac', 0, null, null, null, '2020-03-25 22:02:54', null); -INSERT INTO sys_operation_log (id, request_id, user_id, user_name, name, ip, area, operator, path, module, class_name, method_name, request_method, content_type, request_body, param, token, type, success, code, message, exception_name, exception_message, browser_name, browser_version, engine_name, engine_version, os_name, platform_name, mobile, device_name, device_model, remark, create_time, update_time) VALUES (1, '1242805276474634241', null, null, 'helloWorld', '127.0.0.1', '本机地址', null, '/api/hello/world', null, 'io.geekidea.springbootplus.system.controller.HelloWorldController', 'helloWorld', 'GET', null, 0, null, null, 0, 1, 200, '操作成功', null, null, 'Chrome', '80.0.3987.149', 'Webkit', '537.36', 'OSX', 'Mac', 0, null, null, '', '2020-03-25 21:27:22', null); +INSERT INTO sys_operation_log (id, request_id, user_id, user_name, name, ip, area, operator, path, module, class_name, method_name, request_method, content_type, request_body, param, token, type, success, code, message, exception_name, exception_message, browser_name, browser_version, engine_name, engine_version, os_name, platform_name, mobile, device_name, device_model, remark, create_time, update_time) VALUES (1, '1242805276474634241', null, null, 'helloWorld', '127.0.0.1', '本机地址', null, '/api/hello/world', null, 'io.geekidea.boot.system.controller.HelloWorldController', 'helloWorld', 'GET', null, 0, null, null, 0, 1, 200, '操作成功', null, null, 'Chrome', '80.0.3987.149', 'Webkit', '537.36', 'OSX', 'Mac', 0, null, null, '', '2020-03-25 21:27:22', null); INSERT INTO sys_operation_log (id, request_id, user_id, user_name, name, ip, area, operator, path, module, class_name, method_name, request_method, content_type, request_body, param, token, type, success, code, message, exception_name, exception_message, browser_name, browser_version, engine_name, engine_version, os_name, platform_name, mobile, device_name, device_model, remark, create_time, update_time) VALUES (2, '1242820418688049153', null, null, 'FooBar分页列表', '127.0.0.1', '本机地址', null, '/api/fooBar/getPageList', 'foobar', 'com.example.foobar.controller.FooBarController', 'getFooBarPageList', 'POST', 'application/json', 1, '{"pageIndex":1,"pageSize":10}', null, 7, 1, 200, '操作成功', null, null, 'Chrome', '80.0.3987.149', 'Webkit', '537.36', 'OSX', 'Mac', 0, null, null, '', '2020-03-25 22:27:33', null); diff --git a/example/pom.xml b/example/pom.xml index afed3bd513310886771364f2afa518590aa60663..9929884c2da0c0d81145747efce827555d405b01 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT example @@ -32,7 +32,7 @@ - io.geekidea.springbootplus + io.geekidea.boot framework diff --git a/example/src/main/java/com/example/foobar/controller/FooBarController.java b/example/src/main/java/com/example/foobar/controller/FooBarController.java index a5e98a8c90c157bc90387fe30c52e41fbc5fbe44..97d6059b58f53a614db88b217d3c0dfb083fcdcb 100644 --- a/example/src/main/java/com/example/foobar/controller/FooBarController.java +++ b/example/src/main/java/com/example/foobar/controller/FooBarController.java @@ -19,14 +19,14 @@ package com.example.foobar.controller; import com.example.foobar.entity.FooBar; import com.example.foobar.param.FooBarPageParam; import com.example.foobar.service.FooBarService; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.core.validator.groups.Add; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.core.validator.groups.Add; +import io.geekidea.boot.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/example/src/main/java/com/example/foobar/entity/FooBar.java b/example/src/main/java/com/example/foobar/entity/FooBar.java index 42df4c6502a441a17ea66bdfa6223533dccffc75..db4fcaac4d3ac54e059c962c8572696eabc0e7c3 100644 --- a/example/src/main/java/com/example/foobar/entity/FooBar.java +++ b/example/src/main/java/com/example/foobar/entity/FooBar.java @@ -19,8 +19,8 @@ package com.example.foobar.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.Version; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.core.validator.groups.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/example/src/main/java/com/example/foobar/param/FooBarPageParam.java b/example/src/main/java/com/example/foobar/param/FooBarPageParam.java index 8baca6491c2417faacf960339641f1547f802f67..1d30469280e4cd1b9f00db03f33778c385c72976 100644 --- a/example/src/main/java/com/example/foobar/param/FooBarPageParam.java +++ b/example/src/main/java/com/example/foobar/param/FooBarPageParam.java @@ -16,7 +16,7 @@ package com.example.foobar.param; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/example/src/main/java/com/example/foobar/service/FooBarService.java b/example/src/main/java/com/example/foobar/service/FooBarService.java index 1f9d085751b8a8d1b0a20030937024adc6d2aa13..2347ecb2a572a02fd41c7803e31d2d4e925839db 100644 --- a/example/src/main/java/com/example/foobar/service/FooBarService.java +++ b/example/src/main/java/com/example/foobar/service/FooBarService.java @@ -18,8 +18,8 @@ package com.example.foobar.service; import com.example.foobar.entity.FooBar; import com.example.foobar.param.FooBarPageParam; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; /** * FooBar 服务类 diff --git a/example/src/main/java/com/example/foobar/service/impl/FooBarServiceImpl.java b/example/src/main/java/com/example/foobar/service/impl/FooBarServiceImpl.java index 5488a1225c942a3e99eec8f6a62395287276078e..2057c3b8b84e2328c3aa8d2307c56748f1faf874 100644 --- a/example/src/main/java/com/example/foobar/service/impl/FooBarServiceImpl.java +++ b/example/src/main/java/com/example/foobar/service/impl/FooBarServiceImpl.java @@ -24,10 +24,10 @@ import com.example.foobar.entity.FooBar; import com.example.foobar.mapper.FooBarMapper; import com.example.foobar.param.FooBarPageParam; import com.example.foobar.service.FooBarService; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.OrderMapping; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; -import io.geekidea.springbootplus.framework.core.pagination.Paging; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.OrderMapping; +import io.geekidea.boot.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.core.pagination.Paging; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/example/src/main/java/com/example/order/controller/ExampleOrderController.java b/example/src/main/java/com/example/order/controller/ExampleOrderController.java index f5de7e02994f2df525aca9f5f38b4c8ee67d46b2..4bfd3d3a125b75ed50c289d8dd148e85cd585cad 100644 --- a/example/src/main/java/com/example/order/controller/ExampleOrderController.java +++ b/example/src/main/java/com/example/order/controller/ExampleOrderController.java @@ -20,17 +20,15 @@ import com.example.order.entity.ExampleOrder; import com.example.order.service.ExampleOrderService; import lombok.extern.slf4j.Slf4j; import com.example.order.param.ExampleOrderPageParam; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.common.param.IdParam; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.framework.core.validator.groups.Add; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.core.validator.groups.Add; +import io.geekidea.boot.framework.core.validator.groups.Update; import org.springframework.validation.annotation.Validated; -import org.apache.shiro.authz.annotation.RequiresPermissions; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/example/src/main/java/com/example/order/entity/ExampleOrder.java b/example/src/main/java/com/example/order/entity/ExampleOrder.java index e7a0290b69d1ad833f73a22ee98d750bd83956f3..e6c13c255fad3d6b1b7ff835af33bc0190c606d4 100644 --- a/example/src/main/java/com/example/order/entity/ExampleOrder.java +++ b/example/src/main/java/com/example/order/entity/ExampleOrder.java @@ -16,7 +16,7 @@ package com.example.order.entity; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.common.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.IdType; import java.util.Date; import com.baomidou.mybatisplus.annotation.Version; @@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.core.validator.groups.Update; /** * 订单示例 diff --git a/example/src/main/java/com/example/order/param/ExampleOrderPageParam.java b/example/src/main/java/com/example/order/param/ExampleOrderPageParam.java index 6b25f18d5d704776fde64d8eedc58cdecbffb638..a30f25931afcf069737c2c67aa80e42cf63380ed 100644 --- a/example/src/main/java/com/example/order/param/ExampleOrderPageParam.java +++ b/example/src/main/java/com/example/order/param/ExampleOrderPageParam.java @@ -16,7 +16,7 @@ package com.example.order.param; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/example/src/main/java/com/example/order/service/ExampleOrderService.java b/example/src/main/java/com/example/order/service/ExampleOrderService.java index 3246ca71d0456c47127a2c1c91b9ba58883399fc..270b9e3c23955538b417a6e8ad5d166a6adb6bcc 100644 --- a/example/src/main/java/com/example/order/service/ExampleOrderService.java +++ b/example/src/main/java/com/example/order/service/ExampleOrderService.java @@ -18,8 +18,8 @@ package com.example.order.service; import com.example.order.entity.ExampleOrder; import com.example.order.param.ExampleOrderPageParam; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; /** * 订单示例 服务类 diff --git a/example/src/main/java/com/example/order/service/impl/ExampleOrderServiceImpl.java b/example/src/main/java/com/example/order/service/impl/ExampleOrderServiceImpl.java index f3b0880fe39af1268e995e98443fcb187573653b..4ccd4d6149080154e9bcf65d43d0a687637ba1e7 100644 --- a/example/src/main/java/com/example/order/service/impl/ExampleOrderServiceImpl.java +++ b/example/src/main/java/com/example/order/service/impl/ExampleOrderServiceImpl.java @@ -21,9 +21,9 @@ import com.example.order.mapper.ExampleOrderMapper; import com.example.order.service.ExampleOrderService; import com.example.order.param.ExampleOrderPageParam; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.core.pagination.PageInfo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/framework/pom.xml b/framework/pom.xml index 7412c99efe89a3f866b9c6deabaea962dd777ad9..428fbaaf4c00b27e4204a8f6fcf7ce3fd99bb334 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT framework @@ -93,7 +93,7 @@ - io.geekidea.springbootplus + io.geekidea.boot config diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java b/framework/src/main/java/io/geekidea/boot/framework/common/api/ApiCode.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java rename to framework/src/main/java/io/geekidea/boot/framework/common/api/ApiCode.java index 1e0607f5062e5d1e83dc37e25a5c894264095ed7..9863b4c4826669b883105f35b9b7953b11b7e167 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/api/ApiCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.api; +package io.geekidea.boot.framework.common.api; /** *

diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiResult.java b/framework/src/main/java/io/geekidea/boot/framework/common/api/ApiResult.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiResult.java rename to framework/src/main/java/io/geekidea/boot/framework/common/api/ApiResult.java index e076b8e8b967ef9175cfb0b053e33cc0c9086229..491ca1cfd5290f3187ef7121f4c77405d6d192fb 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiResult.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/api/ApiResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.api; +package io.geekidea.boot.framework.common.api; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/ClientInfo.java b/framework/src/main/java/io/geekidea/boot/framework/common/bean/ClientInfo.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/ClientInfo.java rename to framework/src/main/java/io/geekidea/boot/framework/common/bean/ClientInfo.java index 6cafa0eb18c28c2fd3e45412ffaf886b796199cb..7e055bcd00cc02e385550efbdfb77b39142402ce 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/ClientInfo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/bean/ClientInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.bean; +package io.geekidea.boot.framework.common.bean; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/DeviceInfo.java b/framework/src/main/java/io/geekidea/boot/framework/common/bean/DeviceInfo.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/DeviceInfo.java rename to framework/src/main/java/io/geekidea/boot/framework/common/bean/DeviceInfo.java index cb087889c294081ab428f57ccb0be5673dbb69ce..c7cb76f2ca62a1f8ff5e0e5c08f21dffce4312cd 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/bean/DeviceInfo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/bean/DeviceInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.bean; +package io.geekidea.boot.framework.common.bean; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/BaseController.java b/framework/src/main/java/io/geekidea/boot/framework/common/controller/BaseController.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/BaseController.java rename to framework/src/main/java/io/geekidea/boot/framework/common/controller/BaseController.java index a37217e240dcb9a867ab7c6b6230f9c4be61a14b..e300df4e5208cc9b976fdc0181f206f182ae7dc0 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/BaseController.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/controller/BaseController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.controller; +package io.geekidea.boot.framework.common.controller; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/CsrfController.java b/framework/src/main/java/io/geekidea/boot/framework/common/controller/CsrfController.java similarity index 85% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/CsrfController.java rename to framework/src/main/java/io/geekidea/boot/framework/common/controller/CsrfController.java index 0cc4f6687f727b80437c5037f452556fc04c371d..33c9848e4aa53f6fdb2d65b00ad753dac42cab4a 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/CsrfController.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/controller/CsrfController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.controller; +package io.geekidea.boot.framework.common.controller; -import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore; -import io.geekidea.springbootplus.framework.util.UUIDUtil; +import io.geekidea.boot.framework.log.annotation.OperationLogIgnore; +import io.geekidea.boot.framework.util.UUIDUtil; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/EnumController.java b/framework/src/main/java/io/geekidea/boot/framework/common/controller/EnumController.java similarity index 86% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/EnumController.java rename to framework/src/main/java/io/geekidea/boot/framework/common/controller/EnumController.java index 5e279eda4293c03b4b740d1e6ccce805857d629d..cefb10d466f4fe3b68449598ef3745c47a5ab4a4 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/EnumController.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/controller/EnumController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.controller; +package io.geekidea.boot.framework.common.controller; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.enums.BaseEnum; -import io.geekidea.springbootplus.framework.common.vo.EnumVo; -import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore; -import io.geekidea.springbootplus.framework.util.BaseEnumUtil; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.enums.BaseEnum; +import io.geekidea.boot.framework.common.vo.EnumVo; +import io.geekidea.boot.framework.log.annotation.OperationLogIgnore; +import io.geekidea.boot.framework.util.BaseEnumUtil; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -48,8 +48,8 @@ import java.util.concurrent.ConcurrentHashMap; public class EnumController { private static final List FRAMEWORK_ENUM_PACKAGES = Arrays.asList( - "io.geekidea.springbootplus.framework.common.enums", - "io.geekidea.springbootplus.system.enums"); + "io.geekidea.boot.framework.common.enums", + "io.geekidea.boot.system.enums"); /** * 枚举包路径 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/IndexController.java b/framework/src/main/java/io/geekidea/boot/framework/common/controller/IndexController.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/IndexController.java rename to framework/src/main/java/io/geekidea/boot/framework/common/controller/IndexController.java index 9031b6aba0b5993f7c8f9fc276dea3879ff1fab5..0f14086de2ff63f76cfd020a6cfb2e183a13b12e 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/controller/IndexController.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/controller/IndexController.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.controller; +package io.geekidea.boot.framework.common.controller; -import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore; +import io.geekidea.boot.framework.log.annotation.OperationLogIgnore; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/entity/BaseEntity.java b/framework/src/main/java/io/geekidea/boot/framework/common/entity/BaseEntity.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/entity/BaseEntity.java rename to framework/src/main/java/io/geekidea/boot/framework/common/entity/BaseEntity.java index 58d02fc7bb2075a101a531704014ac46f9159230..e7b95faed81b389be4f2d47d3e7080de256688c3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/entity/BaseEntity.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/entity/BaseEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.entity; +package io.geekidea.boot.framework.common.entity; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/enums/BaseEnum.java b/framework/src/main/java/io/geekidea/boot/framework/common/enums/BaseEnum.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/enums/BaseEnum.java rename to framework/src/main/java/io/geekidea/boot/framework/common/enums/BaseEnum.java index dfcc1286ffc580b104d9a068ae90bf22ba9ca1c4..116c50ad3aec3cb40e52d898731f9574aef15a4e 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/enums/BaseEnum.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/enums/BaseEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.enums; +package io.geekidea.boot.framework.common.enums; /** diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/BusinessException.java b/framework/src/main/java/io/geekidea/boot/framework/common/exception/BusinessException.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/BusinessException.java rename to framework/src/main/java/io/geekidea/boot/framework/common/exception/BusinessException.java index 0b769d1ee73eb692bc5869f31fb2728ebc4ae003..792654c664629861fbf80dd1895322e3f50aa2ca 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/BusinessException.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/exception/BusinessException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.exception; +package io.geekidea.boot.framework.common.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiCode; /** * 业务异常 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/DaoException.java b/framework/src/main/java/io/geekidea/boot/framework/common/exception/DaoException.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/DaoException.java rename to framework/src/main/java/io/geekidea/boot/framework/common/exception/DaoException.java index 015c5237f3e1b6e0c8b0791d3acffcff63b87aca..bb08109b8e1776eef1ade6cb43330a8363d2e584 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/DaoException.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/exception/DaoException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.exception; +package io.geekidea.boot.framework.common.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiCode; /** * DAO异常 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/GlobalErrorController.java b/framework/src/main/java/io/geekidea/boot/framework/common/exception/GlobalErrorController.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/GlobalErrorController.java rename to framework/src/main/java/io/geekidea/boot/framework/common/exception/GlobalErrorController.java index dbdc25deffbd1622ad47aa9e63f8ae4079bfd58e..8c42330ddaa8313ca742fd40111c6dc2bf9ccdf5 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/GlobalErrorController.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/exception/GlobalErrorController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.exception; +package io.geekidea.boot.framework.common.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiResult; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusConfigException.java b/framework/src/main/java/io/geekidea/boot/framework/common/exception/SpringBootPlusConfigException.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusConfigException.java rename to framework/src/main/java/io/geekidea/boot/framework/common/exception/SpringBootPlusConfigException.java index a7e7af33364cc53c4613c5c75824947d5cc04c00..10d9c00bdb1eb9125c9dbdee3c506a3a5558faab 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusConfigException.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/exception/SpringBootPlusConfigException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.exception; +package io.geekidea.boot.framework.common.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiCode; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusException.java b/framework/src/main/java/io/geekidea/boot/framework/common/exception/SpringBootPlusException.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusException.java rename to framework/src/main/java/io/geekidea/boot/framework/common/exception/SpringBootPlusException.java index 46dc1a7c78cb44ed3b554287c0a9db21aba3a7bf..cada49f9d4abbdce1ec2c025516cc6712a1f0690 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/exception/SpringBootPlusException.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/exception/SpringBootPlusException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.exception; +package io.geekidea.boot.framework.common.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiCode; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/param/IdParam.java b/framework/src/main/java/io/geekidea/boot/framework/common/param/IdParam.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/param/IdParam.java rename to framework/src/main/java/io/geekidea/boot/framework/common/param/IdParam.java index e5e706d8c9a86a8c087cc2a7573b0a3c5935dc04..61e0fcea76a2c1101600ae0f8690308c88a3d76c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/param/IdParam.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/param/IdParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.param; +package io.geekidea.boot.framework.common.param; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/service/BaseService.java b/framework/src/main/java/io/geekidea/boot/framework/common/service/BaseService.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/service/BaseService.java rename to framework/src/main/java/io/geekidea/boot/framework/common/service/BaseService.java index 10c4a3f9e20b35b9c09c1cc3a244cd43f38d5f2a..63587a189cd8fa9d4660803c30a4f675c3e596e7 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/service/BaseService.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/service/BaseService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.service; +package io.geekidea.boot.framework.common.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/service/impl/BaseServiceImpl.java b/framework/src/main/java/io/geekidea/boot/framework/common/service/impl/BaseServiceImpl.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/service/impl/BaseServiceImpl.java rename to framework/src/main/java/io/geekidea/boot/framework/common/service/impl/BaseServiceImpl.java index ee5122c920f58447aa8f69a4b2e1fdb859056942..508f251f9026351d5c7be97502051cdcd2104a8c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/service/impl/BaseServiceImpl.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/service/impl/BaseServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.service.impl; +package io.geekidea.boot.framework.common.service.impl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.util.LambdaColumn; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.util.LambdaColumn; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/common/vo/EnumVo.java b/framework/src/main/java/io/geekidea/boot/framework/common/vo/EnumVo.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/common/vo/EnumVo.java rename to framework/src/main/java/io/geekidea/boot/framework/common/vo/EnumVo.java index e51618766b541a7c0d891952fca21538cf8d38b8..aeedec5dd02ebc65e1b2a0b518e5b7e48be3c428 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/common/vo/EnumVo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/common/vo/EnumVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.common.vo; +package io.geekidea.boot.framework.common.vo; import lombok.Data; import lombok.experimental.Accessors; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/ConverterConfig.java b/framework/src/main/java/io/geekidea/boot/framework/config/converter/ConverterConfig.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/ConverterConfig.java rename to framework/src/main/java/io/geekidea/boot/framework/config/converter/ConverterConfig.java index e1d9b7fb9ec2806ed6a56648fbde2374d83bc1cf..94d5613d351de29521bb06480fdd1e0579e4328b 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/ConverterConfig.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/converter/ConverterConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.converter; +package io.geekidea.boot.framework.config.converter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateConverter.java b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDateConverter.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateConverter.java rename to framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDateConverter.java index 8c54b50b0c7fd6988fb2f183f90bec8f7c99e89d..4f3d520fe89dec42e1b8ff7226ab49a51b6534b3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateConverter.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDateConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.converter; +package io.geekidea.boot.framework.config.converter; import org.springframework.core.convert.converter.Converter; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateUtil.java b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDateUtil.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDateUtil.java index bc686d2c75cdd98d690b99c605615ca349dbde7f..25c34f2b9a0cb22f747b953f18ae860f06c52bb5 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDateUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDateUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.converter; +package io.geekidea.boot.framework.config.converter; import org.apache.commons.lang3.StringUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleConverter.java b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDoubleConverter.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleConverter.java rename to framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDoubleConverter.java index 071b08d6195b9f2da1d2dc63a0618dd47550f44e..5757f171e792b2201178bc0ec5d68cefd7532747 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleConverter.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDoubleConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.converter; +package io.geekidea.boot.framework.config.converter; import org.springframework.core.convert.converter.Converter; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleUtil.java b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDoubleUtil.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDoubleUtil.java index b8c90ea8be519619a11aed813bbe6eb29f964b2e..d58a398ddeb866c1437125e54e32006d6dc513ca 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToDoubleUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToDoubleUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.converter; +package io.geekidea.boot.framework.config.converter; import org.apache.commons.lang3.StringUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerConverter.java b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToIntegerConverter.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerConverter.java rename to framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToIntegerConverter.java index fad3132304115a5b224f4ec2cc5e0f4ef0f6ef6b..a47a8c7871a84bebdaa5299437fd0a95661ac8bb 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerConverter.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToIntegerConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.converter; +package io.geekidea.boot.framework.config.converter; import org.springframework.core.convert.converter.Converter; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerUtil.java b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToIntegerUtil.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToIntegerUtil.java index e57da5ccc5833c725eb093cb8ae7e75d9a909afc..27ba3c056b9f1acf4fe54d34cace88c30281b2a9 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/converter/StringToIntegerUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/converter/StringToIntegerUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.converter; +package io.geekidea.boot.framework.config.converter; import org.apache.commons.lang3.StringUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDateDeserializer.java b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonDateDeserializer.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDateDeserializer.java rename to framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonDateDeserializer.java index a72637e7154c90e00b1c8898db537ea61a0d65fe..9fb6692db0a73ebb9d1cdf18836df75fef382866 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDateDeserializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonDateDeserializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.jackson.deserializer; +package io.geekidea.boot.framework.config.jackson.deserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import io.geekidea.springbootplus.framework.config.converter.StringToDateUtil; +import io.geekidea.boot.framework.config.converter.StringToDateUtil; import java.io.IOException; import java.util.Date; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java rename to framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java index 40071291cfec4e6a1121aed94451843b3d791134..9f95372a7217fa46c5ddd67398366c56fb191767 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonDoubleDeserializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.jackson.deserializer; +package io.geekidea.boot.framework.config.jackson.deserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import io.geekidea.springbootplus.framework.config.converter.StringToDoubleUtil; +import io.geekidea.boot.framework.config.converter.StringToDoubleUtil; import java.io.IOException; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java rename to framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java index 8fc5071c58939b4a82b1b8aff9e6ca8eb042e451..ba37e000c209362ea6ac9758a2d3cd9472ea7abc 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/deserializer/JacksonLocalDateTimeDeserializer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.jackson.deserializer; +package io.geekidea.boot.framework.config.jackson.deserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import io.geekidea.springbootplus.config.constant.DatePattern; +import io.geekidea.boot.config.constant.DatePattern; import org.apache.commons.lang3.StringUtils; import java.io.IOException; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonDateSerializer.java b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonDateSerializer.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonDateSerializer.java rename to framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonDateSerializer.java index 394441a92f6f871fd4e5360f572e145db0be4d39..600824b8880e675fef53a55355db4b203a44ce24 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonDateSerializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonDateSerializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.jackson.serializer; +package io.geekidea.boot.framework.config.jackson.serializer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import io.geekidea.springbootplus.framework.util.DateUtil; +import io.geekidea.boot.framework.util.DateUtil; import java.io.IOException; import java.util.Date; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonIntegerDeserializer.java b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonIntegerDeserializer.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonIntegerDeserializer.java rename to framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonIntegerDeserializer.java index 785b02bea324a53b8503fea25a0c19b72fb821cb..ccf7bf0545d6278b938647070b1a813c81c12111 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonIntegerDeserializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonIntegerDeserializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.jackson.serializer; +package io.geekidea.boot.framework.config.jackson.serializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import io.geekidea.springbootplus.framework.config.converter.StringToIntegerUtil; +import io.geekidea.boot.framework.config.converter.StringToIntegerUtil; import java.io.IOException; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java rename to framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java index fb72cdd6e1f12ff4f508c0fc621b20e24f93231f..c74efb45950923137341897e9f9e3f5a13c811a3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/config/jackson/serializer/JacksonLocalDateTimeSerializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.config.jackson.serializer; +package io.geekidea.boot.framework.config.jackson.serializer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import io.geekidea.springbootplus.config.constant.DatePattern; +import io.geekidea.boot.config.constant.DatePattern; import java.io.IOException; import java.time.LocalDateTime; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/bean/RequestDetail.java b/framework/src/main/java/io/geekidea/boot/framework/core/bean/RequestDetail.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/bean/RequestDetail.java rename to framework/src/main/java/io/geekidea/boot/framework/core/bean/RequestDetail.java index b84b7da384ebfcfd4e13940c1165fcf008c3959c..2b1e2da8d2ceb308fac7cb955c70ad34d6dabb01 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/bean/RequestDetail.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/bean/RequestDetail.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.bean; +package io.geekidea.boot.framework.core.bean; import lombok.Data; import lombok.experimental.Accessors; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/filter/RequestDetailFilter.java b/framework/src/main/java/io/geekidea/boot/framework/core/filter/RequestDetailFilter.java similarity index 87% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/filter/RequestDetailFilter.java rename to framework/src/main/java/io/geekidea/boot/framework/core/filter/RequestDetailFilter.java index b76988b6278d5b32fbf7fbc6849ecdacc4c52d15..e6eb0c98a8df1d1a61077c62b7067390e8884f36 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/filter/RequestDetailFilter.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/filter/RequestDetailFilter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.filter; +package io.geekidea.boot.framework.core.filter; -import io.geekidea.springbootplus.framework.core.bean.RequestDetail; -import io.geekidea.springbootplus.framework.core.util.RequestDetailThreadLocal; -import io.geekidea.springbootplus.framework.util.IpUtil; +import io.geekidea.boot.framework.core.bean.RequestDetail; +import io.geekidea.boot.framework.core.util.RequestDetailThreadLocal; +import io.geekidea.boot.framework.util.IpUtil; import lombok.extern.slf4j.Slf4j; import javax.servlet.*; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/interceptor/PermissionInterceptor.java b/framework/src/main/java/io/geekidea/boot/framework/core/interceptor/PermissionInterceptor.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/interceptor/PermissionInterceptor.java rename to framework/src/main/java/io/geekidea/boot/framework/core/interceptor/PermissionInterceptor.java index a3cfab0707bbbb5f79f1202b645441234339cad5..1ed27dc1d60aaf07cb2d24203e23b642e4c1ccf7 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/interceptor/PermissionInterceptor.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/interceptor/PermissionInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.interceptor; +package io.geekidea.boot.framework.core.interceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageOrderParam.java b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/BasePageOrderParam.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageOrderParam.java rename to framework/src/main/java/io/geekidea/boot/framework/core/pagination/BasePageOrderParam.java index 1d32e24f12759a7b5e050f300244ba10eba42271..b4bb0b0fa409afc829b999ad16de18747b7abcca 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageOrderParam.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/BasePageOrderParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.pagination; +package io.geekidea.boot.framework.core.pagination; import com.baomidou.mybatisplus.core.metadata.OrderItem; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageParam.java b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/BasePageParam.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageParam.java rename to framework/src/main/java/io/geekidea/boot/framework/core/pagination/BasePageParam.java index 99b8b9aa003c5c1c2eeba1d8203ebd72618d0915..1a97ef6022b626bc4a420769fde3c0a006b943b7 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/BasePageParam.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/BasePageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.pagination; +package io.geekidea.boot.framework.core.pagination; -import io.geekidea.springbootplus.config.constant.CommonConstant; +import io.geekidea.boot.config.constant.CommonConstant; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/OrderMapping.java b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/OrderMapping.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/OrderMapping.java rename to framework/src/main/java/io/geekidea/boot/framework/core/pagination/OrderMapping.java index cd817eea88870aab95ca855e9ec90f726ec74542..5f98abf3683bd2bdbeaa76e9f9636e9314bcce6d 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/OrderMapping.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/OrderMapping.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.pagination; +package io.geekidea.boot.framework.core.pagination; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.google.common.base.CaseFormat; -import io.geekidea.springbootplus.framework.util.PropertyColumnUtil; +import io.geekidea.boot.framework.util.PropertyColumnUtil; import lombok.Data; import lombok.experimental.Accessors; import org.apache.commons.collections4.CollectionUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/PageInfo.java b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/PageInfo.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/PageInfo.java rename to framework/src/main/java/io/geekidea/boot/framework/core/pagination/PageInfo.java index 5f98428d8623014ba73d0068c7d70add201d5c01..72c7d7149a8951179f86fd83a58b2018967919a1 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/PageInfo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/PageInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.pagination; +package io.geekidea.boot.framework.core.pagination; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/Paging.java b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/Paging.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/Paging.java rename to framework/src/main/java/io/geekidea/boot/framework/core/pagination/Paging.java index 515b349607f2d7d9ebd7e4d83fc92a15d9d5cfcd..4e1e9b540f2ec464db50ccf7d0e50acdb15709d3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/pagination/Paging.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/pagination/Paging.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.pagination; +package io.geekidea.boot.framework.core.pagination; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.core.metadata.IPage; import com.fasterxml.jackson.annotation.JsonProperty; -import io.geekidea.springbootplus.config.constant.CommonConstant; +import io.geekidea.boot.config.constant.CommonConstant; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/util/RequestDetailThreadLocal.java b/framework/src/main/java/io/geekidea/boot/framework/core/util/RequestDetailThreadLocal.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/util/RequestDetailThreadLocal.java rename to framework/src/main/java/io/geekidea/boot/framework/core/util/RequestDetailThreadLocal.java index a4ba79c7ab7f67a83280c0c6d649e3fd9166035e..2290333f7e1ffc73a2234a547c3e4707265c6538 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/util/RequestDetailThreadLocal.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/util/RequestDetailThreadLocal.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.util; +package io.geekidea.boot.framework.core.util; -import io.geekidea.springbootplus.framework.core.bean.RequestDetail; +import io.geekidea.boot.framework.core.bean.RequestDetail; /** * 记录请求详情信息到当前线程中，可在任何地方获取 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/EnumTypeValidator.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/EnumTypeValidator.java similarity index 80% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/EnumTypeValidator.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/EnumTypeValidator.java index 4853e1ad60abfc6b2a62368a3ab387029a483d38..9c71cd64ef2b7483cf923feca005196e00c511bd 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/EnumTypeValidator.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/EnumTypeValidator.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator; +package io.geekidea.boot.framework.core.validator; -import io.geekidea.springbootplus.framework.common.enums.BaseEnum; -import io.geekidea.springbootplus.framework.common.exception.BusinessException; -import io.geekidea.springbootplus.framework.core.validator.constraints.EnumType; -import io.geekidea.springbootplus.framework.util.BaseEnumUtil; +import io.geekidea.boot.framework.common.enums.BaseEnum; +import io.geekidea.boot.framework.common.exception.BusinessException; +import io.geekidea.boot.framework.core.validator.constraints.EnumType; +import io.geekidea.boot.framework.util.BaseEnumUtil; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/IdCardValidator.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/IdCardValidator.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/IdCardValidator.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/IdCardValidator.java index fd1476bae95f654f48f8dc25bfad41c63f75f3c6..5c8f3a471f4226b1af059bddfe9f91b172599f7b 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/IdCardValidator.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/IdCardValidator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator; +package io.geekidea.boot.framework.core.validator; -import io.geekidea.springbootplus.framework.core.validator.constraints.IdCard; +import io.geekidea.boot.framework.core.validator.constraints.IdCard; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/PhoneValidator.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/PhoneValidator.java similarity index 90% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/PhoneValidator.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/PhoneValidator.java index a81ef49a812888d1fd665eda9496d0c5e901fbc4..8973a8f11eb5619c3210fcb3b4d547c24fc06731 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/PhoneValidator.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/PhoneValidator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator; +package io.geekidea.boot.framework.core.validator; -import io.geekidea.springbootplus.framework.core.validator.constraints.Phone; +import io.geekidea.boot.framework.core.validator.constraints.Phone; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/EnumType.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/EnumType.java similarity index 86% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/EnumType.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/EnumType.java index f42908f1f86fd1e0f8835caec02a9286e6926d01..848065e5ebe5f93ecbd182400fa3545205faeadd 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/EnumType.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/EnumType.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator.constraints; +package io.geekidea.boot.framework.core.validator.constraints; -import io.geekidea.springbootplus.framework.common.enums.BaseEnum; -import io.geekidea.springbootplus.framework.core.validator.EnumTypeValidator; +import io.geekidea.boot.framework.common.enums.BaseEnum; +import io.geekidea.boot.framework.core.validator.EnumTypeValidator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/IdCard.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/IdCard.java similarity index 90% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/IdCard.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/IdCard.java index 5e33d3c08d24fd02534ab518725e9f7de617f0a0..9066d3b63f46d65aadeb6efb03549e061bb4ac2c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/IdCard.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/IdCard.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator.constraints; +package io.geekidea.boot.framework.core.validator.constraints; -import io.geekidea.springbootplus.framework.core.validator.IdCardValidator; +import io.geekidea.boot.framework.core.validator.IdCardValidator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/Phone.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/Phone.java similarity index 90% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/Phone.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/Phone.java index 7f2aacfe973cdbd06203cbb55bfabb848171af84..8c1e414daf2599d227ba7481ec9e64520fdccb6b 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/constraints/Phone.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/constraints/Phone.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator.constraints; +package io.geekidea.boot.framework.core.validator.constraints; -import io.geekidea.springbootplus.framework.core.validator.PhoneValidator; +import io.geekidea.boot.framework.core.validator.PhoneValidator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Add.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/groups/Add.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Add.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/groups/Add.java index ace305dc5b66cbb2df56a3671ef4851a301454b4..69eae7096b2d747d6d20cd19fd8d0e5be3bcb78a 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Add.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/groups/Add.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator.groups; +package io.geekidea.boot.framework.core.validator.groups; import javax.validation.groups.Default; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Update.java b/framework/src/main/java/io/geekidea/boot/framework/core/validator/groups/Update.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Update.java rename to framework/src/main/java/io/geekidea/boot/framework/core/validator/groups/Update.java index 9e7d41f97255fd73ceb6ff285be08523a17511c1..6c31ca7fa98cff55205ae0d73c2f6fa887b86e10 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/validator/groups/Update.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/validator/groups/Update.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.validator.groups; +package io.geekidea.boot.framework.core.validator.groups; import javax.validation.groups.Default; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssFilter.java b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssFilter.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssFilter.java rename to framework/src/main/java/io/geekidea/boot/framework/core/xss/XssFilter.java index 18ff7c82e77aedb0d47fb6efd5240cef567af5d2..e5c593e6b708b486c650f02b4c422e83400fc03c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssFilter.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.xss; +package io.geekidea.boot.framework.core.xss; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssHttpServletRequestWrapper.java b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssHttpServletRequestWrapper.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssHttpServletRequestWrapper.java rename to framework/src/main/java/io/geekidea/boot/framework/core/xss/XssHttpServletRequestWrapper.java index 83a9def178d18bf5820a0a6a584f67675c659849..295856bd57bd28119e121548f91e04c4582e7c6c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssHttpServletRequestWrapper.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssHttpServletRequestWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.xss; +package io.geekidea.boot.framework.core.xss; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.text.StringEscapeUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonDeserializer.java b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssJacksonDeserializer.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonDeserializer.java rename to framework/src/main/java/io/geekidea/boot/framework/core/xss/XssJacksonDeserializer.java index ecc36e6bfb7da380ba387407c0980993025d6b1a..19822ead5a1a3dc74a9e5ef66f901f78760c66e6 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonDeserializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssJacksonDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.xss; +package io.geekidea.boot.framework.core.xss; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonSerializer.java b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssJacksonSerializer.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonSerializer.java rename to framework/src/main/java/io/geekidea/boot/framework/core/xss/XssJacksonSerializer.java index 536329dfd6de001c56e6b0c75cd8540a8c220522..3702c2831d6be3675c912ddb5cfe0b741560aa3e 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/core/xss/XssJacksonSerializer.java +++ b/framework/src/main/java/io/geekidea/boot/framework/core/xss/XssJacksonSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.core.xss; +package io.geekidea.boot.framework.core.xss; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/entity/IpAddress.java b/framework/src/main/java/io/geekidea/boot/framework/ip/entity/IpAddress.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/ip/entity/IpAddress.java rename to framework/src/main/java/io/geekidea/boot/framework/ip/entity/IpAddress.java index 873838f3494c27d94345216173f965284cd1cf76..51b5a23623fd3b3a86efbedd16f232fd15692e9f 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/entity/IpAddress.java +++ b/framework/src/main/java/io/geekidea/boot/framework/ip/entity/IpAddress.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.ip.entity; +package io.geekidea.boot.framework.ip.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/mapper/IpAddressMapper.java b/framework/src/main/java/io/geekidea/boot/framework/ip/mapper/IpAddressMapper.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/ip/mapper/IpAddressMapper.java rename to framework/src/main/java/io/geekidea/boot/framework/ip/mapper/IpAddressMapper.java index d92f2b197f8a0597417582402e3097b647e30b46..b6c5350c4c60bba4c0908f574150c9dc4ae2a14a 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/mapper/IpAddressMapper.java +++ b/framework/src/main/java/io/geekidea/boot/framework/ip/mapper/IpAddressMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.ip.mapper; +package io.geekidea.boot.framework.ip.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.geekidea.springbootplus.framework.ip.entity.IpAddress; +import io.geekidea.boot.framework.ip.entity.IpAddress; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/IpAddressService.java b/framework/src/main/java/io/geekidea/boot/framework/ip/service/IpAddressService.java similarity index 85% rename from framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/IpAddressService.java rename to framework/src/main/java/io/geekidea/boot/framework/ip/service/IpAddressService.java index 9701a809bc4800eef61d87c1af2084188c0f72b6..e03ae165bd9ebda32cfa5b6d59bf987f602e3f2c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/IpAddressService.java +++ b/framework/src/main/java/io/geekidea/boot/framework/ip/service/IpAddressService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.ip.service; +package io.geekidea.boot.framework.ip.service; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.ip.entity.IpAddress; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.ip.entity.IpAddress; /** * IP地址 服务类 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/impl/IpAddressServiceImpl.java b/framework/src/main/java/io/geekidea/boot/framework/ip/service/impl/IpAddressServiceImpl.java similarity index 82% rename from framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/impl/IpAddressServiceImpl.java rename to framework/src/main/java/io/geekidea/boot/framework/ip/service/impl/IpAddressServiceImpl.java index 2c17bd001daba7ccafdb47943fd94a9385c4f467..dcc99f305d7ad3076c7b299d5f4508985357f3ca 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/ip/service/impl/IpAddressServiceImpl.java +++ b/framework/src/main/java/io/geekidea/boot/framework/ip/service/impl/IpAddressServiceImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.ip.service.impl; +package io.geekidea.boot.framework.ip.service.impl; -import io.geekidea.springbootplus.config.constant.CommonConstant; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.ip.entity.IpAddress; -import io.geekidea.springbootplus.framework.ip.mapper.IpAddressMapper; -import io.geekidea.springbootplus.framework.ip.service.IpAddressService; +import io.geekidea.boot.config.constant.CommonConstant; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.ip.entity.IpAddress; +import io.geekidea.boot.framework.ip.mapper.IpAddressMapper; +import io.geekidea.boot.framework.ip.service.IpAddressService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/Module.java b/framework/src/main/java/io/geekidea/boot/framework/log/annotation/Module.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/Module.java rename to framework/src/main/java/io/geekidea/boot/framework/log/annotation/Module.java index 3226119d25df2c527905bb1842eb75c60335d152..c553a70391985ff21a7a6b068a4d3c552f8455f6 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/Module.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/annotation/Module.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.annotation; +package io.geekidea.boot.framework.log.annotation; import org.springframework.core.annotation.AliasFor; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLog.java b/framework/src/main/java/io/geekidea/boot/framework/log/annotation/OperationLog.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLog.java rename to framework/src/main/java/io/geekidea/boot/framework/log/annotation/OperationLog.java index f90112cc8ce87e45a414b4aa38cab851b57d6edd..e0279f32358ae225a6166c08e90c327567596869 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLog.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/annotation/OperationLog.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.annotation; +package io.geekidea.boot.framework.log.annotation; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.log.enums.OperationLogType; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.*; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLogIgnore.java b/framework/src/main/java/io/geekidea/boot/framework/log/annotation/OperationLogIgnore.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLogIgnore.java rename to framework/src/main/java/io/geekidea/boot/framework/log/annotation/OperationLogIgnore.java index 1283704b50c736394b5f1ccdd2257fcf64988632..9244fa08777795bd75c1f91ce49b9a076b5060de 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/annotation/OperationLogIgnore.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/annotation/OperationLogIgnore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.annotation; +package io.geekidea.boot.framework.log.annotation; import java.lang.annotation.*; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/aop/BaseLogAop.java b/framework/src/main/java/io/geekidea/boot/framework/log/aop/BaseLogAop.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/aop/BaseLogAop.java rename to framework/src/main/java/io/geekidea/boot/framework/log/aop/BaseLogAop.java index 1b0f38b830a3057a7c47a45962cc6f294638d00d..3b220b861a8a472879b291fe1d38aca5700604ed 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/aop/BaseLogAop.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/aop/BaseLogAop.java @@ -14,33 +14,33 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.aop; +package io.geekidea.boot.framework.log.aop; import com.alibaba.fastjson.JSONObject; import com.auth0.jwt.exceptions.JWTDecodeException; import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import io.geekidea.springbootplus.config.constant.CommonConstant; -import io.geekidea.springbootplus.config.properties.SpringBootPlusAopProperties; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.bean.ClientInfo; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException; -import io.geekidea.springbootplus.framework.ip.entity.IpAddress; -import io.geekidea.springbootplus.framework.ip.service.IpAddressService; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore; -import io.geekidea.springbootplus.framework.log.bean.OperationLogInfo; -import io.geekidea.springbootplus.framework.log.bean.RequestInfo; -import io.geekidea.springbootplus.framework.log.entity.SysLoginLog; -import io.geekidea.springbootplus.framework.log.entity.SysOperationLog; -import io.geekidea.springbootplus.framework.log.service.SysLoginLogService; -import io.geekidea.springbootplus.framework.log.service.SysOperationLogService; -import io.geekidea.springbootplus.framework.shiro.service.LoginToken; -import io.geekidea.springbootplus.framework.shiro.service.LoginUsername; -import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil; -import io.geekidea.springbootplus.framework.shiro.util.JwtUtil; -import io.geekidea.springbootplus.framework.util.*; +import io.geekidea.boot.config.constant.CommonConstant; +import io.geekidea.boot.config.properties.SpringBootPlusAopProperties; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.bean.ClientInfo; +import io.geekidea.boot.framework.common.exception.SpringBootPlusException; +import io.geekidea.boot.framework.ip.entity.IpAddress; +import io.geekidea.boot.framework.ip.service.IpAddressService; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.annotation.OperationLogIgnore; +import io.geekidea.boot.framework.log.bean.OperationLogInfo; +import io.geekidea.boot.framework.log.bean.RequestInfo; +import io.geekidea.boot.framework.log.entity.SysLoginLog; +import io.geekidea.boot.framework.log.entity.SysOperationLog; +import io.geekidea.boot.framework.log.service.SysLoginLogService; +import io.geekidea.boot.framework.log.service.SysOperationLogService; +import io.geekidea.boot.framework.shiro.service.LoginToken; +import io.geekidea.boot.framework.shiro.service.LoginUsername; +import io.geekidea.boot.framework.shiro.util.JwtTokenUtil; +import io.geekidea.boot.framework.shiro.util.JwtUtil; +import io.geekidea.boot.framework.util.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.collections4.CollectionUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/OperationLogInfo.java b/framework/src/main/java/io/geekidea/boot/framework/log/bean/OperationLogInfo.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/OperationLogInfo.java rename to framework/src/main/java/io/geekidea/boot/framework/log/bean/OperationLogInfo.java index 4841a37d3f3b2d0a62fa1712caedf02af143f4af..9afe0770b5ea6462afa2bcb9d6cd504323f3f17a 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/OperationLogInfo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/bean/OperationLogInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.bean; +package io.geekidea.boot.framework.log.bean; import lombok.Data; import lombok.experimental.Accessors; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/RequestInfo.java b/framework/src/main/java/io/geekidea/boot/framework/log/bean/RequestInfo.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/RequestInfo.java rename to framework/src/main/java/io/geekidea/boot/framework/log/bean/RequestInfo.java index aa035f05146da02cc591d7ccc7df9c1cf490a196..c2191970af62f7344a3ac847cd3ef79d11abddf9 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/bean/RequestInfo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/bean/RequestInfo.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.bean; +package io.geekidea.boot.framework.log.bean; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.geekidea.springbootplus.framework.ip.entity.IpAddress; +import io.geekidea.boot.framework.ip.entity.IpAddress; import lombok.Data; import lombok.experimental.Accessors; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysLoginLogController.java b/framework/src/main/java/io/geekidea/boot/framework/log/controller/SysLoginLogController.java similarity index 75% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysLoginLogController.java rename to framework/src/main/java/io/geekidea/boot/framework/log/controller/SysLoginLogController.java index f4e4e66f6fd4198be41191bebf62d3a4b2c37afd..6cfe7635501d298778adf8a81f00d3d75e7a60a6 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysLoginLogController.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/controller/SysLoginLogController.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.controller; +package io.geekidea.boot.framework.log.controller; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.entity.SysLoginLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.framework.log.param.SysLoginLogPageParam; -import io.geekidea.springbootplus.framework.log.service.SysLoginLogService; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.entity.SysLoginLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.log.param.SysLoginLogPageParam; +import io.geekidea.boot.framework.log.service.SysLoginLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysOperationLogController.java b/framework/src/main/java/io/geekidea/boot/framework/log/controller/SysOperationLogController.java similarity index 80% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysOperationLogController.java rename to framework/src/main/java/io/geekidea/boot/framework/log/controller/SysOperationLogController.java index 9c6db9edf01272c581e5deb50bde3e9e198be5e3..76c947b6e93ea3986f2536b909e56f948ea72609 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/controller/SysOperationLogController.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/controller/SysOperationLogController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.controller; +package io.geekidea.boot.framework.log.controller; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.entity.SysOperationLog; -import io.geekidea.springbootplus.framework.log.param.SysOperationLogPageParam; -import io.geekidea.springbootplus.framework.log.service.SysOperationLogService; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.entity.SysOperationLog; +import io.geekidea.boot.framework.log.param.SysOperationLogPageParam; +import io.geekidea.boot.framework.log.service.SysOperationLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysLoginLog.java b/framework/src/main/java/io/geekidea/boot/framework/log/entity/SysLoginLog.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysLoginLog.java rename to framework/src/main/java/io/geekidea/boot/framework/log/entity/SysLoginLog.java index 25ac5546a0e02464eb44ef9b04f789db3d285704..b20415035ffdce487ba0e937f83b0d1b21e47047 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysLoginLog.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/entity/SysLoginLog.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.entity; +package io.geekidea.boot.framework.log.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.core.validator.groups.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysOperationLog.java b/framework/src/main/java/io/geekidea/boot/framework/log/entity/SysOperationLog.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysOperationLog.java rename to framework/src/main/java/io/geekidea/boot/framework/log/entity/SysOperationLog.java index 87a7b602dc9632f5bbf65d93f267388d233d7daa..066c8812a3bc5115f711a6b0c5a2c1a8af9e4797 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/entity/SysOperationLog.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/entity/SysOperationLog.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.entity; +package io.geekidea.boot.framework.log.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.core.validator.groups.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/enums/OperationLogType.java b/framework/src/main/java/io/geekidea/boot/framework/log/enums/OperationLogType.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/enums/OperationLogType.java rename to framework/src/main/java/io/geekidea/boot/framework/log/enums/OperationLogType.java index cdd141987efdc26132ffd8bef940b5d6000133be..6adb6c88b929ea590974d0252d5bffdda3fc6761 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/enums/OperationLogType.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/enums/OperationLogType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.enums; +package io.geekidea.boot.framework.log.enums; -import io.geekidea.springbootplus.framework.common.enums.BaseEnum; +import io.geekidea.boot.framework.common.enums.BaseEnum; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysLoginLogMapper.java b/framework/src/main/java/io/geekidea/boot/framework/log/mapper/SysLoginLogMapper.java similarity index 87% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysLoginLogMapper.java rename to framework/src/main/java/io/geekidea/boot/framework/log/mapper/SysLoginLogMapper.java index 1ca535fb64cc44115f327cbfba0615c60904dfdd..671d28dbc217b3c099bd27d7379ae92022ce6920 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysLoginLogMapper.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/mapper/SysLoginLogMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.mapper; +package io.geekidea.boot.framework.log.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.geekidea.springbootplus.framework.log.entity.SysLoginLog; +import io.geekidea.boot.framework.log.entity.SysLoginLog; import org.springframework.stereotype.Repository; /** diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysOperationLogMapper.java b/framework/src/main/java/io/geekidea/boot/framework/log/mapper/SysOperationLogMapper.java similarity index 87% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysOperationLogMapper.java rename to framework/src/main/java/io/geekidea/boot/framework/log/mapper/SysOperationLogMapper.java index 431aef35263eef66d63f6dad3e7a914437b2bb63..39f36a20f1f9a48ab5763c64104f3ad30ecf8146 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/mapper/SysOperationLogMapper.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/mapper/SysOperationLogMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.mapper; +package io.geekidea.boot.framework.log.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.geekidea.springbootplus.framework.log.entity.SysOperationLog; +import io.geekidea.boot.framework.log.entity.SysOperationLog; import org.springframework.stereotype.Repository; /** diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysLoginLogPageParam.java b/framework/src/main/java/io/geekidea/boot/framework/log/param/SysLoginLogPageParam.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysLoginLogPageParam.java rename to framework/src/main/java/io/geekidea/boot/framework/log/param/SysLoginLogPageParam.java index c44e86245086e161fa2a4f54fec76e9f841c854b..a414d444eac0a28eb279559e045eea60337e45df 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysLoginLogPageParam.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/param/SysLoginLogPageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.param; +package io.geekidea.boot.framework.log.param; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysOperationLogPageParam.java b/framework/src/main/java/io/geekidea/boot/framework/log/param/SysOperationLogPageParam.java similarity index 89% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysOperationLogPageParam.java rename to framework/src/main/java/io/geekidea/boot/framework/log/param/SysOperationLogPageParam.java index cfb942099e40351912b87be23ea7fcbb54ba9b0c..bfb2f505e9f67319e0521cb50bbb6c3a7aad9998 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/param/SysOperationLogPageParam.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/param/SysOperationLogPageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.param; +package io.geekidea.boot.framework.log.param; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysLoginLogService.java b/framework/src/main/java/io/geekidea/boot/framework/log/service/SysLoginLogService.java similarity index 81% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysLoginLogService.java rename to framework/src/main/java/io/geekidea/boot/framework/log/service/SysLoginLogService.java index 1746e32a477d8ba42737c5317f06fb97381d68e1..238dfc782827ffd8392d8bd5ea31c54ddfc01c69 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysLoginLogService.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/service/SysLoginLogService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.service; +package io.geekidea.boot.framework.log.service; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.entity.SysLoginLog; -import io.geekidea.springbootplus.framework.log.param.SysLoginLogPageParam; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.entity.SysLoginLog; +import io.geekidea.boot.framework.log.param.SysLoginLogPageParam; /** * 系统登录日志 服务类 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysOperationLogService.java b/framework/src/main/java/io/geekidea/boot/framework/log/service/SysOperationLogService.java similarity index 81% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysOperationLogService.java rename to framework/src/main/java/io/geekidea/boot/framework/log/service/SysOperationLogService.java index 1e11d710067673580b4506c621e42b6345ac8db0..5537a2a81cb5ff15310403960fb128dc50753176 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/SysOperationLogService.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/service/SysOperationLogService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.service; +package io.geekidea.boot.framework.log.service; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.entity.SysOperationLog; -import io.geekidea.springbootplus.framework.log.param.SysOperationLogPageParam; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.entity.SysOperationLog; +import io.geekidea.boot.framework.log.param.SysOperationLogPageParam; /** * 系统操作日志 服务类 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysLoginLogServiceImpl.java b/framework/src/main/java/io/geekidea/boot/framework/log/service/impl/SysLoginLogServiceImpl.java similarity index 80% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysLoginLogServiceImpl.java rename to framework/src/main/java/io/geekidea/boot/framework/log/service/impl/SysLoginLogServiceImpl.java index 8d52c069f71fe9aaf87ff5fb92484fbd73943e68..e02fad01ad45e952c27bb73b7419b0806cfcc977 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysLoginLogServiceImpl.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/service/impl/SysLoginLogServiceImpl.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.service.impl; +package io.geekidea.boot.framework.log.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.entity.SysLoginLog; -import io.geekidea.springbootplus.framework.log.mapper.SysLoginLogMapper; -import io.geekidea.springbootplus.framework.log.param.SysLoginLogPageParam; -import io.geekidea.springbootplus.framework.log.service.SysLoginLogService; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.entity.SysLoginLog; +import io.geekidea.boot.framework.log.mapper.SysLoginLogMapper; +import io.geekidea.boot.framework.log.param.SysLoginLogPageParam; +import io.geekidea.boot.framework.log.service.SysLoginLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysOperationLogServiceImpl.java b/framework/src/main/java/io/geekidea/boot/framework/log/service/impl/SysOperationLogServiceImpl.java similarity index 81% rename from framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysOperationLogServiceImpl.java rename to framework/src/main/java/io/geekidea/boot/framework/log/service/impl/SysOperationLogServiceImpl.java index 291f774be38ccee7c9e4d5b36f6a7ace734934ce..a3a6b34ed8ce524e869b2ad315ad0c40f71306b4 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/log/service/impl/SysOperationLogServiceImpl.java +++ b/framework/src/main/java/io/geekidea/boot/framework/log/service/impl/SysOperationLogServiceImpl.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.log.service.impl; +package io.geekidea.boot.framework.log.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.entity.SysOperationLog; -import io.geekidea.springbootplus.framework.log.mapper.SysOperationLogMapper; -import io.geekidea.springbootplus.framework.log.param.SysOperationLogPageParam; -import io.geekidea.springbootplus.framework.log.service.SysOperationLogService; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.entity.SysOperationLog; +import io.geekidea.boot.framework.log.mapper.SysOperationLogMapper; +import io.geekidea.boot.framework.log.param.SysOperationLogPageParam; +import io.geekidea.boot.framework.log.service.SysOperationLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/LoginRedisService.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/cache/LoginRedisService.java similarity index 88% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/LoginRedisService.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/cache/LoginRedisService.java index 2a7d7dc9bd41cdcb7087840b2a99bef21ae8cb53..a23f16c6c06f7dc231a08343ecf45d5b0d94965c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/LoginRedisService.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/cache/LoginRedisService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.cache; +package io.geekidea.boot.framework.shiro.cache; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo; +import io.geekidea.boot.framework.shiro.jwt.JwtToken; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserRedisVo; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserVo; /** * 登录信息Redis缓存操作服务 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/impl/LoginRedisServiceImpl.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/cache/impl/LoginRedisServiceImpl.java similarity index 88% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/impl/LoginRedisServiceImpl.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/cache/impl/LoginRedisServiceImpl.java index 011c7cbb384df63c239e5eea3ef825ec10e5bdbd..541f2ba94f1fbe6a47f27d0024cc68110bd62be5 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/impl/LoginRedisServiceImpl.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/cache/impl/LoginRedisServiceImpl.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.cache.impl; - -import io.geekidea.springbootplus.config.constant.CommonRedisKey; -import io.geekidea.springbootplus.config.properties.JwtProperties; -import io.geekidea.springbootplus.framework.common.bean.ClientInfo; -import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService; -import io.geekidea.springbootplus.framework.shiro.convert.LoginSysUserVoConvert; -import io.geekidea.springbootplus.framework.shiro.convert.ShiroMapstructConvert; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken; -import io.geekidea.springbootplus.framework.shiro.vo.JwtTokenRedisVo; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo; -import io.geekidea.springbootplus.framework.util.ClientInfoUtil; -import io.geekidea.springbootplus.framework.util.HttpServletRequestUtil; +package io.geekidea.boot.framework.shiro.cache.impl; + +import io.geekidea.boot.config.constant.CommonRedisKey; +import io.geekidea.boot.config.properties.JwtProperties; +import io.geekidea.boot.framework.common.bean.ClientInfo; +import io.geekidea.boot.framework.shiro.cache.LoginRedisService; +import io.geekidea.boot.framework.shiro.convert.LoginSysUserVoConvert; +import io.geekidea.boot.framework.shiro.convert.ShiroMapstructConvert; +import io.geekidea.boot.framework.shiro.jwt.JwtToken; +import io.geekidea.boot.framework.shiro.vo.JwtTokenRedisVo; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserRedisVo; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserVo; +import io.geekidea.boot.framework.util.ClientInfoUtil; +import io.geekidea.boot.framework.util.HttpServletRequestUtil; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvert.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/convert/LoginSysUserVoConvert.java similarity index 84% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvert.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/convert/LoginSysUserVoConvert.java index c1dc5e33148f91f257a9c8c89b0a66675f1db063..4ecdf0fe47ded1b9de80498587844c01c0a5d45a 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvert.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/convert/LoginSysUserVoConvert.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.convert; +package io.geekidea.boot.framework.shiro.convert; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserRedisVo; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvert.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/convert/ShiroMapstructConvert.java similarity index 85% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvert.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/convert/ShiroMapstructConvert.java index 2b6fc0406cd6c62c310406b9c13e0c2ed0b0f541..53470ac285d9b648a44950fa219b8fbfe06b3fa2 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvert.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/convert/ShiroMapstructConvert.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.convert; +package io.geekidea.boot.framework.shiro.convert; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken; -import io.geekidea.springbootplus.framework.shiro.vo.JwtTokenRedisVo; +import io.geekidea.boot.framework.shiro.jwt.JwtToken; +import io.geekidea.boot.framework.shiro.vo.JwtTokenRedisVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/exception/ShiroConfigException.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/exception/ShiroConfigException.java similarity index 84% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/exception/ShiroConfigException.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/exception/ShiroConfigException.java index 71c3f7a43564ba2f7ac10bc3183dea0b6cfd5944..9c12bd60bfb62305adf54fc39caf932f6d6c588c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/exception/ShiroConfigException.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/exception/ShiroConfigException.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.exception; +package io.geekidea.boot.framework.shiro.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.exception.SpringBootPlusException; /** * Shiro配置异常 diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtCredentialsMatcher.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtCredentialsMatcher.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtCredentialsMatcher.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtCredentialsMatcher.java index 2d211f61cefa14bfe7a44701a5be920992790a45..bbc665894c91fa3a61317c3199ed7594d8e541ec 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtCredentialsMatcher.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtCredentialsMatcher.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.jwt; +package io.geekidea.boot.framework.shiro.jwt; -import io.geekidea.springbootplus.framework.shiro.util.JwtUtil; +import io.geekidea.boot.framework.shiro.util.JwtUtil; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtFilter.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtFilter.java similarity index 90% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtFilter.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtFilter.java index bca4d2b8408f4265f617507d436991893d8b417c..28d73079fad39ddd98a013712272bf5b01701905 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtFilter.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtFilter.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.jwt; +package io.geekidea.boot.framework.shiro.jwt; -import io.geekidea.springbootplus.config.properties.JwtProperties; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService; -import io.geekidea.springbootplus.framework.shiro.service.ShiroLoginService; -import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil; -import io.geekidea.springbootplus.framework.shiro.util.JwtUtil; -import io.geekidea.springbootplus.framework.util.HttpServletResponseUtil; +import io.geekidea.boot.config.properties.JwtProperties; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.shiro.cache.LoginRedisService; +import io.geekidea.boot.framework.shiro.service.ShiroLoginService; +import io.geekidea.boot.framework.shiro.util.JwtTokenUtil; +import io.geekidea.boot.framework.shiro.util.JwtUtil; +import io.geekidea.boot.framework.util.HttpServletResponseUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationException; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtRealm.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtRealm.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtRealm.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtRealm.java index e9244913cbb4135a2a15a18fb6bb1a1f700d7bad..7037ca7e6b4c0fdf39318658973e2203aefd3321 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtRealm.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtRealm.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.jwt; +package io.geekidea.boot.framework.shiro.jwt; -import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo; +import io.geekidea.boot.framework.shiro.cache.LoginRedisService; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserRedisVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.StringUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtToken.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtToken.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtToken.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtToken.java index 1eb668f06f0cc2d4a94fd45c80a2267f3564e078..857e4c6a3c32db98f5b6cd4380c313c9088b0853 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/jwt/JwtToken.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/jwt/JwtToken.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.jwt; +package io.geekidea.boot.framework.shiro.jwt; import com.auth0.jwt.interfaces.DecodedJWT; -import io.geekidea.springbootplus.framework.shiro.util.JwtUtil; -import io.geekidea.springbootplus.framework.util.IpUtil; +import io.geekidea.boot.framework.shiro.util.JwtUtil; +import io.geekidea.boot.framework.util.IpUtil; import lombok.Data; import lombok.experimental.Accessors; import org.apache.shiro.authc.HostAuthenticationToken; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginToken.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/LoginToken.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginToken.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/service/LoginToken.java index b61bd251ff467dd55d04715766e6f5a35292066e..2635db15c23b02f70f2004d1cb5a4370aba08605 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginToken.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/LoginToken.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.service; +package io.geekidea.boot.framework.shiro.service; import java.io.Serializable; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginUsername.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/LoginUsername.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginUsername.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/service/LoginUsername.java index 52abca9d06cbcb61318d11fc6ae7abbed1c6af30..f49a35a18c921d59950c505e075f12048fbba661 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/LoginUsername.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/LoginUsername.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.service; +package io.geekidea.boot.framework.shiro.service; import java.io.Serializable; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/ShiroLoginService.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/ShiroLoginService.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/ShiroLoginService.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/service/ShiroLoginService.java index 577895dcae854ffc76bb337def1bb0fd568e9efc..1ff95a5efca7513f0d3ea536526bd05da12aa049 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/ShiroLoginService.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/ShiroLoginService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.service; +package io.geekidea.boot.framework.shiro.service; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken; +import io.geekidea.boot.framework.shiro.jwt.JwtToken; import javax.servlet.http.HttpServletResponse; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/impl/ShiroLoginServiceImpl.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/impl/ShiroLoginServiceImpl.java similarity index 85% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/impl/ShiroLoginServiceImpl.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/service/impl/ShiroLoginServiceImpl.java index cfe5cc2c9b5718b2f060db3098e42a613252d61e..6de76157cb16f06d420ac56d46f7494c708c8eb8 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/service/impl/ShiroLoginServiceImpl.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/service/impl/ShiroLoginServiceImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.service.impl; +package io.geekidea.boot.framework.shiro.service.impl; -import io.geekidea.springbootplus.config.constant.CommonConstant; -import io.geekidea.springbootplus.config.properties.JwtProperties; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken; -import io.geekidea.springbootplus.framework.shiro.service.ShiroLoginService; -import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil; -import io.geekidea.springbootplus.framework.shiro.util.JwtUtil; +import io.geekidea.boot.config.constant.CommonConstant; +import io.geekidea.boot.config.properties.JwtProperties; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.shiro.cache.LoginRedisService; +import io.geekidea.boot.framework.shiro.jwt.JwtToken; +import io.geekidea.boot.framework.shiro.service.ShiroLoginService; +import io.geekidea.boot.framework.shiro.util.JwtTokenUtil; +import io.geekidea.boot.framework.shiro.util.JwtUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtTokenUtil.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/util/JwtTokenUtil.java similarity index 91% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtTokenUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/util/JwtTokenUtil.java index 74ecc35525ef75c402e865c316ab476033b4c2c1..3d2134c42982a42925e01ba603520d26b37ca359 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtTokenUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/util/JwtTokenUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.util; +package io.geekidea.boot.framework.shiro.util; -import io.geekidea.springbootplus.config.properties.JwtProperties; -import io.geekidea.springbootplus.framework.util.HttpServletRequestUtil; +import io.geekidea.boot.config.properties.JwtProperties; +import io.geekidea.boot.framework.util.HttpServletRequestUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtUtil.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/util/JwtUtil.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/util/JwtUtil.java index fe1c53fc968f2604e8e7c6fef3ed9ae1ef7a3102..972907868757fec027afacaecce5d0c9f2f3fa1a 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/JwtUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/util/JwtUtil.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.util; +package io.geekidea.boot.framework.shiro.util; import com.alibaba.fastjson.JSON; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; -import io.geekidea.springbootplus.config.constant.CommonConstant; -import io.geekidea.springbootplus.config.properties.JwtProperties; -import io.geekidea.springbootplus.framework.util.UUIDUtil; +import io.geekidea.boot.config.constant.CommonConstant; +import io.geekidea.boot.config.properties.JwtProperties; +import io.geekidea.boot.framework.util.UUIDUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/SaltUtil.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/util/SaltUtil.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/SaltUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/util/SaltUtil.java index 0424cfbc932f5db02f277a8b7284a015f51c5b4a..d5ffaf3a47e8ba700916d5e5ef5133dd09216ab4 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/util/SaltUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/util/SaltUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.util; +package io.geekidea.boot.framework.shiro.util; -import io.geekidea.springbootplus.config.properties.JwtProperties; +import io.geekidea.boot.config.properties.JwtProperties; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.crypto.SecureRandomNumberGenerator; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/JwtTokenRedisVo.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/vo/JwtTokenRedisVo.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/JwtTokenRedisVo.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/vo/JwtTokenRedisVo.java index 085fa41b27a7d220eb6edcf4d66debb765bb7395..7d803b8a1f2678ab647b99cd6562d49bd38210f8 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/JwtTokenRedisVo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/vo/JwtTokenRedisVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.vo; +package io.geekidea.boot.framework.shiro.vo; import lombok.Data; import lombok.experimental.Accessors; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserRedisVo.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/vo/LoginSysUserRedisVo.java similarity index 90% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserRedisVo.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/vo/LoginSysUserRedisVo.java index ade7efe1473d9294d3330c0a35855315febf4fa7..73de27339889e9cd98ca8f41504b404cfb787657 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserRedisVo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/vo/LoginSysUserRedisVo.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.vo; +package io.geekidea.boot.framework.shiro.vo; -import io.geekidea.springbootplus.framework.common.bean.ClientInfo; +import io.geekidea.boot.framework.common.bean.ClientInfo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserVo.java b/framework/src/main/java/io/geekidea/boot/framework/shiro/vo/LoginSysUserVo.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserVo.java rename to framework/src/main/java/io/geekidea/boot/framework/shiro/vo/LoginSysUserVo.java index fa27c147fec2f2165a2e380ea903233974582209..d59be9a1711ef0878a8de1b94a24d0f957ec94b6 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/shiro/vo/LoginSysUserVo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/shiro/vo/LoginSysUserVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.shiro.vo; +package io.geekidea.boot.framework.shiro.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/AnsiUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/AnsiUtil.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/AnsiUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/AnsiUtil.java index 9e4c5b1580cb5316c8bb8b7c8814f27e1552f7dd..738698dc4d57fdcc0838c4c761109322962ea2b5 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/AnsiUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/AnsiUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import lombok.extern.slf4j.Slf4j; import org.fusesource.jansi.Ansi; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/BaseEnumUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/BaseEnumUtil.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/BaseEnumUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/BaseEnumUtil.java index 5fd63fdd2fe66a2b2154d7fdb717b8fe9b93d568..75f9ba98f8a137f335cf9dca09f3f7ac3aefb411 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/BaseEnumUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/BaseEnumUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; -import io.geekidea.springbootplus.framework.common.enums.BaseEnum; -import io.geekidea.springbootplus.framework.common.vo.EnumVo; +import io.geekidea.boot.framework.common.enums.BaseEnum; +import io.geekidea.boot.framework.common.vo.EnumVo; import org.apache.commons.collections4.MapUtils; import java.util.Collection; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/BrowserUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/BrowserUtil.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/BrowserUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/BrowserUtil.java index b69f3e09bbdc4f50ad507d3bc4b8c4081060a2bd..738cee4683bd883efa36115378e0426baa84dab9 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/BrowserUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/BrowserUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import javax.servlet.http.HttpServletRequest; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/ClientInfoUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/ClientInfoUtil.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/ClientInfoUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/ClientInfoUtil.java index d3229f522c437fce3dbfd3ca251dc7b56e96febb..ce6adcad4b626c789b787215d23f3b6708d65e13 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/ClientInfoUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/ClientInfoUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import io.geekidea.springbootplus.config.constant.CommonConstant; -import io.geekidea.springbootplus.framework.common.bean.ClientInfo; -import io.geekidea.springbootplus.framework.common.bean.DeviceInfo; +import io.geekidea.boot.config.constant.CommonConstant; +import io.geekidea.boot.framework.common.bean.ClientInfo; +import io.geekidea.boot.framework.common.bean.DeviceInfo; import javax.servlet.http.HttpServletRequest; import java.util.regex.Matcher; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/ContentTypeUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/ContentTypeUtil.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/ContentTypeUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/ContentTypeUtil.java index 6d95c519979015018efe4ec37e0991dd338e1170..539edeea5ea0e243fae396e06d88f32680446528 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/ContentTypeUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/ContentTypeUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/DateUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/DateUtil.java similarity index 92% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/DateUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/DateUtil.java index 20c70a7d6dbc564533451629f23c269c54730f75..2df7b97969f834620182cc7b52b76d43b20a901c 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/DateUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/DateUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; -import io.geekidea.springbootplus.config.constant.DatePattern; +import io.geekidea.boot.config.constant.DatePattern; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/DownloadUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/DownloadUtil.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/DownloadUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/DownloadUtil.java index 58415ce2d86e76770d2993f527bc0eab2581e0d5..087383fe5eab3b92c30f5abbcef41b98735079db 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/DownloadUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/DownloadUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; -import io.geekidea.springbootplus.config.constant.CommonConstant; +import io.geekidea.boot.config.constant.CommonConstant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletRequestUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/HttpServletRequestUtil.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletRequestUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/HttpServletRequestUtil.java index c136140335343e5e88266756e5a6513fe6ef88c1..9c080aceeb17c9e8918403b4a1a75116ee5bf414 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletRequestUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/HttpServletRequestUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletResponseUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/HttpServletResponseUtil.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletResponseUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/HttpServletResponseUtil.java index 5981599319bc2d23f824c8b44287094377430ab2..1b836acf4449afb9ea538e740368096c7f878b04 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/HttpServletResponseUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/HttpServletResponseUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import com.alibaba.fastjson.JSON; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/IniUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/IniUtil.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/IniUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/IniUtil.java index 842b9165b826a3ae7aa64eb968fe28ca9ad228e6..19b372ecc7e5cd72599a58369117a219c801a233 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/IniUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/IniUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import org.ini4j.Config; import org.ini4j.Ini; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/IpUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/IpUtil.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/IpUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/IpUtil.java index e58830ac19e7203db17abad621d209a133d7b3e5..86336db0fd8934e831cb7a38575ad6c7cf3388b0 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/IpUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/IpUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/Jackson.java b/framework/src/main/java/io/geekidea/boot/framework/util/Jackson.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/Jackson.java rename to framework/src/main/java/io/geekidea/boot/framework/util/Jackson.java index 820a483b42aee68e1788b6bafd90aa14a59eb97f..13212f7667978179824f4666edeab9f34dcf01b2 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/Jackson.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/Jackson.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/LambdaColumn.java b/framework/src/main/java/io/geekidea/boot/framework/util/LambdaColumn.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/LambdaColumn.java rename to framework/src/main/java/io/geekidea/boot/framework/util/LambdaColumn.java index 1df3df9c2bafcd362d0656eb3fd398a5d6471ecb..b5a8f04ebc82f342b9360292f8d99bec6fa8574a 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/LambdaColumn.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/LambdaColumn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/LoginUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/LoginUtil.java similarity index 87% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/LoginUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/LoginUtil.java index e781fb9dd7c124d4e2398b2fe4a366411c59285f..2dba64e3ed9294a96493724792230dfa9d780fde 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/LoginUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/LoginUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; -import io.geekidea.springbootplus.config.constant.CommonRedisKey; -import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil; -import io.geekidea.springbootplus.framework.shiro.util.JwtUtil; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserRedisVo; +import io.geekidea.boot.config.constant.CommonRedisKey; +import io.geekidea.boot.framework.shiro.util.JwtTokenUtil; +import io.geekidea.boot.framework.shiro.util.JwtUtil; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserRedisVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.data.redis.core.RedisTemplate; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/MapUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/MapUtil.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/MapUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/MapUtil.java index 10a2b3a676040519beef6fade9bbed1fbad3ecb1..76b7ed3f2bdd45986f34a971dad00a87b6c86f30 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/MapUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/MapUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import java.util.HashMap; import java.util.Map; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PasswordUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/PasswordUtil.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/PasswordUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/PasswordUtil.java index 91e1f3df414b59462111dbc04d2fe396ed02135f..21df7d25fa85d3d6e6c905e53d646917d2e31ddb 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PasswordUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/PasswordUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PhoneUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/PhoneUtil.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/PhoneUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/PhoneUtil.java index 47e52509cbb9a442ffde09203de6f94f2df93dbb..b52ca6728dcfec71a9937fd4d3a024cfaa6a10e1 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PhoneUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/PhoneUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PrintApplicationInfo.java b/framework/src/main/java/io/geekidea/boot/framework/util/PrintApplicationInfo.java similarity index 99% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/PrintApplicationInfo.java rename to framework/src/main/java/io/geekidea/boot/framework/util/PrintApplicationInfo.java index 0958b1cbc187fbf37948a58692990fb3434a2ecd..991cbeace45068d8045c8bbb89e6daf131110c45 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PrintApplicationInfo.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/PrintApplicationInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import lombok.extern.slf4j.Slf4j; import org.fusesource.jansi.Ansi; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PropertyColumnUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/PropertyColumnUtil.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/PropertyColumnUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/PropertyColumnUtil.java index 6296585d1db97747950304d3975ddb4e060e4f57..8c9f98d7cdc652ce8aea2a419846c60f6b14fb87 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/PropertyColumnUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/PropertyColumnUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/RedisCacheUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/RedisCacheUtil.java similarity index 96% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/RedisCacheUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/RedisCacheUtil.java index a0bcf7b2052bd653f8cd4f90358a8faa7ad24733..fa5b91e6bb5abe864fe18a856ee5cc6c4e9060aa 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/RedisCacheUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/RedisCacheUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/SpringContextUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/SpringContextUtil.java similarity index 97% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/SpringContextUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/SpringContextUtil.java index 97cf8cae02c6163aa60eb02f9f7ff8332647fb0d..19f24f02e357c728302811b00305c1540f92b6e3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/SpringContextUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/SpringContextUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/TokenUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/TokenUtil.java similarity index 95% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/TokenUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/TokenUtil.java index 4c9e25ea9322c5cbea20722d6d82b7e5f2d25848..47785e48b3a0abfd63c7a7659717cf541681e776 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/TokenUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/TokenUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; /** * @author geekidea diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/UUIDUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/UUIDUtil.java similarity index 94% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/UUIDUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/UUIDUtil.java index 15046bb5e5f1ccca717a0d60a20d52d2286787b5..4d275076406401ae9f534611927d94521165be82 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/UUIDUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/UUIDUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import java.util.UUID; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/UploadUtil.java b/framework/src/main/java/io/geekidea/boot/framework/util/UploadUtil.java similarity index 98% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/UploadUtil.java rename to framework/src/main/java/io/geekidea/boot/framework/util/UploadUtil.java index 61332be938621328c90bc31b6d601c1955842d20..f92f72d2be78b709172b1e9486e5a872944017e3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/UploadUtil.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/UploadUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/VerificationCode.java b/framework/src/main/java/io/geekidea/boot/framework/util/VerificationCode.java similarity index 99% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/VerificationCode.java rename to framework/src/main/java/io/geekidea/boot/framework/util/VerificationCode.java index cd53e8f956be8473906fd7106a2432cd10b54b7e..19832c3e4e2a5b62825014aff24b2029e0dda2d3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/VerificationCode.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/VerificationCode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.framework.util; +package io.geekidea.boot.framework.util; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/framework/src/main/java/io/geekidea/springbootplus/framework/util/package-info.java b/framework/src/main/java/io/geekidea/boot/framework/util/package-info.java similarity index 93% rename from framework/src/main/java/io/geekidea/springbootplus/framework/util/package-info.java rename to framework/src/main/java/io/geekidea/boot/framework/util/package-info.java index 624963ce37aeded2d9cf721b70abe1a5c576aa5a..4ffce4a7147f04782c1d30441c2b71c8221d90d3 100644 --- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/package-info.java +++ b/framework/src/main/java/io/geekidea/boot/framework/util/package-info.java @@ -19,4 +19,4 @@ * @author geekidea * @date 2018-11-08 */ -package io.geekidea.springbootplus.framework.util; \ No newline at end of file +package io.geekidea.boot.framework.util; \ No newline at end of file diff --git a/framework/src/main/resources/mapper/ip/IpAddressMapper.xml b/framework/src/main/resources/mapper/ip/IpAddressMapper.xml index b3aab33c93af51544813cea9717fd2f61c067222..e445ead0c15033b2d5b401b0af80fda36b6e08ec 100644 --- a/framework/src/main/resources/mapper/ip/IpAddressMapper.xml +++ b/framework/src/main/resources/mapper/ip/IpAddressMapper.xml @@ -16,9 +16,9 @@ --> - + - select area, operator from ip_address where INET_ATON(#{ip}) > ip_start_num diff --git a/framework/src/main/resources/mapper/log/SysLoginLogMapper.xml b/framework/src/main/resources/mapper/log/SysLoginLogMapper.xml index d461b371c337771be384ee62a7b0fae941722be3..2b9d0b111290bfb2cdc512df811f8b21859c760d 100644 --- a/framework/src/main/resources/mapper/log/SysLoginLogMapper.xml +++ b/framework/src/main/resources/mapper/log/SysLoginLogMapper.xml @@ -16,6 +16,6 @@ --> - + diff --git a/framework/src/main/resources/mapper/log/SysOperationLogMapper.xml b/framework/src/main/resources/mapper/log/SysOperationLogMapper.xml index 3a1a33816abffcbcb933f78811bb9b0fbc4eb581..b31ddc7860435009fe02d58e65c88b42f51cad12 100644 --- a/framework/src/main/resources/mapper/log/SysOperationLogMapper.xml +++ b/framework/src/main/resources/mapper/log/SysOperationLogMapper.xml @@ -16,6 +16,6 @@ --> - + diff --git a/generator/pom.xml b/generator/pom.xml index 47f9ebb4eca2c206114de154b79788c6d4fa9833..6a79128f1d950d6020bcc1e5ac46883250c24580 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT generator @@ -32,7 +32,7 @@ - io.geekidea.springbootplus + io.geekidea.boot framework @@ -40,11 +40,6 @@ velocity-engine-core ${velocity.version} - - org.springframework.boot - spring-boot-starter-test - test - com.baomidou diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/CodeGenerator.java b/generator/src/main/java/io/geekidea/boot/generator/CodeGenerator.java similarity index 97% rename from generator/src/main/java/io/geekidea/springbootplus/generator/CodeGenerator.java rename to generator/src/main/java/io/geekidea/boot/generator/CodeGenerator.java index 1c0b29a1f55607e91f9d130a6bd0d7a7de07ab71..70531c55617f72eea95047e266694299820f521c 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/CodeGenerator.java +++ b/generator/src/main/java/io/geekidea/boot/generator/CodeGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator; +package io.geekidea.boot.generator; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.toolkit.StringPool; @@ -23,12 +23,12 @@ import com.baomidou.mybatisplus.generator.InjectionConfig; import com.baomidou.mybatisplus.generator.config.*; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import io.geekidea.springbootplus.generator.config.*; -import io.geekidea.springbootplus.generator.config.query.SpringBootPlusMySqlQuery; -import io.geekidea.springbootplus.generator.config.query.SpringBootPlusSqlServerQuery; -import io.geekidea.springbootplus.generator.constant.GeneratorConstant; -import io.geekidea.springbootplus.generator.exception.GeneratorException; -import io.geekidea.springbootplus.generator.properties.GeneratorProperties; +import io.geekidea.boot.generator.config.*; +import io.geekidea.boot.generator.config.query.SpringBootPlusMySqlQuery; +import io.geekidea.boot.generator.config.query.SpringBootPlusSqlServerQuery; +import io.geekidea.boot.generator.constant.GeneratorConstant; +import io.geekidea.boot.generator.exception.GeneratorException; +import io.geekidea.boot.generator.properties.GeneratorProperties; import lombok.Data; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java b/generator/src/main/java/io/geekidea/boot/generator/SpringBootPlusGenerator.java similarity index 92% rename from generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java rename to generator/src/main/java/io/geekidea/boot/generator/SpringBootPlusGenerator.java index 85e6fad7ce798f49b5a57dcf92db9861c44a17a3..3a958304a5f277393322abf08c0a4fd683266333 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java +++ b/generator/src/main/java/io/geekidea/boot/generator/SpringBootPlusGenerator.java @@ -14,19 +14,17 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator; +package io.geekidea.boot.generator; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.config.rules.DateType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import io.geekidea.springbootplus.generator.config.GeneratorStrategy; -import io.geekidea.springbootplus.generator.constant.GeneratorConstant; -import io.geekidea.springbootplus.generator.properties.GeneratorProperties; +import io.geekidea.boot.generator.config.GeneratorStrategy; +import io.geekidea.boot.generator.constant.GeneratorConstant; +import io.geekidea.boot.generator.properties.GeneratorProperties; import org.springframework.stereotype.Component; -import java.util.Arrays; - /** * spring-boot-plus代码生成器入口类 * diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorConfig.java b/generator/src/main/java/io/geekidea/boot/generator/config/GeneratorConfig.java similarity index 97% rename from generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorConfig.java rename to generator/src/main/java/io/geekidea/boot/generator/config/GeneratorConfig.java index e5c5cce1747a3e4b8132b2c84c38687e3b0f5e03..21ce46ceda016ab7f5dff1a0045c1cfa21a30186 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorConfig.java +++ b/generator/src/main/java/io/geekidea/boot/generator/config/GeneratorConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.config; +package io.geekidea.boot.generator.config; import lombok.Data; import lombok.experimental.Accessors; diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorStrategy.java b/generator/src/main/java/io/geekidea/boot/generator/config/GeneratorStrategy.java similarity index 94% rename from generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorStrategy.java rename to generator/src/main/java/io/geekidea/boot/generator/config/GeneratorStrategy.java index c03621a0b30a25aee566a223f5b8fa241fa5255c..45ca4b75e5786f1da771a4621d61d7cc9a538850 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/config/GeneratorStrategy.java +++ b/generator/src/main/java/io/geekidea/boot/generator/config/GeneratorStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.config; +package io.geekidea.boot.generator.config; /** * 生成策略 diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/config/MybatisPlusGeneratorConfig.java b/generator/src/main/java/io/geekidea/boot/generator/config/MybatisPlusGeneratorConfig.java similarity index 96% rename from generator/src/main/java/io/geekidea/springbootplus/generator/config/MybatisPlusGeneratorConfig.java rename to generator/src/main/java/io/geekidea/boot/generator/config/MybatisPlusGeneratorConfig.java index 1f93d853307f882cb5e8b67c36224ccdcaba0e5c..1d27a2cdcf48ebbce8de6aa79812592bbdd51291 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/config/MybatisPlusGeneratorConfig.java +++ b/generator/src/main/java/io/geekidea/boot/generator/config/MybatisPlusGeneratorConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.config; +package io.geekidea.boot.generator.config; import com.baomidou.mybatisplus.generator.config.GlobalConfig; import com.baomidou.mybatisplus.generator.config.PackageConfig; diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/config/ProjectConfig.java b/generator/src/main/java/io/geekidea/boot/generator/config/ProjectConfig.java similarity index 93% rename from generator/src/main/java/io/geekidea/springbootplus/generator/config/ProjectConfig.java rename to generator/src/main/java/io/geekidea/boot/generator/config/ProjectConfig.java index 463cc01567f2f285712c6607234ed04f75a023ed..e5a0c1f9a3e97408ce14c93eef741b13b5d670ee 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/config/ProjectConfig.java +++ b/generator/src/main/java/io/geekidea/boot/generator/config/ProjectConfig.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.config; +package io.geekidea.boot.generator.config; -import io.geekidea.springbootplus.generator.constant.GeneratorConstant; +import io.geekidea.boot.generator.constant.GeneratorConstant; import lombok.Data; import lombok.experimental.Accessors; diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/config/TableConfig.java b/generator/src/main/java/io/geekidea/boot/generator/config/TableConfig.java similarity index 94% rename from generator/src/main/java/io/geekidea/springbootplus/generator/config/TableConfig.java rename to generator/src/main/java/io/geekidea/boot/generator/config/TableConfig.java index 89fe4303f1bebcf01040c114a760e8e4f97c12ea..8082e2e354fcf38b5cff6ec07c1fbe3e0821795e 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/config/TableConfig.java +++ b/generator/src/main/java/io/geekidea/boot/generator/config/TableConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.config; +package io.geekidea.boot.generator.config; import lombok.Data; import lombok.experimental.Accessors; diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusMySqlQuery.java b/generator/src/main/java/io/geekidea/boot/generator/config/query/SpringBootPlusMySqlQuery.java similarity index 94% rename from generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusMySqlQuery.java rename to generator/src/main/java/io/geekidea/boot/generator/config/query/SpringBootPlusMySqlQuery.java index e677bc8b9c8da42a11a981229508dbb9a1303bc7..490b9ccc8174f9992dfd06c43293c1f1f8a77d8d 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusMySqlQuery.java +++ b/generator/src/main/java/io/geekidea/boot/generator/config/query/SpringBootPlusMySqlQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.config.query; +package io.geekidea.boot.generator.config.query; import com.baomidou.mybatisplus.generator.config.querys.MySqlQuery; diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusSqlServerQuery.java b/generator/src/main/java/io/geekidea/boot/generator/config/query/SpringBootPlusSqlServerQuery.java similarity index 96% rename from generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusSqlServerQuery.java rename to generator/src/main/java/io/geekidea/boot/generator/config/query/SpringBootPlusSqlServerQuery.java index 862dabf76641c0fee7ec94fc9276c3e5782eb6b4..f285887a60f19055238dc036828d94a09a7fe85b 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/config/query/SpringBootPlusSqlServerQuery.java +++ b/generator/src/main/java/io/geekidea/boot/generator/config/query/SpringBootPlusSqlServerQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.config.query; +package io.geekidea.boot.generator.config.query; import com.baomidou.mybatisplus.generator.config.querys.SqlServerQuery; diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/constant/GeneratorConstant.java b/generator/src/main/java/io/geekidea/boot/generator/constant/GeneratorConstant.java similarity index 70% rename from generator/src/main/java/io/geekidea/springbootplus/generator/constant/GeneratorConstant.java rename to generator/src/main/java/io/geekidea/boot/generator/constant/GeneratorConstant.java index e2f85e90b7e25761e8cf0b92a4fb1696efe6502c..86ebbbc8bd2de0dcad21d37777730fa2eed12d4a 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/constant/GeneratorConstant.java +++ b/generator/src/main/java/io/geekidea/boot/generator/constant/GeneratorConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.constant; +package io.geekidea.boot.generator.constant; import java.io.File; @@ -93,49 +93,49 @@ public interface GeneratorConstant { /** * 自定义继承的Entity类全称，带包名 */ - String SUPER_ENTITY_CLASS = "io.geekidea.springbootplus.framework.common.entity.BaseEntity"; + String SUPER_ENTITY_CLASS = "io.geekidea.boot.framework.common.entity.BaseEntity"; /** * 自定义继承的Controller类全称，带包名 */ - String SUPER_CONTROLLER_CLASS = "io.geekidea.springbootplus.framework.common.controller.BaseController"; + String SUPER_CONTROLLER_CLASS = "io.geekidea.boot.framework.common.controller.BaseController"; /** * 自定义继承的Service类全称，带包名 */ - String SUPER_SERVICE_CLASS = "io.geekidea.springbootplus.framework.common.service.BaseService"; + String SUPER_SERVICE_CLASS = "io.geekidea.boot.framework.common.service.BaseService"; /** * 自定义继承的ServiceImpl类全称，带包名 */ - String SUPER_SERVICE_IMPL_CLASS = "io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl"; + String SUPER_SERVICE_IMPL_CLASS = "io.geekidea.boot.framework.common.service.impl.BaseServiceImpl"; /** * 分页参数父类全称，带包名 */ - String SUPER_PAGE_PARAM_CLASS = "io.geekidea.springbootplus.framework.core.pagination.BasePageParam"; + String SUPER_PAGE_PARAM_CLASS = "io.geekidea.boot.framework.core.pagination.BasePageParam"; /** * 分页排序参数父类全称，带包名 */ - String SUPER_PAGE_ORDER_PARAM_CLASS = "io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam"; + String SUPER_PAGE_ORDER_PARAM_CLASS = "io.geekidea.boot.framework.core.pagination.BasePageOrderParam"; /** * 公共id参数类全称，带包名 */ - String ID_PARAM_CLASS = "io.geekidea.springbootplus.framework.common.param.IdParam"; + String ID_PARAM_CLASS = "io.geekidea.boot.framework.common.param.IdParam"; /** * 分页对象类全称，带包名 */ - String PAGING_CLASS = "io.geekidea.springbootplus.framework.core.pagination.Paging"; + String PAGING_CLASS = "io.geekidea.boot.framework.core.pagination.Paging"; /** * 分页信息类全称，带包名 */ - String PAGE_INFO_CLASS = "io.geekidea.springbootplus.framework.core.pagination.PageInfo"; + String PAGE_INFO_CLASS = "io.geekidea.boot.framework.core.pagination.PageInfo"; /** * 公共结果类全称，带包名 */ - String API_RESULT_CLASS = "io.geekidea.springbootplus.framework.common.api.ApiResult"; + String API_RESULT_CLASS = "io.geekidea.boot.framework.common.api.ApiResult"; /** * 分组验证Add.class类路径 */ - String VALIDATOR_ADD_PACKAGE = "io.geekidea.springbootplus.framework.core.validator.groups.Add"; + String VALIDATOR_ADD_PACKAGE = "io.geekidea.boot.framework.core.validator.groups.Add"; /** * 分组验证Update.class类路径 */ - String VALIDATOR_UPDATE_PACKAGE = "io.geekidea.springbootplus.framework.core.validator.groups.Update"; + String VALIDATOR_UPDATE_PACKAGE = "io.geekidea.boot.framework.core.validator.groups.Update"; } diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/exception/GeneratorException.java b/generator/src/main/java/io/geekidea/boot/generator/exception/GeneratorException.java similarity index 84% rename from generator/src/main/java/io/geekidea/springbootplus/generator/exception/GeneratorException.java rename to generator/src/main/java/io/geekidea/boot/generator/exception/GeneratorException.java index 2421b141622eee05cd6e4161e2390469418da18a..e95052d0a3d7230413ba8835ced571713da9f37d 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/exception/GeneratorException.java +++ b/generator/src/main/java/io/geekidea/boot/generator/exception/GeneratorException.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.exception; +package io.geekidea.boot.generator.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.exception.SpringBootPlusException; /** * 代码生成异常 diff --git a/generator/src/main/java/io/geekidea/springbootplus/generator/properties/GeneratorProperties.java b/generator/src/main/java/io/geekidea/boot/generator/properties/GeneratorProperties.java similarity index 90% rename from generator/src/main/java/io/geekidea/springbootplus/generator/properties/GeneratorProperties.java rename to generator/src/main/java/io/geekidea/boot/generator/properties/GeneratorProperties.java index 07d4506f05551227f1f7ac01292fef2b5f571ddc..a1e13e0bbf3936931049db57cb31d6a8da355df6 100644 --- a/generator/src/main/java/io/geekidea/springbootplus/generator/properties/GeneratorProperties.java +++ b/generator/src/main/java/io/geekidea/boot/generator/properties/GeneratorProperties.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.properties; +package io.geekidea.boot.generator.properties; import com.baomidou.mybatisplus.generator.config.DataSourceConfig; -import io.geekidea.springbootplus.generator.config.GeneratorConfig; -import io.geekidea.springbootplus.generator.config.MybatisPlusGeneratorConfig; -import io.geekidea.springbootplus.generator.config.ProjectConfig; -import io.geekidea.springbootplus.generator.config.TableConfig; +import io.geekidea.boot.generator.config.GeneratorConfig; +import io.geekidea.boot.generator.config.MybatisPlusGeneratorConfig; +import io.geekidea.boot.generator.config.ProjectConfig; +import io.geekidea.boot.generator.config.TableConfig; import lombok.Data; import lombok.experimental.Accessors; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/generator/src/main/resources/templates/controller.java.vm b/generator/src/main/resources/templates/controller.java.vm index 1553312909f6ba26bb48c3b962057743a219b05e..85caaf602a1655ce6a56acd4a1c10259d0fe9050 100644 --- a/generator/src/main/resources/templates/controller.java.vm +++ b/generator/src/main/resources/templates/controller.java.vm @@ -17,9 +17,9 @@ import ${cfg.apiResultClass}; import ${cfg.pagingClass}; import ${cfg.idParamClass}; #if(${cfg.operationLog}) -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; #end #if(${cfg.paramValidation}) import ${cfg.validatorAddPackage}; diff --git a/generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorPropertiesTest.java b/generator/src/test/java/io/geekidea/boot/generator/test/GeneratorPropertiesTest.java similarity index 87% rename from generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorPropertiesTest.java rename to generator/src/test/java/io/geekidea/boot/generator/test/GeneratorPropertiesTest.java index 3b6a14690f5e5d897969c1ad318d8a866838db7b..402495bb2ff0956f170b943935da2a5bfe0823d6 100644 --- a/generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorPropertiesTest.java +++ b/generator/src/test/java/io/geekidea/boot/generator/test/GeneratorPropertiesTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.test; +package io.geekidea.boot.generator.test; -import io.geekidea.springbootplus.generator.CodeGenerator; -import io.geekidea.springbootplus.generator.properties.GeneratorProperties; +import io.geekidea.boot.generator.CodeGenerator; +import io.geekidea.boot.generator.properties.GeneratorProperties; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorTestApplication.java b/generator/src/test/java/io/geekidea/boot/generator/test/GeneratorTestApplication.java similarity index 85% rename from generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorTestApplication.java rename to generator/src/test/java/io/geekidea/boot/generator/test/GeneratorTestApplication.java index f17489da44da67f13932cc78f1689a75f7a1ab15..cd5c12d2c9d782873a9982085c8bc6d71c3295b4 100644 --- a/generator/src/test/java/io/geekidea/springbootplus/generator/test/GeneratorTestApplication.java +++ b/generator/src/test/java/io/geekidea/boot/generator/test/GeneratorTestApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.generator.test; +package io.geekidea.boot.generator.test; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -22,6 +22,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author geekidea * @date 2020/3/12 **/ -@SpringBootApplication(scanBasePackages = "io.geekidea.springbootplus.generator") +@SpringBootApplication(scanBasePackages = "io.geekidea.boot.generator") public class GeneratorTestApplication { } diff --git a/pom.xml b/pom.xml index a4f929f58e2441be57f8d1668c930cdf9482ca12..bf37854482fd073a1e998f57df022b53e2cdb066 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT pom spring-boot-plus @@ -108,59 +108,6 @@ pom import - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-aop - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-tomcat - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-jdbc - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-data-redis - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-json - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-validation - ${spring-boot.version} - - - org.springframework.boot - spring-boot-configuration-processor - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-security - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot.version} - test - - @@ -196,7 +143,6 @@ ${knife4j.version} - com.alibaba fastjson @@ -297,37 +243,37 @@ - io.geekidea.springbootplus + io.geekidea.boot admin ${project.version} - io.geekidea.springbootplus + io.geekidea.boot bootstrap ${project.version} - io.geekidea.springbootplus + io.geekidea.boot config ${project.version} - io.geekidea.springbootplus + io.geekidea.boot example ${project.version} - io.geekidea.springbootplus + io.geekidea.boot framework ${project.version} - io.geekidea.springbootplus + io.geekidea.boot system ${project.version} - io.geekidea.springbootplus + io.geekidea.boot scheduled ${project.version} diff --git a/scheduled/pom.xml b/scheduled/pom.xml index 270b6edc1c7fc0da8925562c9a2d941dd5d97598..53bfd9ff747797f445cc62cf33976f720692d857 100644 --- a/scheduled/pom.xml +++ b/scheduled/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT scheduled @@ -32,7 +32,7 @@ - io.geekidea.springbootplus + io.geekidea.boot example diff --git a/scheduled/src/main/java/io/geekidea/springbootplus/scheduled/HelloScheduled.java b/scheduled/src/main/java/io/geekidea/boot/scheduled/HelloScheduled.java similarity index 95% rename from scheduled/src/main/java/io/geekidea/springbootplus/scheduled/HelloScheduled.java rename to scheduled/src/main/java/io/geekidea/boot/scheduled/HelloScheduled.java index 4a0b09878a26125cbaf845c2406c8ccd552e6f9f..853f5c077db45cd725a0d3eab849f059dd720755 100644 --- a/scheduled/src/main/java/io/geekidea/springbootplus/scheduled/HelloScheduled.java +++ b/scheduled/src/main/java/io/geekidea/boot/scheduled/HelloScheduled.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.scheduled; +package io.geekidea.boot.scheduled; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/system/pom.xml b/system/pom.xml index 230daf253faef36d3db069414389d92850411f82..85e9549d629333be54fa9c0cadbfe8937bc58313 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -21,9 +21,9 @@ 4.0.0 - io.geekidea.springbootplus - parent - 2.0 + io.geekidea.boot + spring-boot-plus + 2.1-SNAPSHOT system @@ -32,7 +32,7 @@ - io.geekidea.springbootplus + io.geekidea.boot framework diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/DownloadController.java b/system/src/main/java/io/geekidea/boot/system/controller/DownloadController.java similarity index 85% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/DownloadController.java rename to system/src/main/java/io/geekidea/boot/system/controller/DownloadController.java index 5a7b8ed456185f16aaf47e23d1c22e3d0f18ce4e..9cbb67f09ade763309e578ada624d7a6e39f6acc 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/DownloadController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/DownloadController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.framework.util.DownloadUtil; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.util.DownloadUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/HelloWorldController.java b/system/src/main/java/io/geekidea/boot/system/controller/HelloWorldController.java similarity index 88% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/HelloWorldController.java rename to system/src/main/java/io/geekidea/boot/system/controller/HelloWorldController.java index fd8af5ba19c40ced78df2809aa693267b26701b5..ca8b44b4222eea73788968019ab22a55fbf74a75 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/HelloWorldController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/HelloWorldController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.log.annotation.OperationLog; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/LoginController.java b/system/src/main/java/io/geekidea/boot/system/controller/LoginController.java similarity index 80% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/LoginController.java rename to system/src/main/java/io/geekidea/boot/system/controller/LoginController.java index 3e131a608416604282f325c42494690b0d40845f..3afeb2ad03a53319b3a1ee44169418145f0ed74d 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/LoginController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/LoginController.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; import com.alibaba.fastjson.JSON; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore; -import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil; -import io.geekidea.springbootplus.system.service.LoginService; -import io.geekidea.springbootplus.system.service.SysUserService; -import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo; -import io.geekidea.springbootplus.system.vo.SysUserQueryVo; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLogIgnore; +import io.geekidea.boot.framework.shiro.util.JwtTokenUtil; +import io.geekidea.boot.system.service.LoginService; +import io.geekidea.boot.system.service.SysUserService; +import io.geekidea.boot.system.vo.LoginSysUserTokenVo; +import io.geekidea.boot.system.vo.SysUserQueryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -63,8 +63,8 @@ public class LoginController { @PostMapping("/login") @OperationLogIgnore - @ApiOperation(value = "登录", notes = "系统用户登录", response = io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo.class) - public ApiResult login(@Validated @RequestBody io.geekidea.springbootplus.system.param.LoginParam loginParam, HttpServletResponse response) throws Exception { + @ApiOperation(value = "登录", notes = "系统用户登录", response = io.geekidea.boot.system.vo.LoginSysUserTokenVo.class) + public ApiResult login(@Validated @RequestBody io.geekidea.boot.system.param.LoginParam loginParam, HttpServletResponse response) throws Exception { LoginSysUserTokenVo loginSysUserTokenVo = loginService.login(loginParam); // 设置token响应头 response.setHeader(JwtTokenUtil.getTokenName(), loginSysUserTokenVo.getToken()); diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/ResourceController.java b/system/src/main/java/io/geekidea/boot/system/controller/ResourceController.java similarity index 83% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/ResourceController.java rename to system/src/main/java/io/geekidea/boot/system/controller/ResourceController.java index f9be29a36c312ffe3f76596e8620946cd7dbc022..8b5d2834cb413e6e25d43d0397d95c3aef7b09ed 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/ResourceController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/ResourceController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysDepartmentController.java b/system/src/main/java/io/geekidea/boot/system/controller/SysDepartmentController.java similarity index 87% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/SysDepartmentController.java rename to system/src/main/java/io/geekidea/boot/system/controller/SysDepartmentController.java index 0566feab88c7af250005c8d74fcd4c4fd42cd5ab..bf3f56f01a416323db14f46de3294bf9d4f8256c 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysDepartmentController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/SysDepartmentController.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.system.entity.SysDepartment; -import io.geekidea.springbootplus.system.param.SysDepartmentPageParam; -import io.geekidea.springbootplus.system.service.SysDepartmentService; -import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo; -import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.system.entity.SysDepartment; +import io.geekidea.boot.system.param.SysDepartmentPageParam; +import io.geekidea.boot.system.service.SysDepartmentService; +import io.geekidea.boot.system.vo.SysDepartmentQueryVo; +import io.geekidea.boot.system.vo.SysDepartmentTreeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysPermissionController.java b/system/src/main/java/io/geekidea/boot/system/controller/SysPermissionController.java similarity index 90% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/SysPermissionController.java rename to system/src/main/java/io/geekidea/boot/system/controller/SysPermissionController.java index 46a5e5c074da4270d09f618eb41c0cd7f6d51306..23cdb128e012179bf036569b6d41ff2d702ce7f9 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysPermissionController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/SysPermissionController.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; - -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.system.entity.SysPermission; -import io.geekidea.springbootplus.system.param.SysPermissionPageParam; -import io.geekidea.springbootplus.system.service.SysPermissionService; -import io.geekidea.springbootplus.system.service.SysRolePermissionService; -import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo; -import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo; +package io.geekidea.boot.system.controller; + +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.system.entity.SysPermission; +import io.geekidea.boot.system.param.SysPermissionPageParam; +import io.geekidea.boot.system.service.SysPermissionService; +import io.geekidea.boot.system.service.SysRolePermissionService; +import io.geekidea.boot.system.vo.SysPermissionQueryVo; +import io.geekidea.boot.system.vo.SysPermissionTreeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysRoleController.java b/system/src/main/java/io/geekidea/boot/system/controller/SysRoleController.java similarity index 84% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/SysRoleController.java rename to system/src/main/java/io/geekidea/boot/system/controller/SysRoleController.java index c5fbd9ccdb735937350f0698153430cfe34ac9be..1064ddb89f1d58a208499394281814dc1cddd6ba 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysRoleController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/SysRoleController.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.core.validator.groups.Add; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.system.entity.SysRole; -import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam; -import io.geekidea.springbootplus.system.param.sysrole.UpdateSysRolePermissionParam; -import io.geekidea.springbootplus.system.service.SysRoleService; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.core.validator.groups.Add; +import io.geekidea.boot.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.system.entity.SysRole; +import io.geekidea.boot.system.param.sysrole.SysRolePageParam; +import io.geekidea.boot.system.param.sysrole.UpdateSysRolePermissionParam; +import io.geekidea.boot.system.service.SysRoleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysUserController.java b/system/src/main/java/io/geekidea/boot/system/controller/SysUserController.java similarity index 82% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/SysUserController.java rename to system/src/main/java/io/geekidea/boot/system/controller/SysUserController.java index d010fe8a6f47ebdb131b1ffd3f4ec1f3a91b5dea..4a8fbf3ff61dce1d5f417fb68e4a7414fec0c7f3 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/SysUserController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/SysUserController.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.common.controller.BaseController; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.core.validator.groups.Add; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.system.entity.SysUser; -import io.geekidea.springbootplus.system.param.sysuser.ResetPasswordParam; -import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam; -import io.geekidea.springbootplus.system.param.sysuser.UpdatePasswordParam; -import io.geekidea.springbootplus.system.param.sysuser.UploadHeadParam; -import io.geekidea.springbootplus.system.service.SysUserService; -import io.geekidea.springbootplus.system.vo.SysUserQueryVo; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.common.controller.BaseController; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.core.validator.groups.Add; +import io.geekidea.boot.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.system.entity.SysUser; +import io.geekidea.boot.system.param.sysuser.ResetPasswordParam; +import io.geekidea.boot.system.param.sysuser.SysUserPageParam; +import io.geekidea.boot.system.param.sysuser.UpdatePasswordParam; +import io.geekidea.boot.system.param.sysuser.UploadHeadParam; +import io.geekidea.boot.system.service.SysUserService; +import io.geekidea.boot.system.vo.SysUserQueryVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/UploadController.java b/system/src/main/java/io/geekidea/boot/system/controller/UploadController.java similarity index 88% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/UploadController.java rename to system/src/main/java/io/geekidea/boot/system/controller/UploadController.java index 7f22b41163e0958ab1bcf7abf808447514079f5d..b0af8ee33442eeb822033b314af884f0b8c55d1c 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/UploadController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/UploadController.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.framework.util.UploadUtil; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.util.UploadUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/controller/VerificationCodeController.java b/system/src/main/java/io/geekidea/boot/system/controller/VerificationCodeController.java similarity index 87% rename from system/src/main/java/io/geekidea/springbootplus/system/controller/VerificationCodeController.java rename to system/src/main/java/io/geekidea/boot/system/controller/VerificationCodeController.java index d8366674bab3e65489951e10dec4fc0c704a75a4..bfa65bd84ab087253b7b9d1f59cac94a1f36e6f6 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/controller/VerificationCodeController.java +++ b/system/src/main/java/io/geekidea/boot/system/controller/VerificationCodeController.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.controller; +package io.geekidea.boot.system.controller; -import io.geekidea.springbootplus.config.constant.CommonConstant; -import io.geekidea.springbootplus.config.constant.CommonRedisKey; -import io.geekidea.springbootplus.framework.common.api.ApiResult; -import io.geekidea.springbootplus.framework.log.annotation.Module; -import io.geekidea.springbootplus.framework.log.annotation.OperationLog; -import io.geekidea.springbootplus.framework.log.enums.OperationLogType; -import io.geekidea.springbootplus.framework.util.UUIDUtil; -import io.geekidea.springbootplus.framework.util.VerificationCode; +import io.geekidea.boot.config.constant.CommonConstant; +import io.geekidea.boot.config.constant.CommonRedisKey; +import io.geekidea.boot.framework.common.api.ApiResult; +import io.geekidea.boot.framework.log.annotation.Module; +import io.geekidea.boot.framework.log.annotation.OperationLog; +import io.geekidea.boot.framework.log.enums.OperationLogType; +import io.geekidea.boot.framework.util.UUIDUtil; +import io.geekidea.boot.framework.util.VerificationCode; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysDepartmentConvert.java b/system/src/main/java/io/geekidea/boot/system/convert/SysDepartmentConvert.java similarity index 88% rename from system/src/main/java/io/geekidea/springbootplus/system/convert/SysDepartmentConvert.java rename to system/src/main/java/io/geekidea/boot/system/convert/SysDepartmentConvert.java index dbb038d39a84c5b71cfb29a420ddafce1c46ad09..24edd07e230f80763b07179ebd87f270c10bc1c7 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysDepartmentConvert.java +++ b/system/src/main/java/io/geekidea/boot/system/convert/SysDepartmentConvert.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.convert; +package io.geekidea.boot.system.convert; -import io.geekidea.springbootplus.system.entity.SysDepartment; -import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo; +import io.geekidea.boot.system.entity.SysDepartment; +import io.geekidea.boot.system.vo.SysDepartmentTreeVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysPermissionConvert.java b/system/src/main/java/io/geekidea/boot/system/convert/SysPermissionConvert.java similarity index 86% rename from system/src/main/java/io/geekidea/springbootplus/system/convert/SysPermissionConvert.java rename to system/src/main/java/io/geekidea/boot/system/convert/SysPermissionConvert.java index 803bf788cdd2519e4f72b8d807d144d7eb143be9..d895bcd77d7c6f41df2ac10161b63ac90a3d9f40 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysPermissionConvert.java +++ b/system/src/main/java/io/geekidea/boot/system/convert/SysPermissionConvert.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.convert; +package io.geekidea.boot.system.convert; -import io.geekidea.springbootplus.system.entity.SysPermission; -import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo; +import io.geekidea.boot.system.entity.SysPermission; +import io.geekidea.boot.system.vo.SysPermissionTreeVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysRoleConvert.java b/system/src/main/java/io/geekidea/boot/system/convert/SysRoleConvert.java similarity index 94% rename from system/src/main/java/io/geekidea/springbootplus/system/convert/SysRoleConvert.java rename to system/src/main/java/io/geekidea/boot/system/convert/SysRoleConvert.java index 569eeea47a22d91cbcf72535ffa5edeb889b3054..7677b1470518da9147e5b0c5cddc36994ba13d22 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysRoleConvert.java +++ b/system/src/main/java/io/geekidea/boot/system/convert/SysRoleConvert.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.convert; +package io.geekidea.boot.system.convert; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysUserConvert.java b/system/src/main/java/io/geekidea/boot/system/convert/SysUserConvert.java similarity index 82% rename from system/src/main/java/io/geekidea/springbootplus/system/convert/SysUserConvert.java rename to system/src/main/java/io/geekidea/boot/system/convert/SysUserConvert.java index bd8586297ba3a495751431f2e057dfa5cc78d83c..85a56bec26e178746e453da810ef2335e4a0343f 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/convert/SysUserConvert.java +++ b/system/src/main/java/io/geekidea/boot/system/convert/SysUserConvert.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.convert; +package io.geekidea.boot.system.convert; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -37,6 +37,6 @@ public interface SysUserConvert { * @param sysUser * @return */ - LoginSysUserVo sysUserToLoginSysUserVo(io.geekidea.springbootplus.system.entity.SysUser sysUser); + LoginSysUserVo sysUserToLoginSysUserVo(io.geekidea.boot.system.entity.SysUser sysUser); } diff --git a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysDepartment.java b/system/src/main/java/io/geekidea/boot/system/entity/SysDepartment.java similarity index 94% rename from system/src/main/java/io/geekidea/springbootplus/system/entity/SysDepartment.java rename to system/src/main/java/io/geekidea/boot/system/entity/SysDepartment.java index d3aeae6161e1a63753327122c05533b638accbcf..daa37833aa49563a5651700374274d7394a3a8b8 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysDepartment.java +++ b/system/src/main/java/io/geekidea/boot/system/entity/SysDepartment.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.entity; +package io.geekidea.boot.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.Version; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysPermission.java b/system/src/main/java/io/geekidea/boot/system/entity/SysPermission.java similarity index 95% rename from system/src/main/java/io/geekidea/springbootplus/system/entity/SysPermission.java rename to system/src/main/java/io/geekidea/boot/system/entity/SysPermission.java index 40ebeac51ca210671d19e8135be5a4375c084262..288f0caec5d03ed589b487fa3768979aae675ef3 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysPermission.java +++ b/system/src/main/java/io/geekidea/boot/system/entity/SysPermission.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.entity; +package io.geekidea.boot.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.Version; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysRole.java b/system/src/main/java/io/geekidea/boot/system/entity/SysRole.java similarity index 92% rename from system/src/main/java/io/geekidea/springbootplus/system/entity/SysRole.java rename to system/src/main/java/io/geekidea/boot/system/entity/SysRole.java index 3770b591385d15b676d57ec282e546b54e23ace0..8707639663938224b730edea173ca06186cc6275 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysRole.java +++ b/system/src/main/java/io/geekidea/boot/system/entity/SysRole.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.entity; +package io.geekidea.boot.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.Version; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.core.validator.groups.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysRolePermission.java b/system/src/main/java/io/geekidea/boot/system/entity/SysRolePermission.java similarity index 94% rename from system/src/main/java/io/geekidea/springbootplus/system/entity/SysRolePermission.java rename to system/src/main/java/io/geekidea/boot/system/entity/SysRolePermission.java index 7e4942c419330b3306bb88b8c42417e5c3eac9d4..b9f3f2557a7cff82eb51346dadbbfe2229da56e9 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysRolePermission.java +++ b/system/src/main/java/io/geekidea/boot/system/entity/SysRolePermission.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.entity; +package io.geekidea.boot.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.Version; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.common.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysUser.java b/system/src/main/java/io/geekidea/boot/system/entity/SysUser.java similarity index 92% rename from system/src/main/java/io/geekidea/springbootplus/system/entity/SysUser.java rename to system/src/main/java/io/geekidea/boot/system/entity/SysUser.java index 8f150a7ec4254b429d05839583ecef130d500f21..45bef2dabc74466da6f3fd9680bea82fe198c799 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/entity/SysUser.java +++ b/system/src/main/java/io/geekidea/boot/system/entity/SysUser.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.entity; +package io.geekidea.boot.system.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.Version; -import io.geekidea.springbootplus.framework.common.entity.BaseEntity; -import io.geekidea.springbootplus.framework.core.validator.groups.Add; -import io.geekidea.springbootplus.framework.core.validator.groups.Update; +import io.geekidea.boot.framework.common.entity.BaseEntity; +import io.geekidea.boot.framework.core.validator.groups.Add; +import io.geekidea.boot.framework.core.validator.groups.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/enums/MenuLevelEnum.java b/system/src/main/java/io/geekidea/boot/system/enums/MenuLevelEnum.java similarity index 91% rename from system/src/main/java/io/geekidea/springbootplus/system/enums/MenuLevelEnum.java rename to system/src/main/java/io/geekidea/boot/system/enums/MenuLevelEnum.java index 30de05f5259d26bf8fa63ecb8a06b70414773d27..e08dbcf30c9fa841502da6d6a0a5ca5a6abd585e 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/enums/MenuLevelEnum.java +++ b/system/src/main/java/io/geekidea/boot/system/enums/MenuLevelEnum.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.enums; +package io.geekidea.boot.system.enums; -import io.geekidea.springbootplus.framework.common.enums.BaseEnum; +import io.geekidea.boot.framework.common.enums.BaseEnum; /** * 层级枚举 diff --git a/system/src/main/java/io/geekidea/springbootplus/system/enums/StateEnum.java b/system/src/main/java/io/geekidea/boot/system/enums/StateEnum.java similarity index 89% rename from system/src/main/java/io/geekidea/springbootplus/system/enums/StateEnum.java rename to system/src/main/java/io/geekidea/boot/system/enums/StateEnum.java index 54dfd17e2af7863f7b82e2dfab8e056f77dab8c9..285828dd4430669492a01a2000886523ccf0b951 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/enums/StateEnum.java +++ b/system/src/main/java/io/geekidea/boot/system/enums/StateEnum.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.enums; +package io.geekidea.boot.system.enums; -import io.geekidea.springbootplus.framework.common.enums.BaseEnum; +import io.geekidea.boot.framework.common.enums.BaseEnum; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/exception/SysLoginException.java b/system/src/main/java/io/geekidea/boot/system/exception/SysLoginException.java similarity index 84% rename from system/src/main/java/io/geekidea/springbootplus/system/exception/SysLoginException.java rename to system/src/main/java/io/geekidea/boot/system/exception/SysLoginException.java index ee83e8d682d171b50c75756c1be24e3687952bb1..e96e9e902a466f4402a877ba3862fe97412977d5 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/exception/SysLoginException.java +++ b/system/src/main/java/io/geekidea/boot/system/exception/SysLoginException.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.exception; +package io.geekidea.boot.system.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.exception.SpringBootPlusException; /** * 系统登录异常 diff --git a/system/src/main/java/io/geekidea/springbootplus/system/exception/VerificationCodeException.java b/system/src/main/java/io/geekidea/boot/system/exception/VerificationCodeException.java similarity index 84% rename from system/src/main/java/io/geekidea/springbootplus/system/exception/VerificationCodeException.java rename to system/src/main/java/io/geekidea/boot/system/exception/VerificationCodeException.java index 5ea91ae32a33e2e2a2988cb5efbc1543e08ecbb2..a83f68beffc24deea3b1c7f0819fbb5c5640030f 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/exception/VerificationCodeException.java +++ b/system/src/main/java/io/geekidea/boot/system/exception/VerificationCodeException.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.exception; +package io.geekidea.boot.system.exception; -import io.geekidea.springbootplus.framework.common.api.ApiCode; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException; +import io.geekidea.boot.framework.common.api.ApiCode; +import io.geekidea.boot.framework.common.exception.SpringBootPlusException; /** * 验证码校验异常 diff --git a/system/src/main/java/io/geekidea/springbootplus/system/interceptor/DownloadInterceptor.java b/system/src/main/java/io/geekidea/boot/system/interceptor/DownloadInterceptor.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/interceptor/DownloadInterceptor.java rename to system/src/main/java/io/geekidea/boot/system/interceptor/DownloadInterceptor.java index 409ecae8e1069a2526ca7062cc3c518c3e14d8c5..4b61bb58c66c33fc6273da6aa68fceab8edf1ef0 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/interceptor/DownloadInterceptor.java +++ b/system/src/main/java/io/geekidea/boot/system/interceptor/DownloadInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.interceptor; +package io.geekidea.boot.system.interceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/interceptor/ResourceInterceptor.java b/system/src/main/java/io/geekidea/boot/system/interceptor/ResourceInterceptor.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/interceptor/ResourceInterceptor.java rename to system/src/main/java/io/geekidea/boot/system/interceptor/ResourceInterceptor.java index d02e5a381c1f0f03b3c1554f8d78cd0adffed5be..c02b0b892b7c2c4c8411d3a47a707e8c494b897a 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/interceptor/ResourceInterceptor.java +++ b/system/src/main/java/io/geekidea/boot/system/interceptor/ResourceInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.interceptor; +package io.geekidea.boot.system.interceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/interceptor/UploadInterceptor.java b/system/src/main/java/io/geekidea/boot/system/interceptor/UploadInterceptor.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/interceptor/UploadInterceptor.java rename to system/src/main/java/io/geekidea/boot/system/interceptor/UploadInterceptor.java index f5e8343249c7a7bbf03d0eac7c0904887e425bf7..a49f3ffce4bd813bd8fb98d73aab52df1ef96f00 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/interceptor/UploadInterceptor.java +++ b/system/src/main/java/io/geekidea/boot/system/interceptor/UploadInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.interceptor; +package io.geekidea.boot.system.interceptor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysDepartmentMapper.java b/system/src/main/java/io/geekidea/boot/system/mapper/SysDepartmentMapper.java similarity index 85% rename from system/src/main/java/io/geekidea/springbootplus/system/mapper/SysDepartmentMapper.java rename to system/src/main/java/io/geekidea/boot/system/mapper/SysDepartmentMapper.java index abc7cf9bd19eea1b1ba78b0f347ff7383f6a6854..9a7cc58238c75fe1704863dec39737547cc490e7 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysDepartmentMapper.java +++ b/system/src/main/java/io/geekidea/boot/system/mapper/SysDepartmentMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.mapper; +package io.geekidea.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.system.entity.SysDepartment; -import io.geekidea.springbootplus.system.param.SysDepartmentPageParam; -import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo; +import io.geekidea.boot.system.entity.SysDepartment; +import io.geekidea.boot.system.param.SysDepartmentPageParam; +import io.geekidea.boot.system.vo.SysDepartmentQueryVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysPermissionMapper.java b/system/src/main/java/io/geekidea/boot/system/mapper/SysPermissionMapper.java similarity index 88% rename from system/src/main/java/io/geekidea/springbootplus/system/mapper/SysPermissionMapper.java rename to system/src/main/java/io/geekidea/boot/system/mapper/SysPermissionMapper.java index 6e3ff7e7b37b8c954d6ed84e282c9c71d19c84b3..e1c4e0f24f3d52a639213b1620131a1ef5d73dc6 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysPermissionMapper.java +++ b/system/src/main/java/io/geekidea/boot/system/mapper/SysPermissionMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.mapper; +package io.geekidea.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.system.entity.SysPermission; -import io.geekidea.springbootplus.system.param.SysPermissionPageParam; -import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo; +import io.geekidea.boot.system.entity.SysPermission; +import io.geekidea.boot.system.param.SysPermissionPageParam; +import io.geekidea.boot.system.vo.SysPermissionQueryVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysRoleMapper.java b/system/src/main/java/io/geekidea/boot/system/mapper/SysRoleMapper.java similarity index 86% rename from system/src/main/java/io/geekidea/springbootplus/system/mapper/SysRoleMapper.java rename to system/src/main/java/io/geekidea/boot/system/mapper/SysRoleMapper.java index 95348b363bc92fa5d5302bc8dd7f28693c3c840d..e5fc22c9902463ab90feed27ecb3caacddc31db3 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysRoleMapper.java +++ b/system/src/main/java/io/geekidea/boot/system/mapper/SysRoleMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.mapper; +package io.geekidea.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.system.entity.SysRole; -import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam; -import io.geekidea.springbootplus.system.vo.SysRoleQueryVo; +import io.geekidea.boot.system.entity.SysRole; +import io.geekidea.boot.system.param.sysrole.SysRolePageParam; +import io.geekidea.boot.system.vo.SysRoleQueryVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysRolePermissionMapper.java b/system/src/main/java/io/geekidea/boot/system/mapper/SysRolePermissionMapper.java similarity index 88% rename from system/src/main/java/io/geekidea/springbootplus/system/mapper/SysRolePermissionMapper.java rename to system/src/main/java/io/geekidea/boot/system/mapper/SysRolePermissionMapper.java index 6fb323f289b654e9a86a96a62a497859db44c17b..8260e414976a8fa848b43224b6058baf84772dc6 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysRolePermissionMapper.java +++ b/system/src/main/java/io/geekidea/boot/system/mapper/SysRolePermissionMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.mapper; +package io.geekidea.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.system.entity.SysRolePermission; -import io.geekidea.springbootplus.system.param.sysrole.SysRolePermissionPageParam; -import io.geekidea.springbootplus.system.vo.SysRolePermissionQueryVo; +import io.geekidea.boot.system.entity.SysRolePermission; +import io.geekidea.boot.system.param.sysrole.SysRolePermissionPageParam; +import io.geekidea.boot.system.vo.SysRolePermissionQueryVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysUserMapper.java b/system/src/main/java/io/geekidea/boot/system/mapper/SysUserMapper.java similarity index 86% rename from system/src/main/java/io/geekidea/springbootplus/system/mapper/SysUserMapper.java rename to system/src/main/java/io/geekidea/boot/system/mapper/SysUserMapper.java index 64073d86e52f655402fc0ef52d6cf96ec70da65e..5893fd823d3a69bc4d51458d85c0f12786da6d6e 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/mapper/SysUserMapper.java +++ b/system/src/main/java/io/geekidea/boot/system/mapper/SysUserMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.mapper; +package io.geekidea.boot.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.system.entity.SysUser; -import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam; -import io.geekidea.springbootplus.system.vo.SysUserQueryVo; +import io.geekidea.boot.system.entity.SysUser; +import io.geekidea.boot.system.param.sysuser.SysUserPageParam; +import io.geekidea.boot.system.vo.SysUserQueryVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/LoginParam.java b/system/src/main/java/io/geekidea/boot/system/param/LoginParam.java similarity index 91% rename from system/src/main/java/io/geekidea/springbootplus/system/param/LoginParam.java rename to system/src/main/java/io/geekidea/boot/system/param/LoginParam.java index 259c932e8601202cbf037cbf9d6d0da55559e272..a45305fbc7a852009b1b94cb840b94ff48d4b12e 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/LoginParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/LoginParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param; +package io.geekidea.boot.system.param; -import io.geekidea.springbootplus.framework.shiro.service.LoginUsername; +import io.geekidea.boot.framework.shiro.service.LoginUsername; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/SysDepartmentPageParam.java b/system/src/main/java/io/geekidea/boot/system/param/SysDepartmentPageParam.java similarity index 89% rename from system/src/main/java/io/geekidea/springbootplus/system/param/SysDepartmentPageParam.java rename to system/src/main/java/io/geekidea/boot/system/param/SysDepartmentPageParam.java index 24acea2d528ed5bc20a07a78265dc67805004141..7092a6393b382405b37604a95d939918395b33b6 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/SysDepartmentPageParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/SysDepartmentPageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param; +package io.geekidea.boot.system.param; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/SysPermissionPageParam.java b/system/src/main/java/io/geekidea/boot/system/param/SysPermissionPageParam.java similarity index 89% rename from system/src/main/java/io/geekidea/springbootplus/system/param/SysPermissionPageParam.java rename to system/src/main/java/io/geekidea/boot/system/param/SysPermissionPageParam.java index 98c79bbd319bf6f1e7162685b50dd4f93b9ac077..be888b7935818dc3b30c49fb10926d9dc8ae069c 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/SysPermissionPageParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/SysPermissionPageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param; +package io.geekidea.boot.system.param; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePageParam.java b/system/src/main/java/io/geekidea/boot/system/param/sysrole/SysRolePageParam.java similarity index 91% rename from system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePageParam.java rename to system/src/main/java/io/geekidea/boot/system/param/sysrole/SysRolePageParam.java index b46a0febc3eab3f3f88785b3176e58a739fb619c..7dfa9c1ed6fa49daa6bcb45004f1bc4c39852213 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePageParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/sysrole/SysRolePageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param.sysrole; +package io.geekidea.boot.system.param.sysrole; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePermissionPageParam.java b/system/src/main/java/io/geekidea/boot/system/param/sysrole/SysRolePermissionPageParam.java similarity index 89% rename from system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePermissionPageParam.java rename to system/src/main/java/io/geekidea/boot/system/param/sysrole/SysRolePermissionPageParam.java index 0782359d11a201f526c32bbf24fe60d0e6b012bf..2faf294a63383d7f70207f0e03e188c43740afa2 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/SysRolePermissionPageParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/sysrole/SysRolePermissionPageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param.sysrole; +package io.geekidea.boot.system.param.sysrole; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/UpdateSysRolePermissionParam.java b/system/src/main/java/io/geekidea/boot/system/param/sysrole/UpdateSysRolePermissionParam.java similarity index 95% rename from system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/UpdateSysRolePermissionParam.java rename to system/src/main/java/io/geekidea/boot/system/param/sysrole/UpdateSysRolePermissionParam.java index 5abcd2e99c05814b52271fbf23c1ecd62444a1f0..61ecae45c137611ef0c640b77dca41212b989c5d 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/sysrole/UpdateSysRolePermissionParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/sysrole/UpdateSysRolePermissionParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param.sysrole; +package io.geekidea.boot.system.param.sysrole; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/ResetPasswordParam.java b/system/src/main/java/io/geekidea/boot/system/param/sysuser/ResetPasswordParam.java similarity index 96% rename from system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/ResetPasswordParam.java rename to system/src/main/java/io/geekidea/boot/system/param/sysuser/ResetPasswordParam.java index 58d2b6426aa12355e170392aabb2cc236fcdd14a..52e00afbe41e941febbeabe1cee9cc472a0ad017 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/ResetPasswordParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/sysuser/ResetPasswordParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param.sysuser; +package io.geekidea.boot.system.param.sysuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/SysUserPageParam.java b/system/src/main/java/io/geekidea/boot/system/param/sysuser/SysUserPageParam.java similarity index 92% rename from system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/SysUserPageParam.java rename to system/src/main/java/io/geekidea/boot/system/param/sysuser/SysUserPageParam.java index ce500026b1b68c938cb811a4e1cb7966377105a0..24e0e9d78ec9d83f02c5bdab4dc8881ffcd62643 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/SysUserPageParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/sysuser/SysUserPageParam.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param.sysuser; +package io.geekidea.boot.system.param.sysuser; -import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; +import io.geekidea.boot.framework.core.pagination.BasePageOrderParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UpdatePasswordParam.java b/system/src/main/java/io/geekidea/boot/system/param/sysuser/UpdatePasswordParam.java similarity index 96% rename from system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UpdatePasswordParam.java rename to system/src/main/java/io/geekidea/boot/system/param/sysuser/UpdatePasswordParam.java index a6c5286c18bff2cf0b7b7ce60713fb91093dd32d..4eefe5cbbc1af440d35402e28c80f3daa0901197 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UpdatePasswordParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/sysuser/UpdatePasswordParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param.sysuser; +package io.geekidea.boot.system.param.sysuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UploadHeadParam.java b/system/src/main/java/io/geekidea/boot/system/param/sysuser/UploadHeadParam.java similarity index 96% rename from system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UploadHeadParam.java rename to system/src/main/java/io/geekidea/boot/system/param/sysuser/UploadHeadParam.java index b19c6cd6c308ff3b1af3f1673dafaa376179d21a..42452414da06251b03fd5cc3d57078568b39e8ee 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/param/sysuser/UploadHeadParam.java +++ b/system/src/main/java/io/geekidea/boot/system/param/sysuser/UploadHeadParam.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.param.sysuser; +package io.geekidea.boot.system.param.sysuser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/LoginService.java b/system/src/main/java/io/geekidea/boot/system/service/LoginService.java similarity index 86% rename from system/src/main/java/io/geekidea/springbootplus/system/service/LoginService.java rename to system/src/main/java/io/geekidea/boot/system/service/LoginService.java index ec2c2c2682411de0d17a1bd57c72ae1331bd14a2..016059ae275a4e96f9013ad4f204e1722e7ad057 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/LoginService.java +++ b/system/src/main/java/io/geekidea/boot/system/service/LoginService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service; +package io.geekidea.boot.system.service; -import io.geekidea.springbootplus.system.entity.SysUser; -import io.geekidea.springbootplus.system.param.LoginParam; -import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo; +import io.geekidea.boot.system.entity.SysUser; +import io.geekidea.boot.system.param.LoginParam; +import io.geekidea.boot.system.vo.LoginSysUserTokenVo; import javax.servlet.http.HttpServletRequest; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/SysDepartmentService.java b/system/src/main/java/io/geekidea/boot/system/service/SysDepartmentService.java similarity index 83% rename from system/src/main/java/io/geekidea/springbootplus/system/service/SysDepartmentService.java rename to system/src/main/java/io/geekidea/boot/system/service/SysDepartmentService.java index e1eb45851b587d2d89094a0120515d8a4ca4c863..ca6af2a8f4ea1cdf6c0f3f688e16e4900e289479 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/SysDepartmentService.java +++ b/system/src/main/java/io/geekidea/boot/system/service/SysDepartmentService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service; +package io.geekidea.boot.system.service; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.system.entity.SysDepartment; -import io.geekidea.springbootplus.system.param.SysDepartmentPageParam; -import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo; -import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.system.entity.SysDepartment; +import io.geekidea.boot.system.param.SysDepartmentPageParam; +import io.geekidea.boot.system.vo.SysDepartmentQueryVo; +import io.geekidea.boot.system.vo.SysDepartmentTreeVo; import java.io.Serializable; import java.util.List; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/SysPermissionService.java b/system/src/main/java/io/geekidea/boot/system/service/SysPermissionService.java similarity index 88% rename from system/src/main/java/io/geekidea/springbootplus/system/service/SysPermissionService.java rename to system/src/main/java/io/geekidea/boot/system/service/SysPermissionService.java index c675185ded68d7c632828c60502cb0a806f4edd6..743fba23957babe9da625462d6febabeeee35768 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/SysPermissionService.java +++ b/system/src/main/java/io/geekidea/boot/system/service/SysPermissionService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service; - -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.system.entity.SysPermission; -import io.geekidea.springbootplus.system.param.SysPermissionPageParam; -import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo; -import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo; +package io.geekidea.boot.system.service; + +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.system.entity.SysPermission; +import io.geekidea.boot.system.param.SysPermissionPageParam; +import io.geekidea.boot.system.vo.SysPermissionQueryVo; +import io.geekidea.boot.system.vo.SysPermissionTreeVo; import java.io.Serializable; import java.util.List; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/SysRolePermissionService.java b/system/src/main/java/io/geekidea/boot/system/service/SysRolePermissionService.java similarity index 93% rename from system/src/main/java/io/geekidea/springbootplus/system/service/SysRolePermissionService.java rename to system/src/main/java/io/geekidea/boot/system/service/SysRolePermissionService.java index f385e8f26ff45d7c6ac63dab8fe773aed10c733c..2a3702955c5c96a984df1a44ddf18843183d9e62 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/SysRolePermissionService.java +++ b/system/src/main/java/io/geekidea/boot/system/service/SysRolePermissionService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service; +package io.geekidea.boot.system.service; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.system.entity.SysRolePermission; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.system.entity.SysRolePermission; import org.apache.commons.collections4.SetUtils; import java.util.List; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/SysRoleService.java b/system/src/main/java/io/geekidea/boot/system/service/SysRoleService.java similarity index 83% rename from system/src/main/java/io/geekidea/springbootplus/system/service/SysRoleService.java rename to system/src/main/java/io/geekidea/boot/system/service/SysRoleService.java index abb74800a452b56575039009e221b34604c9504b..c7c1cb14cda71248162132c9e966b8e2b28ca448 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/SysRoleService.java +++ b/system/src/main/java/io/geekidea/boot/system/service/SysRoleService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service; +package io.geekidea.boot.system.service; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.system.entity.SysRole; -import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam; -import io.geekidea.springbootplus.system.param.sysrole.UpdateSysRolePermissionParam; -import io.geekidea.springbootplus.system.vo.SysRoleQueryVo; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.system.entity.SysRole; +import io.geekidea.boot.system.param.sysrole.SysRolePageParam; +import io.geekidea.boot.system.param.sysrole.UpdateSysRolePermissionParam; +import io.geekidea.boot.system.vo.SysRoleQueryVo; import java.io.Serializable; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/SysUserService.java b/system/src/main/java/io/geekidea/boot/system/service/SysUserService.java similarity index 84% rename from system/src/main/java/io/geekidea/springbootplus/system/service/SysUserService.java rename to system/src/main/java/io/geekidea/boot/system/service/SysUserService.java index e13f44c7ab986e770fc52b669f4f2c4999607cd8..d53239cd65c85736ff44b04534a09e61535e3578 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/SysUserService.java +++ b/system/src/main/java/io/geekidea/boot/system/service/SysUserService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service; +package io.geekidea.boot.system.service; -import io.geekidea.springbootplus.framework.common.service.BaseService; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.system.entity.SysUser; -import io.geekidea.springbootplus.system.param.sysuser.ResetPasswordParam; -import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam; -import io.geekidea.springbootplus.system.param.sysuser.UpdatePasswordParam; -import io.geekidea.springbootplus.system.vo.SysUserQueryVo; +import io.geekidea.boot.framework.common.service.BaseService; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.system.entity.SysUser; +import io.geekidea.boot.system.param.sysuser.ResetPasswordParam; +import io.geekidea.boot.system.param.sysuser.SysUserPageParam; +import io.geekidea.boot.system.param.sysuser.UpdatePasswordParam; +import io.geekidea.boot.system.vo.SysUserQueryVo; import java.io.Serializable; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/LoginServiceImpl.java b/system/src/main/java/io/geekidea/boot/system/service/impl/LoginServiceImpl.java similarity index 83% rename from system/src/main/java/io/geekidea/springbootplus/system/service/impl/LoginServiceImpl.java rename to system/src/main/java/io/geekidea/boot/system/service/impl/LoginServiceImpl.java index c0c565a4d45c99a7ae4a071f8b8dca318b970706..82166c7915249d8d4a79180ceee194d66e4cd640 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/LoginServiceImpl.java +++ b/system/src/main/java/io/geekidea/boot/system/service/impl/LoginServiceImpl.java @@ -14,32 +14,32 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service.impl; +package io.geekidea.boot.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.geekidea.springbootplus.config.constant.CommonRedisKey; -import io.geekidea.springbootplus.config.properties.JwtProperties; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService; -import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken; -import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil; -import io.geekidea.springbootplus.framework.shiro.util.JwtUtil; -import io.geekidea.springbootplus.framework.shiro.util.SaltUtil; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo; -import io.geekidea.springbootplus.framework.util.PasswordUtil; -import io.geekidea.springbootplus.system.convert.SysUserConvert; -import io.geekidea.springbootplus.system.entity.SysDepartment; -import io.geekidea.springbootplus.system.entity.SysRole; -import io.geekidea.springbootplus.system.entity.SysUser; -import io.geekidea.springbootplus.system.enums.StateEnum; -import io.geekidea.springbootplus.system.exception.VerificationCodeException; -import io.geekidea.springbootplus.system.mapper.SysUserMapper; -import io.geekidea.springbootplus.system.param.LoginParam; -import io.geekidea.springbootplus.system.service.LoginService; -import io.geekidea.springbootplus.system.service.SysDepartmentService; -import io.geekidea.springbootplus.system.service.SysRolePermissionService; -import io.geekidea.springbootplus.system.service.SysRoleService; -import io.geekidea.springbootplus.system.vo.LoginSysUserTokenVo; +import io.geekidea.boot.config.constant.CommonRedisKey; +import io.geekidea.boot.config.properties.JwtProperties; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.shiro.cache.LoginRedisService; +import io.geekidea.boot.framework.shiro.jwt.JwtToken; +import io.geekidea.boot.framework.shiro.util.JwtTokenUtil; +import io.geekidea.boot.framework.shiro.util.JwtUtil; +import io.geekidea.boot.framework.shiro.util.SaltUtil; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserVo; +import io.geekidea.boot.framework.util.PasswordUtil; +import io.geekidea.boot.system.convert.SysUserConvert; +import io.geekidea.boot.system.entity.SysDepartment; +import io.geekidea.boot.system.entity.SysRole; +import io.geekidea.boot.system.entity.SysUser; +import io.geekidea.boot.system.enums.StateEnum; +import io.geekidea.boot.system.exception.VerificationCodeException; +import io.geekidea.boot.system.mapper.SysUserMapper; +import io.geekidea.boot.system.param.LoginParam; +import io.geekidea.boot.system.service.LoginService; +import io.geekidea.boot.system.service.SysDepartmentService; +import io.geekidea.boot.system.service.SysRolePermissionService; +import io.geekidea.boot.system.service.SysRoleService; +import io.geekidea.boot.system.vo.LoginSysUserTokenVo; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysDepartmentServiceImpl.java b/system/src/main/java/io/geekidea/boot/system/service/impl/SysDepartmentServiceImpl.java similarity index 85% rename from system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysDepartmentServiceImpl.java rename to system/src/main/java/io/geekidea/boot/system/service/impl/SysDepartmentServiceImpl.java index 4158965c38b225056dcd70d3bddb13d3ff43fa3e..740ce17bbbf327be445c01cfe70f707d14532dd2 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysDepartmentServiceImpl.java +++ b/system/src/main/java/io/geekidea/boot/system/service/impl/SysDepartmentServiceImpl.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service.impl; +package io.geekidea.boot.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.system.convert.SysDepartmentConvert; -import io.geekidea.springbootplus.system.entity.SysDepartment; -import io.geekidea.springbootplus.system.enums.StateEnum; -import io.geekidea.springbootplus.system.mapper.SysDepartmentMapper; -import io.geekidea.springbootplus.system.param.SysDepartmentPageParam; -import io.geekidea.springbootplus.system.service.SysDepartmentService; -import io.geekidea.springbootplus.system.vo.SysDepartmentQueryVo; -import io.geekidea.springbootplus.system.vo.SysDepartmentTreeVo; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.system.convert.SysDepartmentConvert; +import io.geekidea.boot.system.entity.SysDepartment; +import io.geekidea.boot.system.enums.StateEnum; +import io.geekidea.boot.system.mapper.SysDepartmentMapper; +import io.geekidea.boot.system.param.SysDepartmentPageParam; +import io.geekidea.boot.system.service.SysDepartmentService; +import io.geekidea.boot.system.vo.SysDepartmentQueryVo; +import io.geekidea.boot.system.vo.SysDepartmentTreeVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysPermissionServiceImpl.java b/system/src/main/java/io/geekidea/boot/system/service/impl/SysPermissionServiceImpl.java similarity index 88% rename from system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysPermissionServiceImpl.java rename to system/src/main/java/io/geekidea/boot/system/service/impl/SysPermissionServiceImpl.java index 0075562672dbf47087f6d409b6ca4a001dd71211..3dbdf8ee9bef2d9fca4dd48bb8f7a7d57df2087a 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysPermissionServiceImpl.java +++ b/system/src/main/java/io/geekidea/boot/system/service/impl/SysPermissionServiceImpl.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service.impl; +package io.geekidea.boot.system.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.framework.common.exception.BusinessException; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.system.convert.SysPermissionConvert; -import io.geekidea.springbootplus.system.entity.SysPermission; -import io.geekidea.springbootplus.system.enums.MenuLevelEnum; -import io.geekidea.springbootplus.system.enums.StateEnum; -import io.geekidea.springbootplus.system.mapper.SysPermissionMapper; -import io.geekidea.springbootplus.system.param.SysPermissionPageParam; -import io.geekidea.springbootplus.system.service.SysPermissionService; -import io.geekidea.springbootplus.system.service.SysRolePermissionService; -import io.geekidea.springbootplus.system.vo.SysPermissionQueryVo; -import io.geekidea.springbootplus.system.vo.SysPermissionTreeVo; +import io.geekidea.boot.framework.common.exception.BusinessException; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.system.convert.SysPermissionConvert; +import io.geekidea.boot.system.entity.SysPermission; +import io.geekidea.boot.system.enums.MenuLevelEnum; +import io.geekidea.boot.system.enums.StateEnum; +import io.geekidea.boot.system.mapper.SysPermissionMapper; +import io.geekidea.boot.system.param.SysPermissionPageParam; +import io.geekidea.boot.system.service.SysPermissionService; +import io.geekidea.boot.system.service.SysRolePermissionService; +import io.geekidea.boot.system.vo.SysPermissionQueryVo; +import io.geekidea.boot.system.vo.SysPermissionTreeVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRolePermissionServiceImpl.java b/system/src/main/java/io/geekidea/boot/system/service/impl/SysRolePermissionServiceImpl.java similarity index 90% rename from system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRolePermissionServiceImpl.java rename to system/src/main/java/io/geekidea/boot/system/service/impl/SysRolePermissionServiceImpl.java index d96b029b734f1a95dfe055c892947b485542270b..2d88fa4ee1d49cc7a63639a2c51ea368e5fc1e07 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRolePermissionServiceImpl.java +++ b/system/src/main/java/io/geekidea/boot/system/service/impl/SysRolePermissionServiceImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service.impl; +package io.geekidea.boot.system.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.system.entity.SysRolePermission; -import io.geekidea.springbootplus.system.enums.StateEnum; -import io.geekidea.springbootplus.system.mapper.SysRoleMapper; -import io.geekidea.springbootplus.system.mapper.SysRolePermissionMapper; -import io.geekidea.springbootplus.system.service.SysRolePermissionService; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.system.entity.SysRolePermission; +import io.geekidea.boot.system.enums.StateEnum; +import io.geekidea.boot.system.mapper.SysRoleMapper; +import io.geekidea.boot.system.mapper.SysRolePermissionMapper; +import io.geekidea.boot.system.service.SysRolePermissionService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.SetUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRoleServiceImpl.java b/system/src/main/java/io/geekidea/boot/system/service/impl/SysRoleServiceImpl.java similarity index 87% rename from system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRoleServiceImpl.java rename to system/src/main/java/io/geekidea/boot/system/service/impl/SysRoleServiceImpl.java index 5406c91817bee4a9233c1ffb3b692aa0ecf743f2..7321bd6a7fd2a27c91b7cf7a70cf579551bc5385 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysRoleServiceImpl.java +++ b/system/src/main/java/io/geekidea/boot/system/service/impl/SysRoleServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service.impl; +package io.geekidea.boot.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,23 +22,23 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.framework.common.exception.BusinessException; -import io.geekidea.springbootplus.framework.common.exception.DaoException; -import io.geekidea.springbootplus.framework.common.exception.SpringBootPlusException; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.system.entity.SysRole; -import io.geekidea.springbootplus.system.entity.SysRolePermission; -import io.geekidea.springbootplus.system.enums.StateEnum; -import io.geekidea.springbootplus.system.mapper.SysRoleMapper; -import io.geekidea.springbootplus.system.param.sysrole.SysRolePageParam; -import io.geekidea.springbootplus.system.param.sysrole.UpdateSysRolePermissionParam; -import io.geekidea.springbootplus.system.service.SysPermissionService; -import io.geekidea.springbootplus.system.service.SysRolePermissionService; -import io.geekidea.springbootplus.system.service.SysRoleService; -import io.geekidea.springbootplus.system.service.SysUserService; -import io.geekidea.springbootplus.system.vo.SysRoleQueryVo; +import io.geekidea.boot.framework.common.exception.BusinessException; +import io.geekidea.boot.framework.common.exception.DaoException; +import io.geekidea.boot.framework.common.exception.SpringBootPlusException; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.system.entity.SysRole; +import io.geekidea.boot.system.entity.SysRolePermission; +import io.geekidea.boot.system.enums.StateEnum; +import io.geekidea.boot.system.mapper.SysRoleMapper; +import io.geekidea.boot.system.param.sysrole.SysRolePageParam; +import io.geekidea.boot.system.param.sysrole.UpdateSysRolePermissionParam; +import io.geekidea.boot.system.service.SysPermissionService; +import io.geekidea.boot.system.service.SysRolePermissionService; +import io.geekidea.boot.system.service.SysRoleService; +import io.geekidea.boot.system.service.SysUserService; +import io.geekidea.boot.system.vo.SysRoleQueryVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.SetUtils; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysUserServiceImpl.java b/system/src/main/java/io/geekidea/boot/system/service/impl/SysUserServiceImpl.java similarity index 87% rename from system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysUserServiceImpl.java rename to system/src/main/java/io/geekidea/boot/system/service/impl/SysUserServiceImpl.java index de36669571c8efc752dc244b29645ccc6c606408..36c15505511ef2a2e4d13d3d01980e9d69693617 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/service/impl/SysUserServiceImpl.java +++ b/system/src/main/java/io/geekidea/boot/system/service/impl/SysUserServiceImpl.java @@ -14,30 +14,30 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.service.impl; +package io.geekidea.boot.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; -import io.geekidea.springbootplus.framework.common.exception.BusinessException; -import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; -import io.geekidea.springbootplus.framework.core.pagination.PageInfo; -import io.geekidea.springbootplus.framework.core.pagination.Paging; -import io.geekidea.springbootplus.framework.shiro.util.SaltUtil; -import io.geekidea.springbootplus.framework.util.PasswordUtil; -import io.geekidea.springbootplus.framework.util.PhoneUtil; -import io.geekidea.springbootplus.system.entity.SysUser; -import io.geekidea.springbootplus.system.enums.StateEnum; -import io.geekidea.springbootplus.system.mapper.SysUserMapper; -import io.geekidea.springbootplus.system.param.sysuser.ResetPasswordParam; -import io.geekidea.springbootplus.system.param.sysuser.SysUserPageParam; -import io.geekidea.springbootplus.system.param.sysuser.UpdatePasswordParam; -import io.geekidea.springbootplus.system.service.SysDepartmentService; -import io.geekidea.springbootplus.system.service.SysRoleService; -import io.geekidea.springbootplus.system.service.SysUserService; -import io.geekidea.springbootplus.system.vo.SysUserQueryVo; +import io.geekidea.boot.config.properties.SpringBootPlusProperties; +import io.geekidea.boot.framework.common.exception.BusinessException; +import io.geekidea.boot.framework.common.service.impl.BaseServiceImpl; +import io.geekidea.boot.framework.core.pagination.PageInfo; +import io.geekidea.boot.framework.core.pagination.Paging; +import io.geekidea.boot.framework.shiro.util.SaltUtil; +import io.geekidea.boot.framework.util.PasswordUtil; +import io.geekidea.boot.framework.util.PhoneUtil; +import io.geekidea.boot.system.entity.SysUser; +import io.geekidea.boot.system.enums.StateEnum; +import io.geekidea.boot.system.mapper.SysUserMapper; +import io.geekidea.boot.system.param.sysuser.ResetPasswordParam; +import io.geekidea.boot.system.param.sysuser.SysUserPageParam; +import io.geekidea.boot.system.param.sysuser.UpdatePasswordParam; +import io.geekidea.boot.system.service.SysDepartmentService; +import io.geekidea.boot.system.service.SysRoleService; +import io.geekidea.boot.system.service.SysUserService; +import io.geekidea.boot.system.vo.SysUserQueryVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/LoginSysUserTokenVo.java b/system/src/main/java/io/geekidea/boot/system/vo/LoginSysUserTokenVo.java similarity index 86% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/LoginSysUserTokenVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/LoginSysUserTokenVo.java index 5a454fac8e46626075915052eba02bd82b7bd98f..94f51a7d9dbd8f1d6d500879618b9bee29603313 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/LoginSysUserTokenVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/LoginSysUserTokenVo.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; -import io.geekidea.springbootplus.framework.shiro.service.LoginToken; -import io.geekidea.springbootplus.framework.shiro.vo.LoginSysUserVo; +import io.geekidea.boot.framework.shiro.service.LoginToken; +import io.geekidea.boot.framework.shiro.vo.LoginSysUserVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentQueryVo.java b/system/src/main/java/io/geekidea/boot/system/vo/SysDepartmentQueryVo.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentQueryVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/SysDepartmentQueryVo.java index b43a175e1cea9f13a79b03ae91cbcee69756e83c..d23e60ad9a7bba44490c39f73b9986023ac450a4 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentQueryVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/SysDepartmentQueryVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentTreeVo.java b/system/src/main/java/io/geekidea/boot/system/vo/SysDepartmentTreeVo.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentTreeVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/SysDepartmentTreeVo.java index 58e4c2ff511abb680703e950a517cc2507523469..2e962e9071f1d6b8a4876372da76ff84b867e808 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysDepartmentTreeVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/SysDepartmentTreeVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionQueryVo.java b/system/src/main/java/io/geekidea/boot/system/vo/SysPermissionQueryVo.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionQueryVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/SysPermissionQueryVo.java index bdf4601e7c05a9ed50f99d54b5c02c76f5d39e77..483ddc265a0090d726ea14ad1bd2c1c3928cf5e7 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionQueryVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/SysPermissionQueryVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionTreeVo.java b/system/src/main/java/io/geekidea/boot/system/vo/SysPermissionTreeVo.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionTreeVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/SysPermissionTreeVo.java index e31395c3de0fd7a85a64c9d79e650d6a507ef30c..4bf122e11c476f9f2df3737a022b92bc968339c9 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysPermissionTreeVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/SysPermissionTreeVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysRolePermissionQueryVo.java b/system/src/main/java/io/geekidea/boot/system/vo/SysRolePermissionQueryVo.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/SysRolePermissionQueryVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/SysRolePermissionQueryVo.java index 1a7feb9c32d5a1aabb16c564bb104e4e0f47b61e..abb1e9b7ab7b9032b0d72e60ed4843ea8bbf1bc5 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysRolePermissionQueryVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/SysRolePermissionQueryVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysRoleQueryVo.java b/system/src/main/java/io/geekidea/boot/system/vo/SysRoleQueryVo.java similarity index 97% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/SysRoleQueryVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/SysRoleQueryVo.java index 6b56cc5a86914067301cc46714921c7307e1285f..9955ed94c8f68d8c179403ce3dbf899a5102e9ca 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysRoleQueryVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/SysRoleQueryVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysUserQueryVo.java b/system/src/main/java/io/geekidea/boot/system/vo/SysUserQueryVo.java similarity index 98% rename from system/src/main/java/io/geekidea/springbootplus/system/vo/SysUserQueryVo.java rename to system/src/main/java/io/geekidea/boot/system/vo/SysUserQueryVo.java index 61d12bc20b7e6c30c530da9ccf47b527a4f843b1..2d7bdda5dd85e4d36e4e31ca2d92c4bdb1a3365a 100644 --- a/system/src/main/java/io/geekidea/springbootplus/system/vo/SysUserQueryVo.java +++ b/system/src/main/java/io/geekidea/boot/system/vo/SysUserQueryVo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.geekidea.springbootplus.system.vo; +package io.geekidea.boot.system.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/system/src/main/resources/mapper/system/SysDepartmentMapper.xml b/system/src/main/resources/mapper/system/SysDepartmentMapper.xml index 538436deb80b4918a3dc65374b3dd6af4d21cfe0..322db4236f7f73017a118fb0706dacfdd4c88ad3 100644 --- a/system/src/main/resources/mapper/system/SysDepartmentMapper.xml +++ b/system/src/main/resources/mapper/system/SysDepartmentMapper.xml @@ -16,20 +16,20 @@ --> - + id, name, parent_id, state, sort, remark, version, create_time, update_time - select from sys_department where id = #{id} - select from sys_department diff --git a/system/src/main/resources/mapper/system/SysPermissionMapper.xml b/system/src/main/resources/mapper/system/SysPermissionMapper.xml index f60b935a6980efa7d83ad48e81750d004bf32d2b..3c6fa19fc490b1fde6ee6be47aae301d226a3d36 100644 --- a/system/src/main/resources/mapper/system/SysPermissionMapper.xml +++ b/system/src/main/resources/mapper/system/SysPermissionMapper.xml @@ -16,20 +16,20 @@ --> - + id, name, parent_id, url, code, icon, type, level, state, sort, remark, version, create_time, update_time - select from sys_permission where id = #{id} - select from sys_permission @@ -52,7 +52,7 @@ and u.id = #{userId}; - select p.* from sys_user u inner join sys_role r diff --git a/system/src/main/resources/mapper/system/SysRoleMapper.xml b/system/src/main/resources/mapper/system/SysRoleMapper.xml index ea23291d4d2b391164d13ae6b879a4a0a4837a08..884ce979438f4576c27ca70e72453b3a3c9df118 100644 --- a/system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -16,14 +16,14 @@ --> - + id, name, code, type, state, remark, version, create_time, update_time - select from sys_role where id = #{id} diff --git a/system/src/main/resources/mapper/system/SysRolePermissionMapper.xml b/system/src/main/resources/mapper/system/SysRolePermissionMapper.xml index 7d802dc4ef87430a09b767becd00e5850877d7c9..28fb847479a21d3f37bc9d749433b9a08a4da709 100644 --- a/system/src/main/resources/mapper/system/SysRolePermissionMapper.xml +++ b/system/src/main/resources/mapper/system/SysRolePermissionMapper.xml @@ -16,21 +16,21 @@ --> - + id, role_id, permission_id, state, remark, version, create_time, update_time - select from sys_role_permission where id = #{id} + - and u.department_id = #{param.departmentId}