fix

dromara · Apr 28, 2023 · 3d99956 · 3d99956
1 parent a090ff3
commit 3d99956
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## 更新日志
+- v1.2.14(2023-04-28)
+    - 修复：邮件正文字段空白的问题
 
 - v1.2.13(2023-04-26)
     - 新增：支持内网用户自己设置域名过期时间、证书过期时间

diff --git a/domain_admin/enums/version_enum.py b/domain_admin/enums/version_enum.py
@@ -54,3 +54,5 @@ class VersionEnum(object):
     Version_1212 = '1.2.12'
 
     Version_1213 = '1.2.13'
+
+    Version_1214 = '1.2.14'
diff --git a/domain_admin/service/domain_service.py b/domain_admin/service/domain_service.py
@@ -258,6 +258,8 @@ def get_domain_info_list(user_id=None):
         extra_attrs=[
             'start_date',
             'expire_date',
+            'real_time_domain_expire_days',
+            'real_time_expire_days',
             # 'expire_days',
         ]
     ), query))

diff --git a/domain_admin/templates/domain-cert-email.html b/domain_admin/templates/domain-cert-email.html
@@ -29,13 +29,21 @@
                     <a href="{{ item.domain }}" target="_blank">{{ item.domain }}</a>
                 </td>
 
-                <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;">
-                    {{ item.real_time_domain_expire_days }}
-                </td>
+                {% if item.real_time_domain_expire_days %}
+                    {% if item.real_time_domain_expire_days <= 7 %}
+                        <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;color: #F56C6C;">{{ item.real_time_domain_expire_days }}</td>
+                    {% elif item.real_time_domain_expire_days <= 30 %}
+                        <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;color: #E6A23C;">{{ item.real_time_domain_expire_days }}</td>
+                    {% else %}
+                        <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;color: #67C23A;">{{ item.real_time_domain_expire_days }}</td>
+                    {% endif %}
+                {% else %}
+                    <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;color: #909399;">未知</td>
+                {% endif %}
 
 <!--              <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;">{{ item.start_date | default('-') }}</td>-->
 <!--              <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;">{{ item.expire_date | default('-')  }}</td>-->
-                {% if item.real_time_expire_days%}
+                {% if item.real_time_expire_days %}
                     {% if item.real_time_expire_days <= 7 %}
                         <td style="border: 1px solid #eeeeee;border-collapse: collapse;line-height: 30px; padding: 0 15px;color: #F56C6C;">{{ item.real_time_expire_days }}</td>
                     {% elif item.real_time_expire_days <= 30 %}

diff --git a/domain_admin/version.py b/domain_admin/version.py
@@ -2,4 +2,4 @@
 """
 版本号
 """
-VERSION = '1.2.13'
+VERSION = '1.2.14'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,3 +54,5 @@ class VersionEnum(object):
		Version_1212 = '1.2.12'

		Version_1213 = '1.2.13'

		Version_1214 = '1.2.14'