From ea0df42063ea7814883a173eadde2913423e88ba Mon Sep 17 00:00:00 2001
From: Ying <coolsec@foxmail.com>
Date: Wed, 2 Aug 2023 18:16:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/conf/tpl/captcha.tpl  | 46 +++++++++++++++++-----------------
 extend/conf/tpl/forgot.tpl   | 47 +++++++++++++++++------------------
 extend/conf/tpl/register.tpl | 48 ++++++++++++++++++------------------
 3 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/extend/conf/tpl/captcha.tpl b/extend/conf/tpl/captcha.tpl
index e484bb5..1dbf952 100644
--- a/extend/conf/tpl/captcha.tpl
+++ b/extend/conf/tpl/captcha.tpl
@@ -1,25 +1,25 @@
 <div style="background-color:#ECECEC; padding: 35px;">
-  <table cellpadding="0" align="center" style="width: 80%; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;">
-    <tbody>
-      <tr>
-        <th valign="middle" style="height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #C46200; background-color: #e01b3c; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;">
-          <font face="微软雅黑" size="5" style="color: rgb(255, 255, 255); ">{site_name}</font></th>
-      </tr>
-      <tr>
-        <td>
-          <div style="padding:25px 35px 40px; background-color:#fff;">
-            <h2 style="margin: 5px 0px; ">
-              <font color="#333333" style="line-height: 20px; ">
-                <font style="line-height: 22px; " size="4">亲爱的用户：</font></font>
-            </h2>
-            <p style="font-size:14px;">
-              验证码为 {code}, 10分钟有效<br/>
-              如果不是您自己的操作，请忽略！
-			</p><br/>
-            <p align="right" style="font-size:14px;">{site_name} 官方团队</p>
-            <p align="right" style="font-size:14px;">{time}</p></div>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+    <table cellpadding="0" align="center"
+           style="width: 80%; margin: 0px auto; text-align: left; position: relative; border-radius: 5px;font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background: #fff initial initial initial initial;">
+        <tbody>
+        <tr>
+            <th
+                style="height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #C46200; background-color: #e01b3c; border-radius: 5px 5px 0px 0px;">
+                <span style="color: rgb(255, 255, 255);  font-family: 微软雅黑; font-size: large; ">{site_name}</span></th>
+        </tr>
+        <tr>
+            <td>
+                <div style="padding:25px 35px 40px; background-color:#fff;">
+                    <h2 style="margin: 5px 0px; ">
+                        <span style="line-height: 20px;  color: #333333; ">
+                            <span style="line-height: 22px;  font-size: medium; ">亲爱的用户：</span></span>
+                    </h2>
+                    <p style="font-size:14px;">验证码为 {code}, 10分钟有效</p>
+                    <p style="font-size:14px;">如果您没有进行此操作，请忽略此邮件。</p>
+                    <p align="right" style="font-size:14px;">{site_name} 官方团队</p>
+                    <p align="right" style="font-size:14px;">{time}</p></div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
 </div>
\ No newline at end of file
diff --git a/extend/conf/tpl/forgot.tpl b/extend/conf/tpl/forgot.tpl
index 0241599..34edc5c 100644
--- a/extend/conf/tpl/forgot.tpl
+++ b/extend/conf/tpl/forgot.tpl
@@ -1,26 +1,25 @@
 <div style="background-color:#ECECEC; padding: 35px;">
-  <table cellpadding="0" align="center" style="width: 80%; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;">
-    <tbody>
-      <tr>
-        <th valign="middle" style="height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #C46200; background-color: #e01b3c; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;">
-          <font face="微软雅黑" size="5" style="color: rgb(255, 255, 255); ">{site_name}</font></th>
-      </tr>
-      <tr>
-        <td>
-          <div style="padding:25px 35px 40px; background-color:#fff;">
-            <h2 style="margin: 5px 0px; ">
-              <font color="#333333" style="line-height: 20px; ">
-                <font style="line-height: 22px; " size="4">亲爱的用户：</font></font>
-            </h2>
-            <p style="font-size:14px;">
-
-            	找回密码链接请点击：{url} 10分钟有效<br/>
-            	如果您有什么疑问可以联系管理员，Email: {email}。
-			</p><br/>
-            <p align="right" style="font-size:14px;">{site_name} 官方团队</p>
-            <p align="right" style="font-size:14px;">{time}</p></div>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+    <table cellpadding="0" align="center"
+           style="width: 80%; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;">
+        <tbody>
+        <tr>
+            <th valign="middle"
+                style="height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #C46200; background-color: #e01b3c; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;">
+                <span style="color: rgb(255, 255, 255);  font-family: 微软雅黑; font-size: large; ">{site_name}</span></th>
+        </tr>
+        <tr>
+            <td>
+                <div style="padding:25px 35px 40px; background-color:#fff;">
+                    <h2 style="margin: 5px 0px; ">
+                        <span style="line-height: 20px;  color: #333333; ">
+                            <span style="line-height: 22px;  font-size: medium; ">亲爱的用户：</span></span>
+                    </h2>
+                    <p style="font-size:14px;">找回密码链接请点击：{url} 10分钟有效</p>
+                    <p>如果您有什么疑问可以联系管理员，Email: {email}。</p>
+                    <p align="right" style="font-size:14px;">{site_name} 官方团队</p>
+                    <p align="right" style="font-size:14px;">{time}</p></div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
 </div>
\ No newline at end of file
diff --git a/extend/conf/tpl/register.tpl b/extend/conf/tpl/register.tpl
index e137451..7b472c4 100644
--- a/extend/conf/tpl/register.tpl
+++ b/extend/conf/tpl/register.tpl
@@ -1,26 +1,26 @@
 <div style="background-color:#ECECEC; padding: 35px;">
-  <table cellpadding="0" align="center" style="width: 80%; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;">
-    <tbody>
-      <tr>
-        <th valign="middle" style="height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #C46200; background-color: #e01b3c; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;">
-          <font face="微软雅黑" size="5" style="color: rgb(255, 255, 255); ">{site_name}</font></th>
-      </tr>
-      <tr>
-        <td>
-          <div style="padding:25px 35px 40px; background-color:#fff;">
-            <h2 style="margin: 5px 0px; ">
-              <font color="#333333" style="line-height: 20px; ">
-                <font style="line-height: 22px; " size="5">亲爱的 {username}：</font></font>
-            </h2>
-            <p style="font-size:14px;">
-            	感谢您加入{site_name}！ 请您在发表言论时，遵守当地法律法规。<br/>
-            	请点击链接激活：{url} 10分钟有效<br/>
-            	如果您有什么疑问可以联系管理员，Email: {email}。
-			</p><br/>
-            <p align="right" style="font-size:14px;">{site_name} 官方团队</p>
-            <p align="right" style="font-size:14px;">{time}</p></div>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+    <table cellpadding="0" align="center"
+           style="width: 80%; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;">
+        <tbody>
+        <tr>
+            <th valign="middle"
+                style="height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #C46200; background-color: #e01b3c; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;">
+                <font face="微软雅黑" size="5" style="color: rgb(255, 255, 255); ">{site_name}</font></th>
+        </tr>
+        <tr>
+            <td>
+                <div style="padding:25px 35px 40px; background-color:#fff;">
+                    <h2 style="margin: 5px 0px; ">
+                        <span style="line-height: 20px;  color: #333333; ">
+                            <span style="line-height: 22px;  font-size: large; ">亲爱的 {nickname}：</span></span>
+                    </h2>
+                    <p style="font-size:14px;">感谢您加入{site_name}！ 请您在发表言论时，遵守当地法律法规。</p>
+                    <p style="font-size:14px;"> 请点击链接激活：{url} 10分钟有效</p>
+                    <p style="font-size:14px;"> 如果您有什么疑问可以联系管理员，Email: {email}。</p>
+                    <p align="right" style="font-size:14px;">{site_name} 官方团队</p>
+                    <p align="right" style="font-size:14px;">{time}</p></div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
 </div>
\ No newline at end of file