fix: 修复正则校验异常问题。

guzijian
1 parent 32268d55
Showing 1 changed file with 20 additions and 9 deletions
Bsth-admin/src/main/java/com/ruoyi/service/ReportService.java
@@ -357,7 +357,7 @@ public class ReportService {
             return Result.ERROR(ResultCode.CODE_401, "X-TOKEN-AUTHORIZATION value error");
         }
         if (!validateDayDate) {
-            return Result.ERROR(ResultCode.CODE_400, "Parameter format error");
+            return Result.ERROR(ResultCode.CODE_400, "Date parameter format error");
         }
         ReportViewRequestVo vo = new ReportViewRequestVo();
         vo.setDate(date);
@@ -373,13 +373,24 @@ public class ReportService {
      * yyyy-MM 格式的正则表达式
      */
     public static boolean validateDayDate(String input) {
-        String regex = "(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|\"+\n" +
-                "\"((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|\"+\n" +
-                "\"((0[48]|[2468][048]|[3579][26])00))-02-29)$";
-
-        Pattern pattern = Pattern.compile(regex);
-        Matcher matcher = pattern.matcher(input);
-
-        return matcher.matches();
+        String datePattern1 = "\\d{4}-\\d{2}-\\d{2}";
+        String datePattern2 = "^((\\d{2}(([02468][048])|([13579][26]))"
+                + "[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|"
+                + "(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?"
+                + "((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?("
+                + "(((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?"
+                + "((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))";
+        if ((input != null)) {
+            Pattern pattern = Pattern.compile(datePattern1);
+            Matcher match = pattern.matcher(input);
+            if (match.matches()) {
+                pattern = Pattern.compile(datePattern2);
+                match = pattern.matcher(input);
+                return match.matches();
+            } else {
+                return false;
+            }
+        }
+        return false;
     }
 }