Merge branch 'feature/1.0.0' into develop

base-framework-cache-starter/pom.xml

@@ -61,11 +61,6 @@
             <groupId>com.fuhouyu</groupId>
             <artifactId>base-framework-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>

base-framework-common/pom.xml

@@ -70,7 +70,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 

base-framework-context/pom.xml

@@ -35,11 +35,6 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fuhouyu</groupId>
             <artifactId>base-framework-common</artifactId>

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;
 
 /**
  * <p>

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;

base-framework-context/src/main/java/com/fuhouyu/framework/context/Request.java → 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;
 

base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/RequestEntity.java → 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;

base-framework-context/src/main/java/com/fuhouyu/framework/context/User.java → 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;
 

base-framework-web-starter/src/main/java/com/fuhouyu/framework/web/entity/UserEntity.java → 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;

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;
 }

base-framework-kms-starter/pom.xml

@@ -55,11 +55,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
 </project>

base-framework-log-starter/pom.xml

@@ -75,11 +75,7 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
     </dependencies>
 
 

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;

base-framework-resource-starter/pom.xml

@@ -56,11 +56,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>

base-framework-security-starter/pom.xml

@@ -79,11 +79,6 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fuhouyu</groupId>
             <artifactId>base-framework-context</artifactId>

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;

base-framework-web-starter/pom.xml

@@ -75,11 +75,6 @@
             <groupId>com.fuhouyu</groupId>
             <artifactId>base-framework-kms-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>

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;

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;

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;

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;