修复到期邮件发送失败的bug

dromara · Feb 2, 2024 · 332ec4b · 332ec4b
1 parent 381a8ba
commit 332ec4b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/domain_admin/service/notify_service.py b/domain_admin/service/notify_service.py
@@ -150,12 +150,13 @@ def notify_all_event():
     触发所有通知事件
     :return: int 成功数量
     """
+    # fix: TypeError: inner() takes 2 positional arguments but 3 were given
     rows = NotifyModel.select().where(
         NotifyModel.status == True,
-        NotifyModel.event_id.in_(
+        NotifyModel.event_id.in_([
             EventEnum.SSL_CERT_EXPIRE,
             EventEnum.DOMAIN_EXPIRE
-        )
+        ])
     )
 
     success = 0

diff --git a/domain_admin/utils/datetime_util.py b/domain_admin/utils/datetime_util.py
@@ -128,7 +128,7 @@ def microsecond_for_human(value):
         seconds, value = divmod(value, SECOND)
         lst.append(str(seconds) + 's')
 
-    if value >= 0:
+    if value > 0:
         lst.append(str(value) + 'ms')
 
     return ' '.join(lst)

diff --git a/tests/model/domain_info_model_test.py b/tests/model/domain_info_model_test.py
@@ -27,3 +27,12 @@ def test_order(self):
         ).order_by(SQL("`create_time` desc")))
 
         # ('SELECT `t1`.`id`, `t1`.`create_time` FROM `tb_domain_info` AS `t1` ORDER BY `create_time` desc', [])
+
+    def test_in(self):
+        rows = list(DomainInfoModel.select(
+            DomainInfoModel.id, DomainInfoModel.create_time
+        ).where(
+            DomainInfoModel.id.in_([1, 2, 3])
+        ))
+
+        # ('SELECT `t1`.`id`, `t1`.`create_time` FROM `tb_domain_info` AS `t1` WHERE (`t1`.`id` IN (%s, %s, %s))', [1, 2, 3])