zhouhao 3 年之前
父节点
当前提交
87a922687f

+ 9 - 2
jetlinks-components/io-component/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
         </dependency>
         </dependency>
 
 
         <dependency>
         <dependency>
@@ -28,8 +28,15 @@
         <dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
             <artifactId>easyexcel</artifactId>
-            <version>2.1.2</version>
+            <version>3.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.poi</groupId>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         </dependency>
+
         <dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webflux</artifactId>
             <artifactId>spring-webflux</artifactId>

+ 6 - 0
jetlinks-components/network-component/tcp-component/pom.xml

@@ -30,6 +30,12 @@
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.9</version>
+        </dependency>
+
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>

+ 5 - 3
jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/parser/strateies/DelimitedPayloadParserBuilder.java

@@ -1,7 +1,7 @@
 package org.jetlinks.community.network.tcp.parser.strateies;
 package org.jetlinks.community.network.tcp.parser.strateies;
 
 
 import io.vertx.core.parsetools.RecordParser;
 import io.vertx.core.parsetools.RecordParser;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.jetlinks.community.ValueObject;
 import org.jetlinks.community.ValueObject;
 import org.jetlinks.community.network.tcp.parser.PayloadParserType;
 import org.jetlinks.community.network.tcp.parser.PayloadParserType;
 
 
@@ -14,8 +14,10 @@ public class DelimitedPayloadParserBuilder extends VertxPayloadParserBuilder {
     @Override
     @Override
     protected RecordParser createParser(ValueObject config) {
     protected RecordParser createParser(ValueObject config) {
 
 
-        return RecordParser.newDelimited(StringEscapeUtils.unescapeJava(config.getString("delimited")
-                .orElseThrow(() -> new IllegalArgumentException("delimited can not be null"))));
+        return RecordParser.newDelimited(StringEscapeUtils
+                                             .unescapeJava(config
+                                                               .getString("delimited")
+                                                               .orElseThrow(() -> new IllegalArgumentException("delimited can not be null"))));
     }
     }
 
 
 
 

+ 1 - 1
pom.xml

@@ -27,7 +27,7 @@
         <vertx.version>4.2.3</vertx.version>
         <vertx.version>4.2.3</vertx.version>
         <netty.version>4.1.73.Final</netty.version>
         <netty.version>4.1.73.Final</netty.version>
         <elasticsearch.version>7.11.2</elasticsearch.version>
         <elasticsearch.version>7.11.2</elasticsearch.version>
-        <reactor.excel.version>1.0.1</reactor.excel.version>
+        <reactor.excel.version>1.0.3-SNAPSHOT</reactor.excel.version>
         <reactor.ql.version>1.0.13</reactor.ql.version>
         <reactor.ql.version>1.0.13</reactor.ql.version>
         <fastjson.version>1.2.83</fastjson.version>
         <fastjson.version>1.2.83</fastjson.version>
         <log4j.version>2.17.1</log4j.version>
         <log4j.version>2.17.1</log4j.version>