diff --git a/boot/pom.xml b/boot/pom.xml index 4b9a81bc..f506715e 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -187,19 +178,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + boot + zfoo boot + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/event/pom.xml b/event/pom.xml index b96202ba..cfaa6338 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -155,19 +146,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + event + zfoo event + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/hotswap/pom.xml b/hotswap/pom.xml index 85f49d28..b1d511d3 100644 --- a/hotswap/pom.xml +++ b/hotswap/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -166,19 +157,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + hotswap + zfoo hotswap + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/monitor/pom.xml b/monitor/pom.xml index 6d0675d6..dd617880 100644 --- a/monitor/pom.xml +++ b/monitor/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,11 +38,14 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 + com.zfoo @@ -160,19 +152,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + monitor + zfoo monitor + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/monitor/src/main/java/com/zfoo/monitor/JvmMemory.java b/monitor/src/main/java/com/zfoo/monitor/JvmMemory.java index bdab42a0..6879b608 100644 --- a/monitor/src/main/java/com/zfoo/monitor/JvmMemory.java +++ b/monitor/src/main/java/com/zfoo/monitor/JvmMemory.java @@ -18,9 +18,7 @@ import java.lang.management.MemoryUsage; /** * @author yh - * @date 2022/10/10 下午6:44 */ - public class JvmMemory { private String name; private double total; diff --git a/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java b/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java index 5ebbe1ec..7311a2db 100644 --- a/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java +++ b/monitor/src/main/java/com/zfoo/monitor/util/JvmUtils.java @@ -8,7 +8,6 @@ import java.util.List; /** * @author yh - * @date 2022/10/10 下午6:42 */ public class JvmUtils { diff --git a/net/pom.xml b/net/pom.xml index 125a06e4..27cd3025 100644 --- a/net/pom.xml +++ b/net/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -219,19 +210,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + net + zfoo net + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/orm/pom.xml b/orm/pom.xml index 3eb1989a..82746433 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -174,19 +165,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + orm + zfoo orm + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java b/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java index 15cdacc1..148cbadd 100644 --- a/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java +++ b/orm/src/main/java/com/zfoo/orm/query/IQueryBuilder.java @@ -20,37 +20,36 @@ import java.util.List; /** - * EQ、= 等于（=） - * NE、<> 不等于（<>） - * GT、> 大于（>） - * GTE、>= 大于等于（>=） - * LT、< 小于（<） - * lte、<= 小于等于（<=） - * LIKE 模糊查询 - * [n] in （不在）IN 查询 - * * @author sinprog */ public interface IQueryBuilder { + // EQ、= 等于（=） IQueryBuilder eq(String fieldName, Object fieldValue); + // NE、<> 不等于（<>） IQueryBuilder ne(String fieldName, Object fieldValue); IQueryBuilder in(String fieldName, List fieldValueList); + // [n] in （不在）IN 查询 IQueryBuilder nin(String fieldName, List fieldValueList); - IQueryBuilder like(String fieldName, String fieldValue); - + // LT、< 小于（<） IQueryBuilder lt(String fieldName, Object fieldValue); + // lte、<= 小于等于（<=） IQueryBuilder lte(String fieldName, Object fieldValue); + // GT、> 大于（>） IQueryBuilder gt(String fieldName, Object fieldValue); + // GTE、>= 大于等于（>=） IQueryBuilder gte(String fieldName, Object fieldValue); + // LIKE 模糊查询 + IQueryBuilder like(String fieldName, String fieldValue); + List queryAll(); diff --git a/pom.xml b/pom.xml index ba7da8aa..d97065b9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,106 +23,6 @@ - - - jaysunxiao - jaysunxiao@gmail.com - https://github.com/godotg - - - - - The zfoo Authors - https://github.com/zfoo-project/zfoo - - - - https://github.com/zfoo-project/zfoo.git - scm:git:ssh://git@github.com:zfoo-project/zfoo.git - https://github.com/zfoo-project/zfoo - - - - - ossrh - - true - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://s01.oss.sonatype.org/ - true - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - - - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - boot event @@ -137,36 +37,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -174,10 +63,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -191,7 +82,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} diff --git a/protocol/pom.xml b/protocol/pom.xml index ac69a718..4cf0ff66 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -218,19 +209,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + protocol + zfoo protocol + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/scheduler/pom.xml b/scheduler/pom.xml index 8944ac3f..bb7fd616 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -155,19 +146,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + scheduler + zfoo scheduler + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + diff --git a/storage/pom.xml b/storage/pom.xml index aeb6be92..4a0a2fe5 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -12,36 +12,25 @@ 3.1.0 - 6.0.11 3.1.3 4.12 - 3.29.2-GA 1.14.6 - 4.1.97.Final - 5.5.0 - 6.4.5 - 4.10.2 3.1.8 - 5.2.3 1.10.0 - - 17 - UTF-8 - 3.3.1 3.3.1 @@ -49,10 +38,12 @@ 3.1.2 3.3.0 3.5.0 + 3.1.1 2.16.0 - ${file.encoding} ${file.encoding} + 17 + UTF-8 @@ -187,19 +178,100 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + ${maven-deploy-plugin.version} - - + storage + zfoo storage + https://github.com/zfoo-project/zfoo + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + https://github.com/zfoo-project/zfoo.git + scm:git:ssh://git@github.com:zfoo-project/zfoo.git + https://github.com/zfoo-project/zfoo + + + + ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + + true + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + +