Bläddra i källkod

fix: 修复checkmax bug

Marko552 3 år sedan
förälder
incheckning
efdaddd9bb

+ 2 - 4
abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/excel/ExcelInputFactory.java

@@ -165,10 +165,8 @@ public class ExcelInputFactory {
                         }
                     }
                     //调用method
-                    if (value != null) {
-                        Method method = methodCache.get(fieldName);
-                        method.invoke(t, StrUtils.filterHtml(String.valueOf(value)));
-                    }
+                    Method method = methodCache.get(fieldName);
+                    method.invoke(t, StrUtils.filterHtml(String.valueOf(value)));
                 }
                 excelPojoList.add(t);
             } catch (Exception e) {

+ 0 - 16
abi-cloud-qr-platform-common/src/main/java/com/abi/task/common/utils/StrUtils.java

@@ -26,20 +26,4 @@ public class StrUtils {
         input = input.replaceAll("\"", "");
         return input.replaceAll("\n", "<br>");
     }
-
-    /**
-     * 拼接字符串,为空就不拼
-     * @param args
-     * @return
-     */
-    public static String concat(String... args){
-        StringBuffer sb = new StringBuffer();
-        for(String s:args){
-            if(StringUtils.isNotBlank(s)){
-                sb.append(s);
-            }
-        }
-        return sb.toString();
-    }
-
 }

+ 8 - 2
pom.xml

@@ -39,8 +39,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <tomcat.embed.core.version>9.0.43</tomcat.embed.core.version>
-        <tablestore.version>5.10.3</tablestore.version>
-        <protobuf-java>2.4.1</protobuf-java>
+        <tablestore.version>5.10.6</tablestore.version>
+        <protobuf-java>3.17.3</protobuf-java>
         <commons.lang.version>2.6</commons.lang.version>
     </properties>
 
@@ -125,6 +125,12 @@
             <dependency>
                 <groupId>com.aliyun.openservices</groupId>
                 <artifactId>tablestore</artifactId>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.protobuf</groupId>
+                        <artifactId>protobuf-java</artifactId>
+                    </exclusion>
+                </exclusions>
                 <version>${tablestore.version}</version>
             </dependency>
             <dependency>