修复format_time时间提取不准确的问题

Boris-code · Boris-code · commit b3e2ac1723bd · 2021-06-24T11:25:22.000+08:00
diff --git a/feapder/utils/tools.py b/feapder/utils/tools.py
@@ -1488,7 +1488,7 @@ def format_date(date, old_format="", new_format="%Y-%m-%d %H:%M:%S"):
         %S 秒（00-59）
     @param new_format: 输出的日期格式
     ---------
-    @result: 格式化后的日期，类型为字符串 如2017-4-17 3:27:12
+    @result: 格式化后的日期，类型为字符串 如2017-4-17 03:27:12
     """
     if not date:
         return ""
@@ -1629,7 +1629,8 @@ def format_time(release_time, date_format="%Y-%m-%d %H:%M:%S"):
         else:
             release_time = str(int(get_current_date("%Y")) - 1) + "-" + release_time
 
-    template = re.compile("(\d{4}-\d{1,2}-\d{1,2}) ?(\d.*)")
+    # 把日和小时粘在一起的拆开
+    template = re.compile("(\d{4}-\d{1,2}-\d{2})(\d{1,2})")
     release_time = re.sub(template, r"\1 \2", release_time)
     release_time = format_date(release_time, new_format=date_format)
 
diff --git a/tests/test_tools.py b/tests/test_tools.py
@@ -1,29 +1,16 @@
 from feapder.utils import tools
 
-times = [
-    '十',
-    '十一',
-    '二十一',
-    "二零一五年十一月三日十三点五十四分十1秒",
-        ]
-for i in times:
-    date = tools.transform_lower_num(i)
-    print(i,date)
-
-
 
 date = tools.format_time("昨天3:10")
 print(date)
-# assert date == "2021-03-15 00:00:00"
-
 
+print(tools.format_date("2017年4月17日 3时27分12秒"))
 
-date = tools.format_time("昨天 3:10")
+date = tools.format_time("昨天")
 print(date)
 
-date = tools.format_time("2021-11-5 14:18:10")
+date = tools.format_time("2021-11-05 14:18:10")
 print(date)
 
-
 date = tools.format_time("1 年前")
-print(date)
+print(date)
