diff --git a/base-framework-cache-starter/pom.xml b/base-framework-cache-starter/pom.xml index 2a342a2..8ff0ed8 100644 --- a/base-framework-cache-starter/pom.xml +++ b/base-framework-cache-starter/pom.xml @@ -61,11 +61,6 @@ com.fuhouyu base-framework-common - - org.projectlombok - lombok - provided - \ No newline at end of file diff --git a/base-framework-common/pom.xml b/base-framework-common/pom.xml index 906bce5..cd32b96 100644 --- a/base-framework-common/pom.xml +++ b/base-framework-common/pom.xml @@ -70,7 +70,6 @@ org.projectlombok lombok - provided diff --git a/base-framework-context/pom.xml b/base-framework-context/pom.xml index bf63886..8b9fd27 100644 --- a/base-framework-context/pom.xml +++ b/base-framework-context/pom.xml @@ -35,11 +35,6 @@ junit-jupiter test - - org.projectlombok - lombok - provided - com.fuhouyu base-framework-common diff --git a/base-framework-context/src/main/java/com/fuhouyu/framework/context/ContextFactory.java b/base-framework-context/src/main/java/com/fuhouyu/framework/context/ContextFactory.java index e3e371b..b67d2e9 100644 --- a/base-framework-context/src/main/java/com/fuhouyu/framework/context/ContextFactory.java +++ b/base-framework-context/src/main/java/com/fuhouyu/framework/context/ContextFactory.java @@ -17,6 +17,8 @@ package com.fuhouyu.framework.context; import com.fuhouyu.framework.context.exception.ContextNotFoundException; +import com.fuhouyu.framework.context.request.Request; +import com.fuhouyu.framework.context.user.User; /** *

diff --git a/base-framework-context/src/main/java/com/fuhouyu/framework/context/DefaultListableContextFactory.java b/base-framework-context/src/main/java/com/fuhouyu/framework/context/DefaultListableContextFactory.java index 732a39b..fa3c450 100644 --- a/base-framework-context/src/main/java/com/fuhouyu/framework/context/DefaultListableContextFactory.java +++ b/base-framework-context/src/main/java/com/fuhouyu/framework/context/DefaultListableContextFactory.java @@ -16,6 +16,8 @@ package com.fuhouyu.framework.context; import com.fuhouyu.framework.context.exception.ContextNotFoundException; +import com.fuhouyu.framework.context.request.Request; +import com.fuhouyu.framework.context.user.User; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/base-framework-context/src/main/java/com/fuhouyu/framework/context/Request.java b/base-framework-context/src/main/java/com/fuhouyu/framework/context/request/Request.java similarity index 96% rename from base-framework-context/src/main/java/com/fuhouyu/framework/context/Request.java rename to base-framework-context/src/main/java/com/fuhouyu/framework/context/request/Request.java index 99ecbbe..fd27ea5 100644 --- a/base-framework-context/src/main/java/com/fuhouyu/framework/context/Request.java +++ b/base-framework-context/src/main/java/com/fuhouyu/framework/context/request/Request.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.fuhouyu.framework.context; +package com.fuhouyu.framework.context.request; import com.fuhouyu.framework.common.service.AdditionalInformationFunction; diff --git a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/RequestEntity.java b/base-framework-context/src/main/java/com/fuhouyu/framework/context/request/RequestEntity.java similarity index 94% rename from base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/RequestEntity.java rename to base-framework-context/src/main/java/com/fuhouyu/framework/context/request/RequestEntity.java index fdbaec4..ea542ee 100644 --- a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/RequestEntity.java +++ b/base-framework-context/src/main/java/com/fuhouyu/framework/context/request/RequestEntity.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package com.fuhouyu.framework.web.entity; +package com.fuhouyu.framework.context.request; -import com.fuhouyu.framework.context.Request; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/base-framework-context/src/main/java/com/fuhouyu/framework/context/User.java b/base-framework-context/src/main/java/com/fuhouyu/framework/context/user/User.java similarity index 97% rename from base-framework-context/src/main/java/com/fuhouyu/framework/context/User.java rename to base-framework-context/src/main/java/com/fuhouyu/framework/context/user/User.java index 7a9ec6c..fe8455d 100644 --- a/base-framework-context/src/main/java/com/fuhouyu/framework/context/User.java +++ b/base-framework-context/src/main/java/com/fuhouyu/framework/context/user/User.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.fuhouyu.framework.context; +package com.fuhouyu.framework.context.user; import com.fuhouyu.framework.common.service.AdditionalInformationFunction; diff --git a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/UserEntity.java b/base-framework-context/src/main/java/com/fuhouyu/framework/context/user/UserEntity.java similarity index 94% rename from base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/UserEntity.java rename to base-framework-context/src/main/java/com/fuhouyu/framework/context/user/UserEntity.java index 8bce625..b23215b 100644 --- a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/UserEntity.java +++ b/base-framework-context/src/main/java/com/fuhouyu/framework/context/user/UserEntity.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.fuhouyu.framework.web.entity; +package com.fuhouyu.framework.context.user; -import com.fuhouyu.framework.context.User; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/base-framework-context/src/main/java/module-info.java b/base-framework-context/src/main/java/module-info.java index 7d90ea7..068e9e0 100644 --- a/base-framework-context/src/main/java/module-info.java +++ b/base-framework-context/src/main/java/module-info.java @@ -18,4 +18,6 @@ exports com.fuhouyu.framework.context; exports com.fuhouyu.framework.context.exception; + exports com.fuhouyu.framework.context.user; + exports com.fuhouyu.framework.context.request; } \ No newline at end of file diff --git a/base-framework-kms-starter/pom.xml b/base-framework-kms-starter/pom.xml index f85413f..92dd3d9 100644 --- a/base-framework-kms-starter/pom.xml +++ b/base-framework-kms-starter/pom.xml @@ -55,11 +55,6 @@ spring-boot-starter-test test - - org.projectlombok - lombok - provided - \ No newline at end of file diff --git a/base-framework-log-starter/pom.xml b/base-framework-log-starter/pom.xml index a4af84b..15d22a8 100644 --- a/base-framework-log-starter/pom.xml +++ b/base-framework-log-starter/pom.xml @@ -75,11 +75,7 @@ spring-boot-starter-test test - - org.projectlombok - lombok - provided - + diff --git a/base-framework-log-starter/src/test/java/com/fuhouyu/framework/log/LogRecordStoreTest.java b/base-framework-log-starter/src/test/java/com/fuhouyu/framework/log/LogRecordStoreTest.java index fc9acb4..8da9441 100644 --- a/base-framework-log-starter/src/test/java/com/fuhouyu/framework/log/LogRecordStoreTest.java +++ b/base-framework-log-starter/src/test/java/com/fuhouyu/framework/log/LogRecordStoreTest.java @@ -19,7 +19,7 @@ import com.fuhouyu.framework.common.utils.LoggerUtil; import com.fuhouyu.framework.context.ContextHolderStrategy; import com.fuhouyu.framework.context.DefaultListableContextFactory; -import com.fuhouyu.framework.context.User; +import com.fuhouyu.framework.context.user.User; import com.fuhouyu.framework.log.annotaions.LogRecord; import com.fuhouyu.framework.log.core.LogRecordStoreService; import com.fuhouyu.framework.log.enums.OperationTypeEnum; diff --git a/base-framework-resource-starter/pom.xml b/base-framework-resource-starter/pom.xml index cf047c9..f8d8efa 100644 --- a/base-framework-resource-starter/pom.xml +++ b/base-framework-resource-starter/pom.xml @@ -56,11 +56,6 @@ spring-boot-starter-test test - - org.projectlombok - lombok - provided - org.mapstruct mapstruct diff --git a/base-framework-security-starter/pom.xml b/base-framework-security-starter/pom.xml index 8c6b674..d302395 100644 --- a/base-framework-security-starter/pom.xml +++ b/base-framework-security-starter/pom.xml @@ -79,11 +79,6 @@ org.bouncycastle bcprov-jdk18on - - org.projectlombok - lombok - provided - com.fuhouyu base-framework-context diff --git a/base-framework-security-starter/src/main/java/com/fuhouyu/framework/security/token/DefaultAuthenticationKeyGenerator.java b/base-framework-security-starter/src/main/java/com/fuhouyu/framework/security/token/DefaultAuthenticationKeyGenerator.java index ecf2895..9c3e247 100644 --- a/base-framework-security-starter/src/main/java/com/fuhouyu/framework/security/token/DefaultAuthenticationKeyGenerator.java +++ b/base-framework-security-starter/src/main/java/com/fuhouyu/framework/security/token/DefaultAuthenticationKeyGenerator.java @@ -17,7 +17,7 @@ package com.fuhouyu.framework.security.token; import com.fuhouyu.framework.context.ContextHolderStrategy; -import com.fuhouyu.framework.context.Request; +import com.fuhouyu.framework.context.request.Request; import org.springframework.security.core.Authentication; import java.math.BigInteger; diff --git a/base-framework-web-starter/pom.xml b/base-framework-web-starter/pom.xml index 7d67a3c..83c7b8d 100644 --- a/base-framework-web-starter/pom.xml +++ b/base-framework-web-starter/pom.xml @@ -75,11 +75,6 @@ com.fuhouyu base-framework-kms-starter - - org.projectlombok - lombok - provided - org.springframework.boot spring-boot-starter-data-redis diff --git a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/WebAutoConfiguration.java b/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/WebAutoConfiguration.java index 4251e31..57df2b2 100644 --- a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/WebAutoConfiguration.java +++ b/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/WebAutoConfiguration.java @@ -18,8 +18,8 @@ import com.fuhouyu.framework.common.constants.HttpRequestHeaderConstant; import com.fuhouyu.framework.common.utils.JacksonUtil; +import com.fuhouyu.framework.context.user.UserEntity; import com.fuhouyu.framework.kms.service.KmsService; -import com.fuhouyu.framework.web.entity.UserEntity; import com.fuhouyu.framework.web.filter.DefaultHttpBodyFilter; import com.fuhouyu.framework.web.filter.HttpBodyFilter; import com.fuhouyu.framework.web.handler.ParseHttpRequest; diff --git a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/HttpRequestHandler.java b/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/HttpRequestHandler.java index b653866..4b9638c 100644 --- a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/HttpRequestHandler.java +++ b/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/HttpRequestHandler.java @@ -18,8 +18,8 @@ import com.fuhouyu.framework.context.ContextHolderStrategy; import com.fuhouyu.framework.context.DefaultListableContextFactory; -import com.fuhouyu.framework.context.Request; -import com.fuhouyu.framework.context.User; +import com.fuhouyu.framework.context.request.Request; +import com.fuhouyu.framework.context.user.User; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; diff --git a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/ParseHttpRequest.java b/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/ParseHttpRequest.java index 23ccbeb..329be36 100644 --- a/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/ParseHttpRequest.java +++ b/base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/handler/ParseHttpRequest.java @@ -16,9 +16,9 @@ package com.fuhouyu.framework.web.handler; import com.fuhouyu.framework.common.utils.HttpRequestUtil; -import com.fuhouyu.framework.context.Request; -import com.fuhouyu.framework.context.User; -import com.fuhouyu.framework.web.entity.RequestEntity; +import com.fuhouyu.framework.context.request.Request; +import com.fuhouyu.framework.context.request.RequestEntity; +import com.fuhouyu.framework.context.user.User; import jakarta.servlet.http.HttpServletRequest; import lombok.NonNull; import org.springframework.http.HttpHeaders; diff --git a/base-framework-web-starter/src/main/java/module-info.java b/base-framework-web-starter/src/main/java/module-info.java index 3eff60a..f035195 100644 --- a/base-framework-web-starter/src/main/java/module-info.java +++ b/base-framework-web-starter/src/main/java/module-info.java @@ -35,7 +35,6 @@ exports com.fuhouyu.framework.web.aspectj; exports com.fuhouyu.framework.web.constants; exports com.fuhouyu.framework.web.controller; - exports com.fuhouyu.framework.web.entity; exports com.fuhouyu.framework.web.enums; exports com.fuhouyu.framework.web.exception; exports com.fuhouyu.framework.web.filter;