Merge branch 'main' into feat_storage

2026-10-15 12:15:15 +00:00 · 2023-09-13 20:52:20 +08:00
commit eaef89afa0
@@ -6,44 +6,34 @@

    <groupId>com.zfoo</groupId>
    <artifactId>storage</artifactId>
-    <version>3.0</version>
+    <version>3.1.0</version>

    <packaging>jar</packaging>

    <properties>
-        <zfoo.version>3.0</zfoo.version>
-
+        <zfoo.version>3.1.0</zfoo.version>
        <!-- spring and spring boot -->
        <spring.version>6.0.11</spring.version>
        <spring.boot.version>3.1.3</spring.boot.version>
        <junit.version>4.12</junit.version>
-
        <!-- bytecode enhancement(字节码增强) -->
        <javassist.version>3.29.2-GA</javassist.version>
        <bytebuddy.version>1.14.6</bytebuddy.version>
-
        <!-- network framework -->
        <netty.version>4.1.97.Final</netty.version>
-
        <!-- zookeeper -->
        <curator.version>5.5.0</curator.version>
-
        <!-- hardware detection(硬件检测) -->
        <oshi.version>6.4.5</oshi.version>
-
        <!-- database and cache -->
        <mongodb-driver-sync.version>4.10.2</mongodb-driver-sync.version>
        <caffeine.version>3.1.8</caffeine.version>
-
        <!-- Office document parsing(office文档解析包) -->
        <poi.version>5.2.3</poi.version>
        <csv.version>1.10.0</csv.version>
-
        <guava.version>32.1.2-jre</guava.version>
-
        <java.version>17</java.version>
        <file.encoding>UTF-8</file.encoding>
-
        <!-- maven core plugin(maven核心插件) -->
        <maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>
        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
@@ -51,10 +41,12 @@
        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
        <maven-shade-plugin.version>3.5.0</maven-shade-plugin.version>
+        <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
        <versions-maven-plugin.version>2.16.0</versions-maven-plugin.version>
-
        <project.build.sourceEncoding>${file.encoding}</project.build.sourceEncoding>
        <maven.compiler.encoding>${file.encoding}</maven.compiler.encoding>
+        <java.version>17</java.version>
+        <file.encoding>UTF-8</file.encoding>
    </properties>

    <dependencies>
@@ -191,8 +183,117 @@
                <artifactId>maven-jar-plugin</artifactId>
                <version>${maven-jar-plugin.version}</version>
            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>${maven-deploy-plugin.version}</version>
+            </plugin>
        </plugins>
    </build>

+    <name>storage</name>
+    <description>zfoo storage</description>
+    <url>https://github.com/zfoo-project/zfoo</url>

+    <developers>
+        <developer>
+            <name>jaysunxiao</name>
+            <email>jaysunxiao@gmail.com</email>
+            <url>https://github.com/godotg</url>
+        </developer>
+    </developers>
+
+    <organization>
+        <name>The zfoo Authors</name>
+        <url>https://github.com/zfoo-project/zfoo</url>
+    </organization>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <connection>https://github.com/zfoo-project/zfoo.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com:zfoo-project/zfoo.git</developerConnection>
+        <url>https://github.com/zfoo-project/zfoo</url>
+    </scm>
+
+    <profiles>
+        <profile>
+            <id>ossrh</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.13</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.5.0</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.1.0</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+
+            <distributionManagement>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+    </profiles>
 </project>
@@ -29,7 +29,6 @@ import java.util.List;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageContext implements ApplicationListener<ApplicationContextEvent>, Ordered {

@@ -21,7 +21,6 @@ import java.lang.annotation.*;
 * graalvm build must use this annotation to specify path, because native build cannot scan classes and files
 *
 * @author godotg
- * @version 3.0
 */
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -21,7 +21,6 @@ import java.lang.annotation.*;
 * primary key
 *
 * @author godotg
- * @version 3.0
 */

@Documented
@@ -21,7 +21,6 @@ import java.lang.annotation.*;
 * CN: 索引的名称使用字段属性的名称，用HaspMap实现
 *
 * @author godotg
- * @version 3.0
 */

@Documented
@@ -22,7 +22,6 @@ import java.lang.annotation.*;
 * CN: 可以指定对应的资源文件名（只指定文件名，不需要文件后缀），如果不指定资源文件名，则默认通过扫描路径获取与类名相同的文件资源
 *
 * @author godotg
- * @version 3.0
 */
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -21,7 +21,6 @@ import java.lang.annotation.*;
 * CN: 静态数据的注入
 *
 * @author godotg
- * @version 3.0
 */

@Documented
@@ -14,7 +14,6 @@ package com.zfoo.storage.config;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageConfig {

@@ -29,7 +29,6 @@ import java.util.List;

 /**
 * @author meiwei666
- * @version 3.0
 */
 public abstract class CsvReader {

@@ -27,7 +27,6 @@ import java.util.*;

 /**
 * @author meiwei666
- * @version 3.0
 */
 public abstract class ExcelReader {

@@ -22,7 +22,6 @@ import java.io.InputStream;

 /**
 * @author godotg
- * @version 3.0
 */
 public abstract class JsonReader {

@@ -31,7 +31,6 @@ import java.util.*;

 /**
 * @author godotg
- * @version 3.0
 */
 public class ResourceInterpreter {

@@ -22,7 +22,6 @@ import java.util.Map;
 * 支持读取配置文件的类型后缀
 *
 * @author godotg
- * @version 3.0
 */
 public enum StorageEnum {

@@ -13,7 +13,6 @@ package com.zfoo.storage.interpreter.data;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageHeader {

@@ -20,7 +20,6 @@ import java.util.Map;

 /**
 * @author godotg
- * @version 3.0
 */
 public interface IStorageManager {

@@ -22,7 +22,6 @@ import java.util.stream.Collectors;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageInt<K, V> extends StorageObject<K, V> {

@@ -22,7 +22,6 @@ import java.util.stream.Collectors;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageLong<K, V> extends StorageObject<K, V> {

@@ -48,7 +48,6 @@ import java.util.stream.Collectors;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageManager implements IStorageManager {

@@ -38,7 +38,6 @@ import java.util.stream.Collectors;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageObject<K, V> implements IStorage<K, V> {
    private ImmutableMap<K, V> dataMap;
@@ -20,7 +20,6 @@ import java.lang.reflect.Field;

 /**
 * @author godotg
- * @version 3.0
 */
 public class IdDef {

@@ -27,7 +27,6 @@ import java.util.Map;
 * 简化索引的名称，使用字段的名称作为索引的名称
 *
 * @author godotg
- * @version 3.0
 */
 public class IndexDef {

@@ -16,7 +16,6 @@ import org.springframework.core.io.Resource;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageDefinition {

@@ -17,7 +17,6 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;

 /**
 * @author godotg
- * @version 3.0
 */
 public class NamespaceHandler extends NamespaceHandlerSupport {

@@ -26,7 +26,6 @@ import org.w3c.dom.Element;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StorageDefinitionParser implements BeanDefinitionParser {

@@ -23,7 +23,6 @@ import java.util.Set;

 /**
 * @author godotg
- * @version 3.0
 */
 public class JsonToArrayConverter implements ConditionalGenericConverter {

@@ -23,7 +23,6 @@ import java.util.Set;

 /**
 * @author liqi
- * @version 3.0
 */
 public class JsonToListConverter implements ConditionalGenericConverter {

@@ -23,7 +23,6 @@ import java.util.Set;

 /**
 * @author godotg
- * @version 3.0
 */
 public class JsonToMapConverter implements ConditionalGenericConverter {
    @Override
@@ -25,7 +25,6 @@ import java.util.Set;
 * 转换一个String到一个POJO对象，且这个对象不能继承如何接口
 *
 * @author godotg
- * @version 3.0
 */
 public class JsonToObjectConverter implements ConditionalGenericConverter {

@@ -19,7 +19,6 @@ import org.springframework.core.convert.converter.Converter;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StringToClassConverter implements Converter<String, Class<?>> {

@@ -22,7 +22,6 @@ import java.util.Date;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StringToDateConverter implements Converter<String, Date> {

@@ -20,7 +20,6 @@ import java.util.Map;

 /**
 * @author godotg
- * @version 3.0
 */
 public class StringToMapConverter implements Converter<String, Map<String, Object>> {
    @Override
@@ -21,7 +21,6 @@ import org.apache.poi.ss.usermodel.FormulaError;

 /**
 * @author godotg
- * @version 3.0
 */
 public abstract class CellUtils {

@@ -32,7 +32,6 @@ import java.util.stream.Collectors;

 /**
 * @author godotg
- * @version 3.0
 */
 public abstract class ExportUtils {

@@ -30,7 +30,6 @@ import java.util.Map;

 /**
 * @author godotg
- * @version 3.0
 */

 public class ApplicationTest {
@@ -21,7 +21,6 @@ import org.springframework.stereotype.Component;

 /**
 * @author godotg
- * @version 3.0
 */
@Component
 public class StudentManager {
@@ -20,7 +20,6 @@ import org.springframework.stereotype.Component;

 /**
 * @author godotg
- * @version 3.0
 */
@Component
 public class TestManager {
@@ -30,7 +30,6 @@ import java.util.Set;

 /**
 * @author godotg
- * @version 3.0
 */
 public class ConversionTest {
    private static final ConversionServiceFactoryBean csfb = new ConversionServiceFactoryBean();
@@ -27,7 +27,6 @@ import java.util.Iterator;

 /**
 * @author godotg
- * @version 3.0
 */
@Ignore
 public class ExcelTesting {
@@ -41,7 +41,6 @@ import java.util.Map;

 /**
 * @author godotg
- * @version 3.0
 */


@@ -24,7 +24,6 @@ import java.io.IOException;

 /**
 * @author godotg
- * @version 3.0
 */
@Ignore
 public class ExportCsvTesting {
@@ -18,7 +18,6 @@ import org.junit.Test;

 /**
 * @author godotg
- * @version 3.0
 */
@Ignore
 public class ExportJsonTesting {
@@ -23,7 +23,6 @@ import java.io.IOException;

 /**
 * @author godotg
- * @version 3.0
 */
@Ignore
 public class PathMatchTesting {
@@ -15,7 +15,6 @@ package com.zfoo.storage.resource;

 /**
 * @author godotg
- * @version 3.0
 */
 public class Item {

@@ -19,7 +19,6 @@ import com.zfoo.storage.anno.Storage;

 /**
 * @author godotg
- * @version 3.0
 */
@Storage("StudentCsvResource")
 public class StudentCsvResource {
@@ -22,7 +22,6 @@ import java.util.List;

 /**
 * @author godotg
- * @version 3.0
 */
@Storage
 public class StudentResource {
@@ -20,7 +20,6 @@ import java.util.Map;

 /**
 * @author godotg
- * @version 3.0
 */
@Storage
 public class TestResource {
@@ -15,7 +15,6 @@ package com.zfoo.storage.resource;

 /**
 * @author godotg
- * @version 3.0
 */
 public class User {