diff --git a/fast-boot-new/pom.xml b/fast-boot-new/pom.xml index 3a75a3c..3936d16 100644 --- a/fast-boot-new/pom.xml +++ b/fast-boot-new/pom.xml @@ -11,7 +11,7 @@ net.maku - fast-boot-framework + fast-framework 1.0.0 diff --git a/fast-boot-system/pom.xml b/fast-boot-system/pom.xml index c3d9d9f..42bbd87 100644 --- a/fast-boot-system/pom.xml +++ b/fast-boot-system/pom.xml @@ -11,7 +11,7 @@ net.maku - fast-boot-framework + fast-framework 1.0.0 diff --git a/fast-boot-framework/pom.xml b/fast-framework/pom.xml similarity index 97% rename from fast-boot-framework/pom.xml rename to fast-framework/pom.xml index 18ddde5..1a5e413 100644 --- a/fast-boot-framework/pom.xml +++ b/fast-framework/pom.xml @@ -5,7 +5,7 @@ 1.0.0 4.0.0 - fast-boot-framework + fast-framework jar diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/constant/Constant.java b/fast-framework/src/main/java/net/maku/framework/common/constant/Constant.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/constant/Constant.java rename to fast-framework/src/main/java/net/maku/framework/common/constant/Constant.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java b/fast-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java rename to fast-framework/src/main/java/net/maku/framework/common/dao/BaseDao.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java b/fast-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java rename to fast-framework/src/main/java/net/maku/framework/common/entity/BaseEntity.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java b/fast-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java rename to fast-framework/src/main/java/net/maku/framework/common/exception/ErrorCode.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/exception/FastException.java b/fast-framework/src/main/java/net/maku/framework/common/exception/FastException.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/exception/FastException.java rename to fast-framework/src/main/java/net/maku/framework/common/exception/FastException.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/exception/FastExceptionHandler.java b/fast-framework/src/main/java/net/maku/framework/common/exception/FastExceptionHandler.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/exception/FastExceptionHandler.java rename to fast-framework/src/main/java/net/maku/framework/common/exception/FastExceptionHandler.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java b/fast-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java rename to fast-framework/src/main/java/net/maku/framework/common/handler/FieldMetaObjectHandler.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java b/fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java rename to fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScope.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java b/fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java rename to fast-framework/src/main/java/net/maku/framework/common/interceptor/DataScopeInnerInterceptor.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/page/PageResult.java b/fast-framework/src/main/java/net/maku/framework/common/page/PageResult.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/page/PageResult.java rename to fast-framework/src/main/java/net/maku/framework/common/page/PageResult.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/query/Query.java b/fast-framework/src/main/java/net/maku/framework/common/query/Query.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/query/Query.java rename to fast-framework/src/main/java/net/maku/framework/common/query/Query.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/service/BaseService.java b/fast-framework/src/main/java/net/maku/framework/common/service/BaseService.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/service/BaseService.java rename to fast-framework/src/main/java/net/maku/framework/common/service/BaseService.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java b/fast-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java rename to fast-framework/src/main/java/net/maku/framework/common/service/impl/BaseServiceImpl.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java b/fast-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/AssertUtils.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java b/fast-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/DateUtils.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java b/fast-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/HttpContextUtils.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java b/fast-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/JsonUtils.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java b/fast-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/RedisKeys.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/RedisUtils.java b/fast-framework/src/main/java/net/maku/framework/common/utils/RedisUtils.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/RedisUtils.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/RedisUtils.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/Result.java b/fast-framework/src/main/java/net/maku/framework/common/utils/Result.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/Result.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/Result.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java b/fast-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/TreeNode.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java b/fast-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java rename to fast-framework/src/main/java/net/maku/framework/common/utils/TreeUtils.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/config/CorsConfig.java b/fast-framework/src/main/java/net/maku/framework/config/CorsConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/config/CorsConfig.java rename to fast-framework/src/main/java/net/maku/framework/config/CorsConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java b/fast-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java rename to fast-framework/src/main/java/net/maku/framework/config/MybatisPlusConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/config/RedisConfig.java b/fast-framework/src/main/java/net/maku/framework/config/RedisConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/config/RedisConfig.java rename to fast-framework/src/main/java/net/maku/framework/config/RedisConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java b/fast-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java rename to fast-framework/src/main/java/net/maku/framework/config/SwaggerConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/config/WebConfig.java b/fast-framework/src/main/java/net/maku/framework/config/WebConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/config/WebConfig.java rename to fast-framework/src/main/java/net/maku/framework/config/WebConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/config/AuthorizationServerConfig.java b/fast-framework/src/main/java/net/maku/framework/security/config/AuthorizationServerConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/config/AuthorizationServerConfig.java rename to fast-framework/src/main/java/net/maku/framework/security/config/AuthorizationServerConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java b/fast-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java rename to fast-framework/src/main/java/net/maku/framework/security/config/PasswordConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/config/PermitResource.java b/fast-framework/src/main/java/net/maku/framework/security/config/PermitResource.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/config/PermitResource.java rename to fast-framework/src/main/java/net/maku/framework/security/config/PermitResource.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/config/ResourceServerConfig.java b/fast-framework/src/main/java/net/maku/framework/security/config/ResourceServerConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/config/ResourceServerConfig.java rename to fast-framework/src/main/java/net/maku/framework/security/config/ResourceServerConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/config/TokenStoreConfig.java b/fast-framework/src/main/java/net/maku/framework/security/config/TokenStoreConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/config/TokenStoreConfig.java rename to fast-framework/src/main/java/net/maku/framework/security/config/TokenStoreConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/config/WebSecurityConfig.java b/fast-framework/src/main/java/net/maku/framework/security/config/WebSecurityConfig.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/config/WebSecurityConfig.java rename to fast-framework/src/main/java/net/maku/framework/security/config/WebSecurityConfig.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/exception/FastAuthenticationException.java b/fast-framework/src/main/java/net/maku/framework/security/exception/FastAuthenticationException.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/exception/FastAuthenticationException.java rename to fast-framework/src/main/java/net/maku/framework/security/exception/FastAuthenticationException.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/exception/FastOAuth2Exception.java b/fast-framework/src/main/java/net/maku/framework/security/exception/FastOAuth2Exception.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/exception/FastOAuth2Exception.java rename to fast-framework/src/main/java/net/maku/framework/security/exception/FastOAuth2Exception.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/exception/FastWebResponseExceptionTranslator.java b/fast-framework/src/main/java/net/maku/framework/security/exception/FastWebResponseExceptionTranslator.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/exception/FastWebResponseExceptionTranslator.java rename to fast-framework/src/main/java/net/maku/framework/security/exception/FastWebResponseExceptionTranslator.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java b/fast-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java rename to fast-framework/src/main/java/net/maku/framework/security/exception/SecurityAuthenticationEntryPoint.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/handler/UserAuthenticationFailureHandler.java b/fast-framework/src/main/java/net/maku/framework/security/handler/UserAuthenticationFailureHandler.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/handler/UserAuthenticationFailureHandler.java rename to fast-framework/src/main/java/net/maku/framework/security/handler/UserAuthenticationFailureHandler.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/token/FastTokenEnhancer.java b/fast-framework/src/main/java/net/maku/framework/security/token/FastTokenEnhancer.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/token/FastTokenEnhancer.java rename to fast-framework/src/main/java/net/maku/framework/security/token/FastTokenEnhancer.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java b/fast-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java rename to fast-framework/src/main/java/net/maku/framework/security/user/SecurityUser.java diff --git a/fast-boot-framework/src/main/java/net/maku/framework/security/user/UserDetail.java b/fast-framework/src/main/java/net/maku/framework/security/user/UserDetail.java similarity index 100% rename from fast-boot-framework/src/main/java/net/maku/framework/security/user/UserDetail.java rename to fast-framework/src/main/java/net/maku/framework/security/user/UserDetail.java diff --git a/pom.xml b/pom.xml index 62f2da8..91133fa 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,9 @@ - fast-boot-framework fast-boot-system fast-boot-new + fast-framework fast-server