版本升级

jetlinks-components/elasticsearch-component/pom.xml

@@ -77,6 +77,11 @@
             <artifactId>reactor-netty</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

jetlinks-components/gateway-component/pom.xml

@@ -35,6 +35,11 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/entity/GeoRegionEntity.java

@@ -52,8 +52,12 @@ public  class GeoRegionEntity extends  GenericTreeSortSupportEntity<String> {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
         GeoRegionEntity that = (GeoRegionEntity) o;
         return Objects.equals(getId(), that.getId());
     }

pom.xml

@@ -19,16 +19,21 @@
         <spring.boot.version>2.3.11.RELEASE</spring.boot.version>
         <java.version>1.8</java.version>
         <project.build.jdk>${java.version}</project.build.jdk>
-        <hsweb.framework.version>4.0.10</hsweb.framework.version>
-        <easyorm.version>4.0.10</easyorm.version>
+        <!--<hsweb.framework.version>4.0.10</hsweb.framework.version>-->
+        <hsweb.framework.version>4.0.12</hsweb.framework.version>
+        <!--<easyorm.version>4.0.10</easyorm.version>-->
+        <easyorm.version>4.0.13-SNAPSHOT</easyorm.version>
         <hsweb.expands.version>3.0.2</hsweb.expands.version>
         <jetlinks.version>1.1.7-SNAPSHOT</jetlinks.version>
         <r2dbc.version>Arabba-SR10</r2dbc.version>
         <vertx.version>3.8.5</vertx.version>
         <netty.version>4.1.51.Final</netty.version>
         <elasticsearch.version>7.11.2</elasticsearch.version>
-        <reactor.excel.version>1.0.0</reactor.excel.version>
-        <reactor.ql.version>1.0.11</reactor.ql.version>
+        <!--<reactor.excel.version>1.0.0</reactor.excel.version>-->
+        <!--<reactor.ql.version>1.0.11</reactor.ql.version>-->
+        <!--<fastjson.version>1.2.70</fastjson.version>-->
+        <reactor.excel.version>1.0.1</reactor.excel.version>
+        <reactor.ql.version>1.0.13</reactor.ql.version>
         <fastjson.version>1.2.70</fastjson.version>
         <hutool.version>5.5.8</hutool.version>
         <jetlinks.version>1.1.7-SNAPSHOT</jetlinks.version>