Merge branch 'feature/1.0.0' into develop

base-framework-cache-starter/src/main/java/com/fuhouyu/framework/cache/properties/CacheServiceProperties.java

@@ -17,7 +17,7 @@
 package com.fuhouyu.framework.cache.properties;
 
 import com.fuhouyu.framework.cache.enums.CacheServiceTypeEnum;
-import com.fuhouyu.framework.constants.ConfigPropertiesConstant;
+import com.fuhouyu.framework.common.constants.ConfigPropertiesConstant;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

base-framework-cache-starter/src/main/java/module-info.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module base.framework.cache.starter {
+    // 透传
+    requires transitive base.framework.common;
+    requires transitive com.github.benmanes.caffeine;
+    requires transitive com.fasterxml.jackson.annotation;
+    requires transitive com.fasterxml.jackson.databind;
+    requires org.checkerframework.checker.qual;
+    requires spring.boot;
+    requires spring.boot.autoconfigure;
+    requires spring.context;
+    requires spring.tx;
+    requires spring.data.redis;
+
+    // 需要导出的类
+    exports com.fuhouyu.framework.cache;
+    exports com.fuhouyu.framework.cache.enums;
+    exports com.fuhouyu.framework.cache.properties;
+    exports com.fuhouyu.framework.cache.service;
+    exports com.fuhouyu.framework.cache.service.impl;
+
+    uses com.fuhouyu.framework.cache.service.CacheService;
+    opens com.fuhouyu.framework.cache to spring.core;
+
+}

base-framework-common/src/main/java/com/fuhouyu/framework/Entity.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/Entity.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fuhouyu.framework;
+package com.fuhouyu.framework.common;
 
 import java.io.Serializable;
 

base-framework-common/src/main/java/com/fuhouyu/framework/ValueObject.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/ValueObject.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fuhouyu.framework;
+package com.fuhouyu.framework.common;
 
 import java.io.Serializable;
 

base-framework-common/src/main/java/com/fuhouyu/framework/ValueObjectSupport.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/ValueObjectSupport.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fuhouyu.framework;
+package com.fuhouyu.framework.common;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;

base-framework-common/src/main/java/com/fuhouyu/framework/constants/ConfigPropertiesConstant.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/constants/ConfigPropertiesConstant.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.constants;
+package com.fuhouyu.framework.common.constants;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/constants/HttpRequestHeaderConstant.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/constants/HttpRequestHeaderConstant.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.constants;
+package com.fuhouyu.framework.common.constants;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/exception/FileException.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/exception/FileException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fuhouyu.framework.exception;
+package com.fuhouyu.framework.common.exception;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/exception/JsonParseException.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/exception/JsonParseException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.exception;
+package com.fuhouyu.framework.common.exception;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/function/Callback.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/function/Callback.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fuhouyu.framework.function;
+package com.fuhouyu.framework.common.function;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/common/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 公共组件，主要定义所有依赖的公共项
+ */
+package com.fuhouyu.framework.common;

base-framework-common/src/main/java/com/fuhouyu/framework/response/BaseResponse.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/response/BaseResponse.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fuhouyu.framework.response;
+package com.fuhouyu.framework.common.response;
 
 import java.io.Serializable;
 

base-framework-common/src/main/java/com/fuhouyu/framework/response/BaseResponseCode.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/response/BaseResponseCode.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.response;
+package com.fuhouyu.framework.common.response;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/service/AdditionalInformationFunction.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/service/AdditionalInformationFunction.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.fuhouyu.framework.service;
+package com.fuhouyu.framework.common.service;
 
 import java.util.Map;
 

base-framework-common/src/main/java/com/fuhouyu/framework/service/Callback.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/service/Callback.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.service;
+package com.fuhouyu.framework.common.service;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/utils/ClassUtil.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/ClassUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.utils;
+package com.fuhouyu.framework.common.utils;
 
 /**
  * <p>

base-framework-common/src/main/java/com/fuhouyu/framework/utils/FileUtil.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/FileUtil.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.utils;
+package com.fuhouyu.framework.common.utils;
 
 
-import com.fuhouyu.framework.exception.FileException;
+import com.fuhouyu.framework.common.exception.FileException;
 import lombok.NonNull;
 
 import java.io.IOException;

base-framework-common/src/main/java/com/fuhouyu/framework/utils/HexUtil.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/HexUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.utils;
+package com.fuhouyu.framework.common.utils;
 
 import java.nio.charset.StandardCharsets;
 

base-framework-common/src/main/java/com/fuhouyu/framework/utils/HttpRequestUtil.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/HttpRequestUtil.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.utils;
+package com.fuhouyu.framework.common.utils;
 
-import com.fuhouyu.framework.constants.HttpRequestHeaderConstant;
+import com.fuhouyu.framework.common.constants.HttpRequestHeaderConstant;
 import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 

base-framework-common/src/main/java/com/fuhouyu/framework/utils/JacksonUtil.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/JacksonUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.utils;
+package com.fuhouyu.framework.common.utils;
 
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -26,7 +26,7 @@
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.fuhouyu.framework.exception.JsonParseException;
+import com.fuhouyu.framework.common.exception.JsonParseException;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

base-framework-common/src/main/java/com/fuhouyu/framework/utils/LoggerUtil.java → base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/LoggerUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fuhouyu.framework.utils;
+package com.fuhouyu.framework.common.utils;
 
 import org.slf4j.Logger;
 

base-framework-common/src/main/java/module-info.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module base.framework.common {
+    // 以下依赖都需要传递给其依赖项
+    requires transitive lombok;
+    requires transitive com.fasterxml.jackson.datatype.jsr310;
+    requires transitive jakarta.servlet;
+    requires transitive org.apache.commons.lang3;
+    requires transitive org.slf4j;
+    requires transitive com.fasterxml.jackson.databind;
+
+    exports com.fuhouyu.framework.common;
+    exports com.fuhouyu.framework.common.constants;
+    exports com.fuhouyu.framework.common.exception;
+    exports com.fuhouyu.framework.common.function;
+    exports com.fuhouyu.framework.common.response;
+    exports com.fuhouyu.framework.common.service;
+    exports com.fuhouyu.framework.common.utils;
+}

base-framework-context/src/main/java/com/fuhouyu/framework/context/Request.java

@@ -16,7 +16,7 @@
 
 package com.fuhouyu.framework.context;
 
-import com.fuhouyu.framework.service.AdditionalInformationFunction;
+import com.fuhouyu.framework.common.service.AdditionalInformationFunction;
 
 import java.io.Serializable;
 

base-framework-context/src/main/java/com/fuhouyu/framework/context/User.java

@@ -16,7 +16,7 @@
 
 package com.fuhouyu.framework.context;
 
-import com.fuhouyu.framework.service.AdditionalInformationFunction;
+import com.fuhouyu.framework.common.service.AdditionalInformationFunction;
 
 import java.io.Serializable;
 

base-framework-context/src/main/java/com/fuhouyu/framework/context/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * 上下文组件包
+ */
+package com.fuhouyu.framework.context;

base-framework-context/src/main/java/module-info.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+module base.framework.context {
+    requires transitive base.framework.common;
+
+    exports com.fuhouyu.framework.context;
+    exports com.fuhouyu.framework.context.exception;
+}

base-framework-database/src/main/java/com/fuhouyu/framework/database/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * 数据库相关组件
+ */
+package com.fuhouyu.framework.database;

base-framework-database/src/main/java/module-info.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module base.framework.database {
+    requires org.mybatis;
+
+    exports com.fuhouyu.framework.database.interceptor;
+    exports com.fuhouyu.framework.database.annotations;
+}