release:🎉1.1.6

ClearXs · Feb 23, 2024 · 0b72ac1 · 0b72ac1
1 parent 7a227c1
commit 0b72ac1
Show file tree

Hide file tree

Showing 48 changed files with 131 additions and 61 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cc.allio</groupId>
     <artifactId>uno</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.6-beta.1</version>
+    <version>1.1.6</version>
     <description>构建大型应用需要的基本能力 --- all in one</description>
     <url>https://github.com/b6688c/uno</url>
 

diff --git a/uno-auto/pom.xml b/uno-auto/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-bom/pom.xml b/uno-bom/pom.xml
@@ -12,12 +12,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cc.allio</groupId>
     <artifactId>uno-bom</artifactId>
-    <version>1.1.6-beta.1</version>
+    <version>1.1.6</version>
     <packaging>pom</packaging>
 
     <properties>
         <!-- 统一版本管理 -->
-        <uno.version>1.1.6-beta.1</uno.version>
+        <uno.version>1.1.6</uno.version>
         <!-- 序列化框架 -->
         <protostuff.version>1.5.9</protostuff.version>
         <!-- google SPI -->

diff --git a/uno-components/pom.xml b/uno-components/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-components/uno-component-http/pom.xml b/uno-components/uno-component-http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno-components</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/uno-components/uno-component-kafka/pom.xml b/uno-components/uno-component-kafka/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno-components</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-components/uno-component-netty/pom.xml b/uno-components/uno-component-netty/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>uno-components</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
 
     <artifactId>uno-component-netty</artifactId>

diff --git a/uno-components/uno-component-sequential/pom.xml b/uno-components/uno-component-sequential/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno-components</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-components/uno-component-websocket/pom.xml b/uno-components/uno-component-websocket/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno-components</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-core/pom.xml b/uno-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-data/pom.xml b/uno-data/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>uno</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>uno-data</artifactId>
-    <version>1.1.6-beta.1</version>
+    <version>1.1.6</version>
     <description>
         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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

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
@@ -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
@@ -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<T> extends Serializable {
+public interface JavaType<T> extends Serializable, EqualsTo<Class<?>> {
 
     /**
      * 获取Java类型对应 class 实例
@@ -19,14 +21,6 @@ public interface JavaType<T> extends Serializable {
      */
     Class<T> 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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/uno-data/uno-data-elasticsearch/pom.xml b/uno-data/uno-data-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/uno-data/uno-data-influxdb/pom.xml b/uno-data/uno-data-influxdb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/uno-data/uno-data-mongodb/pom.xml b/uno-data/uno-data-mongodb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

diff --git a/uno-data/uno-data-neo4j/pom.xml b/uno-data/uno-data-neo4j/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

diff --git a/uno-data/uno-data-redis/pom.xml b/uno-data/uno-data-redis/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

diff --git a/uno-data/uno-data-sql/pom.xml b/uno-data/uno-data-sql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/uno-data/uno-data-test/pom.xml b/uno-data/uno-data-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>cc.allio</groupId>
         <artifactId>uno-data</artifactId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

diff --git a/uno-demo/pom.xml b/uno-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-demo/uno-websocket-demo/pom.xml b/uno-demo/uno-websocket-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno-demo</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/uno-gis/pom.xml b/uno-gis/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>uno</artifactId>
         <groupId>cc.allio</groupId>
-        <version>1.1.6-beta.1</version>
+        <version>1.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,8 +18,7 @@
         </dependency>
         <dependency>
             <groupId>cc.allio</groupId>
-            <artifactId>uno-data</artifactId>
-            <scope>provided</scope>
+            <artifactId>uno-data-api</artifactId>
         </dependency>
         <dependency>
             <groupId>cc.allio</groupId>

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
@@ -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
@@ -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<GeometryCollection>
     public Class<GeometryCollection> 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
@@ -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<Geometry> {
     public Class<Geometry> 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
@@ -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<LineString> {
     public Class<LineString> 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
@@ -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<LinearRing> {
     public Class<LinearRing> 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
@@ -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<MultiLineString> {
+
     @Override
     public Class<MultiLineString> 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
@@ -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<MultiPoint> {
     public Class<MultiPoint> getJavaType() {
         return GeometryTypes.MULTI_POINT;
     }
+
+    @Override
+    public boolean equalsTo(Class<?> other) {
+        return GeometryTypes.MULTI_POINT.isAssignableFrom(other);
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,5 @@ public boolean equalsTo(Class<?> otherJavaType) { @@
         public boolean equals(Object o) {
             return Objects.equals(this, o);
         }
     }