Merge pull request #130 from pengpan/dev

v1.4.1

Author: pengpan

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.pengpan</groupId>
     <artifactId>91160-cli</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/com/github/pengpan/service/AbstractTicketService.java

@@ -16,7 +16,10 @@
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -57,12 +60,13 @@ protected long getMaxBrushDays(LocalDate brushStartDate,Config config) {
                 .filter(list -> list.size() > 1)
                 .map(list -> list.get(1))
                 .map(Element::text)
+                .map(x -> x.replaceAll("\\s+", ""))
                 .orElseGet(String::new);
 
         long maxBrushDays = 7;
         if (StrUtil.isNotBlank(date)) {
             LocalDateTime startTime = brushStartDate.atStartOfDay();
-            LocalDateTime endTime = LocalDateTimeUtil.parse(StrUtil.removeAll(date, " "), DatePattern.CHINESE_DATE_PATTERN);
+            LocalDateTime endTime = LocalDateTimeUtil.parse(date, DatePattern.CHINESE_DATE_PATTERN);
             maxBrushDays = LocalDateTimeUtil.between(startTime, endTime).toDays();
         }