diff --git a/pom.xml b/pom.xml
index 85a1ae13..8db9701b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
cc.allio
uno
pom
- 1.1.6-beta.1
+ 1.1.6
构建大型应用需要的基本能力 --- all in one
https://github.com/b6688c/uno
diff --git a/uno-auto/pom.xml b/uno-auto/pom.xml
index 20ea35b4..8916d7de 100644
--- a/uno-auto/pom.xml
+++ b/uno-auto/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-bom/pom.xml b/uno-bom/pom.xml
index ca43b684..2e1abbb6 100644
--- a/uno-bom/pom.xml
+++ b/uno-bom/pom.xml
@@ -12,12 +12,12 @@
4.0.0
cc.allio
uno-bom
- 1.1.6-beta.1
+ 1.1.6
pom
- 1.1.6-beta.1
+ 1.1.6
1.5.9
diff --git a/uno-components/pom.xml b/uno-components/pom.xml
index a893d9af..ae20fe4a 100644
--- a/uno-components/pom.xml
+++ b/uno-components/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-components/uno-component-http/pom.xml b/uno-components/uno-component-http/pom.xml
index e9632cde..63a66f0d 100644
--- a/uno-components/uno-component-http/pom.xml
+++ b/uno-components/uno-component-http/pom.xml
@@ -5,7 +5,7 @@
uno-components
cc.allio
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
4.0.0
diff --git a/uno-components/uno-component-kafka/pom.xml b/uno-components/uno-component-kafka/pom.xml
index 0b634a1d..a7fde409 100644
--- a/uno-components/uno-component-kafka/pom.xml
+++ b/uno-components/uno-component-kafka/pom.xml
@@ -5,7 +5,7 @@
uno-components
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-components/uno-component-netty/pom.xml b/uno-components/uno-component-netty/pom.xml
index c0ff9195..ce01bc7f 100644
--- a/uno-components/uno-component-netty/pom.xml
+++ b/uno-components/uno-component-netty/pom.xml
@@ -6,7 +6,7 @@
uno-components
cc.allio
- 1.1.6-beta.1
+ 1.1.6
uno-component-netty
diff --git a/uno-components/uno-component-sequential/pom.xml b/uno-components/uno-component-sequential/pom.xml
index da635e60..5e061520 100644
--- a/uno-components/uno-component-sequential/pom.xml
+++ b/uno-components/uno-component-sequential/pom.xml
@@ -5,7 +5,7 @@
uno-components
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-components/uno-component-websocket/pom.xml b/uno-components/uno-component-websocket/pom.xml
index 79e399b7..d3591976 100644
--- a/uno-components/uno-component-websocket/pom.xml
+++ b/uno-components/uno-component-websocket/pom.xml
@@ -5,7 +5,7 @@
uno-components
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-core/pom.xml b/uno-core/pom.xml
index d0f933bc..f249a9ed 100644
--- a/uno-core/pom.xml
+++ b/uno-core/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-data/pom.xml b/uno-data/pom.xml
index 44d22227..55b22e04 100644
--- a/uno-data/pom.xml
+++ b/uno-data/pom.xml
@@ -5,13 +5,13 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
pom
4.0.0
uno-data
- 1.1.6-beta.1
+ 1.1.6
summary: uno数据层操作,包含于数据源、mybatis-plus、reactive-jpa、elasticsearch、influxdb等
features: 提供数据聚合等操作
diff --git a/uno-data/uno-data-api/pom.xml b/uno-data/uno-data-api/pom.xml
index 4dd8162c..d07b984b 100644
--- a/uno-data/uno-data-api/pom.xml
+++ b/uno-data/uno-data-api/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
jar
diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java
index 65cdf700..58e3522e 100644
--- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java
+++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java
@@ -24,4 +24,5 @@ public boolean equalsTo(Class> otherJavaType) {
public boolean equals(Object o) {
return Objects.equals(this, o);
}
+
}
diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java
index 6eaeec15..12cf187c 100644
--- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java
+++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java
@@ -1,5 +1,7 @@
package cc.allio.uno.data.orm.dsl.type;
+import cc.allio.uno.core.api.EqualsTo;
+
import java.io.Serializable;
/**
@@ -10,7 +12,7 @@
* @see TypeRegistry
* @since 1.1.4
*/
-public interface JavaType extends Serializable {
+public interface JavaType extends Serializable, EqualsTo> {
/**
* 获取Java类型对应 class 实例
@@ -19,14 +21,6 @@ public interface JavaType extends Serializable {
*/
Class getJavaType();
- /**
- * 比较类型是否属于当前Java类型
- *
- * @param otherJavaType otherJavaType
- * @return ture ye or nor
- */
- boolean equalsTo(Class> otherJavaType);
-
/**
* 获取当前Java类型对应的SQL字段的默认长度
*
diff --git a/uno-data/uno-data-db/pom.xml b/uno-data/uno-data-db/pom.xml
index 5abfabfd..4dbe3f21 100644
--- a/uno-data/uno-data-db/pom.xml
+++ b/uno-data/uno-data-db/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
4.0.0
diff --git a/uno-data/uno-data-elasticsearch/pom.xml b/uno-data/uno-data-elasticsearch/pom.xml
index 8255bacd..b4545c79 100644
--- a/uno-data/uno-data-elasticsearch/pom.xml
+++ b/uno-data/uno-data-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
4.0.0
diff --git a/uno-data/uno-data-influxdb/pom.xml b/uno-data/uno-data-influxdb/pom.xml
index 2b6e7886..cbfd25c7 100644
--- a/uno-data/uno-data-influxdb/pom.xml
+++ b/uno-data/uno-data-influxdb/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
4.0.0
diff --git a/uno-data/uno-data-mongodb/pom.xml b/uno-data/uno-data-mongodb/pom.xml
index e223f213..ffae7f47 100644
--- a/uno-data/uno-data-mongodb/pom.xml
+++ b/uno-data/uno-data-mongodb/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
jar
diff --git a/uno-data/uno-data-neo4j/pom.xml b/uno-data/uno-data-neo4j/pom.xml
index 6d08db94..286b7724 100644
--- a/uno-data/uno-data-neo4j/pom.xml
+++ b/uno-data/uno-data-neo4j/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
jar
diff --git a/uno-data/uno-data-redis/pom.xml b/uno-data/uno-data-redis/pom.xml
index c4432d4c..ca3196c7 100644
--- a/uno-data/uno-data-redis/pom.xml
+++ b/uno-data/uno-data-redis/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
jar
diff --git a/uno-data/uno-data-sql/pom.xml b/uno-data/uno-data-sql/pom.xml
index d1f57695..41aa48ec 100644
--- a/uno-data/uno-data-sql/pom.xml
+++ b/uno-data/uno-data-sql/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
diff --git a/uno-data/uno-data-test/pom.xml b/uno-data/uno-data-test/pom.xml
index a2fe6b64..4644fbb2 100644
--- a/uno-data/uno-data-test/pom.xml
+++ b/uno-data/uno-data-test/pom.xml
@@ -5,7 +5,7 @@
cc.allio
uno-data
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
jar
diff --git a/uno-demo/pom.xml b/uno-demo/pom.xml
index 4b5e5357..b9a9432a 100644
--- a/uno-demo/pom.xml
+++ b/uno-demo/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-demo/uno-websocket-demo/pom.xml b/uno-demo/uno-websocket-demo/pom.xml
index 70538b0d..58d502e3 100644
--- a/uno-demo/uno-websocket-demo/pom.xml
+++ b/uno-demo/uno-websocket-demo/pom.xml
@@ -5,7 +5,7 @@
uno-demo
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-gis/pom.xml b/uno-gis/pom.xml
index 72290344..d0297ffe 100644
--- a/uno-gis/pom.xml
+++ b/uno-gis/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
@@ -18,8 +18,7 @@
cc.allio
- uno-data
- provided
+ uno-data-api
cc.allio
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/config/UnoGisTypeAutoConfiguration.java b/uno-gis/src/main/java/cc/allio/uno/gis/config/UnoGisTypeAutoConfiguration.java
index fd97cf47..74198718 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/config/UnoGisTypeAutoConfiguration.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/config/UnoGisTypeAutoConfiguration.java
@@ -1,8 +1,8 @@
package cc.allio.uno.gis.config;
-import cc.allio.uno.data.orm.type.JdbcType;
-import cc.allio.uno.data.orm.type.JdbcTypeImpl;
-import cc.allio.uno.data.orm.type.TypeRegistry;
+import cc.allio.uno.data.orm.dsl.type.JdbcType;
+import cc.allio.uno.data.orm.dsl.type.JdbcTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.TypeRegistry;
import cc.allio.uno.gis.GeometryTypes;
import cc.allio.uno.gis.local.type.*;
import org.springframework.beans.factory.InitializingBean;
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java
index 8b387a7c..87c1ab40 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.GeometryCollection;
@@ -16,4 +16,9 @@ public class GeometryCollectionJavaType extends JavaTypeImpl
public Class getJavaType() {
return GeometryTypes.GEOMETRY_COLLECTION;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.GEOMETRY_COLLECTION.isAssignableFrom(other);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java
index 49053442..d89d5421 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.Geometry;
@@ -16,4 +16,9 @@ public class GeometryJavaType extends JavaTypeImpl {
public Class getJavaType() {
return GeometryTypes.GEOMETRY;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.isGeometry(other);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java
index 8a365056..73413600 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.LineString;
@@ -16,4 +16,9 @@ public class LineStringJavaType extends JavaTypeImpl {
public Class getJavaType() {
return GeometryTypes.LINE_STRING;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.LINE_STRING.isAssignableFrom(other);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java
index 4ab9bfcb..f40a9295 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.LinearRing;
@@ -16,4 +16,9 @@ public class LinearRingJavaType extends JavaTypeImpl {
public Class getJavaType() {
return GeometryTypes.LINEAR_RING;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.LINEAR_RING.isAssignableFrom(other);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java
index 4ec82c1e..2715dd27 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.MultiLineString;
@@ -12,8 +12,14 @@
* @since 1.1.4
*/
public class MultiLineStringJavaType extends JavaTypeImpl {
+
@Override
public Class getJavaType() {
return GeometryTypes.MULTI_LINE_STRING;
}
+
+ @Override
+ public boolean equalsTo(Class> otherJavaType) {
+ return GeometryTypes.MULTI_LINE_STRING.isAssignableFrom(otherJavaType);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java
index f175317e..155de804 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.MultiPoint;
@@ -16,4 +16,9 @@ public class MultiPointJavaType extends JavaTypeImpl {
public Class getJavaType() {
return GeometryTypes.MULTI_POINT;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.MULTI_POINT.isAssignableFrom(other);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java
index 4fabf961..305d59ab 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.MultiPolygon;
@@ -16,4 +16,9 @@ public class MultiPolygonJavaType extends JavaTypeImpl {
public Class getJavaType() {
return GeometryTypes.MULTI_POLYGON;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.MULTI_POLYGON.isAssignableFrom(other);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java
index d7fbf41b..864df6a2 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.Point;
@@ -16,4 +16,9 @@ public class PointJavaType extends JavaTypeImpl {
public Class getJavaType() {
return GeometryTypes.POINT;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.POINT.isAssignableFrom(other);
+ }
}
diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java
index d99435fa..2afc28d4 100644
--- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java
+++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java
@@ -1,6 +1,6 @@
package cc.allio.uno.gis.local.type;
-import cc.allio.uno.data.orm.type.JavaTypeImpl;
+import cc.allio.uno.data.orm.dsl.type.JavaTypeImpl;
import cc.allio.uno.gis.GeometryTypes;
import org.locationtech.jts.geom.Polygon;
@@ -16,4 +16,9 @@ public class PolygonJavaType extends JavaTypeImpl {
public Class getJavaType() {
return GeometryTypes.POLYGON;
}
+
+ @Override
+ public boolean equalsTo(Class> other) {
+ return GeometryTypes.POLYGON.isAssignableFrom(other);
+ }
}
diff --git a/uno-plugins/pom.xml b/uno-plugins/pom.xml
index a057ad08..d175b92f 100644
--- a/uno-plugins/pom.xml
+++ b/uno-plugins/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-plugins/uno-plugins-manager/pom.xml b/uno-plugins/uno-plugins-manager/pom.xml
index 6f365783..5765508d 100644
--- a/uno-plugins/uno-plugins-manager/pom.xml
+++ b/uno-plugins/uno-plugins-manager/pom.xml
@@ -5,7 +5,7 @@
uno-plugins
cc.allio
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
4.0.0
diff --git a/uno-plugins/uno-plugins-platform/pom.xml b/uno-plugins/uno-plugins-platform/pom.xml
index 4a81bb02..6f1692e4 100644
--- a/uno-plugins/uno-plugins-platform/pom.xml
+++ b/uno-plugins/uno-plugins-platform/pom.xml
@@ -5,7 +5,7 @@
uno-plugins
cc.allio
- 1.1.6-beta.1
+ 1.1.6
../pom.xml
4.0.0
diff --git a/uno-rule/pom.xml b/uno-rule/pom.xml
index ffbc2f78..e8198d15 100644
--- a/uno-rule/pom.xml
+++ b/uno-rule/pom.xml
@@ -6,7 +6,7 @@
cc.allio
uno
- 1.1.6-beta.1
+ 1.1.6
uno-rule
diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java
index f8603d18..2438d10c 100644
--- a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java
+++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java
@@ -60,6 +60,36 @@ public boolean isLeaf() {
return children.isEmpty();
}
+ @Override
+ public LogicGroup findChildren(Serializable id) {
+ for (LogicGroup child : children) {
+ if (id.equals(child.getId())) {
+ return child;
+ }
+ LogicGroup findChild = child.findChildren(id);
+ if (findChild != null) {
+ return findChild;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public boolean removeChildren(Serializable id) {
+ boolean removed = children.removeIf(child -> id.equals(child.getId()));
+ if (removed) {
+ return true;
+ }
+ // 没有移除尝试在从字节中再次移除
+ for (LogicGroup child : children) {
+ removed = child.removeChildren(id);
+ if (removed) {
+ return true;
+ }
+ }
+ return false;
+ }
+
@Override
public List getChildren() {
return null;
diff --git a/uno-starters/pom.xml b/uno-starters/pom.xml
index b07e313c..46302843 100644
--- a/uno-starters/pom.xml
+++ b/uno-starters/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-starters/uno-starter-core/pom.xml b/uno-starters/uno-starter-core/pom.xml
index 261b4bd7..eb28aee3 100644
--- a/uno-starters/uno-starter-core/pom.xml
+++ b/uno-starters/uno-starter-core/pom.xml
@@ -5,7 +5,7 @@
uno-starters
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-starters/uno-starter-kafka/pom.xml b/uno-starters/uno-starter-kafka/pom.xml
index 0f3dcd6f..8cecdeb5 100644
--- a/uno-starters/uno-starter-kafka/pom.xml
+++ b/uno-starters/uno-starter-kafka/pom.xml
@@ -5,7 +5,7 @@
uno-starters
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-starters/uno-starter-redis/pom.xml b/uno-starters/uno-starter-redis/pom.xml
index c38c1cff..059d5346 100644
--- a/uno-starters/uno-starter-redis/pom.xml
+++ b/uno-starters/uno-starter-redis/pom.xml
@@ -5,7 +5,7 @@
uno-starters
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-starters/uno-starter-sequential/pom.xml b/uno-starters/uno-starter-sequential/pom.xml
index e1747368..634a7581 100644
--- a/uno-starters/uno-starter-sequential/pom.xml
+++ b/uno-starters/uno-starter-sequential/pom.xml
@@ -5,7 +5,7 @@
uno-starters
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-starters/uno-starter-websocket/pom.xml b/uno-starters/uno-starter-websocket/pom.xml
index e88b2494..b5e2b81a 100644
--- a/uno-starters/uno-starter-websocket/pom.xml
+++ b/uno-starters/uno-starter-websocket/pom.xml
@@ -5,7 +5,7 @@
uno-starters
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-test/pom.xml b/uno-test/pom.xml
index 86cdfe3b..b5dbcc14 100644
--- a/uno-test/pom.xml
+++ b/uno-test/pom.xml
@@ -5,7 +5,7 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
diff --git a/uno-web/pom.xml b/uno-web/pom.xml
index 8120f3dc..3ee736d6 100644
--- a/uno-web/pom.xml
+++ b/uno-web/pom.xml
@@ -5,12 +5,12 @@
uno
cc.allio
- 1.1.6-beta.1
+ 1.1.6
4.0.0
uno-web
- 1.1.6-beta.1
+ 1.1.6
基于spring-webmvc、spring-webflux