diff --git a/src/main/java/com/gxwebsoft/common/system/util/EmailTemplateUtil.java b/src/main/java/com/gxwebsoft/common/system/util/EmailTemplateUtil.java
index 10931b6..c96c339 100644
--- a/src/main/java/com/gxwebsoft/common/system/util/EmailTemplateUtil.java
+++ b/src/main/java/com/gxwebsoft/common/system/util/EmailTemplateUtil.java
@@ -37,7 +37,9 @@ public class EmailTemplateUtil {
             data.put("username", username);
             data.put("phone", phone);
             data.put("password", password);
-            data.put("email", email);
+            if (email != null && !email.trim().isEmpty()) {
+                data.put("email", email);
+            }
 
             emailRecordService.sendHtmlEmail(title, "register-success.html", data, new String[]{email});
         } catch (Exception e) {
@@ -62,8 +64,10 @@ public class EmailTemplateUtil {
             Map<String, Object> data = new HashMap<>();
             data.put("username", username);
             data.put("phone", phone);
-            data.put("newPassword", newPassword);
             data.put("resetTime", DateUtil.now());
+            if (newPassword != null && !newPassword.trim().isEmpty()) {
+                data.put("newPassword", newPassword);
+            }
 
             emailRecordService.sendHtmlEmail(title, "password-reset.html", data, new String[]{email});
         } catch (Exception e) {
@@ -93,16 +97,16 @@ public class EmailTemplateUtil {
             data.put("content", content);
             data.put("sendTime", DateUtil.now());
 
-            if (greeting != null) {
+            if (greeting != null && !greeting.trim().isEmpty()) {
                 data.put("greeting", greeting);
             }
-            if (infoMessage != null) {
+            if (infoMessage != null && !infoMessage.trim().isEmpty()) {
                 data.put("infoMessage", infoMessage);
             }
-            if (actionUrl != null) {
+            if (actionUrl != null && !actionUrl.trim().isEmpty()) {
                 data.put("actionUrl", actionUrl);
             }
-            if (actionText != null) {
+            if (actionText != null && !actionText.trim().isEmpty()) {
                 data.put("actionText", actionText);
             }
 
diff --git a/src/main/resources/templates/notification.html b/src/main/resources/templates/notification.html
index 083d0ba..48f19f5 100644
--- a/src/main/resources/templates/notification.html
+++ b/src/main/resources/templates/notification.html
@@ -10,41 +10,41 @@
             padding: 0;
             box-sizing: border-box;
         }
-        
+
         body {
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif;
             line-height: 1.6;
             color: #333;
             background-color: #f5f5f5;
         }
-        
+
         .email-container {
             max-width: 600px;
             margin: 0 auto;
             background-color: #ffffff;
             box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
         }
-        
+
         .header {
             background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
             padding: 40px 30px;
             text-align: center;
             color: white;
         }
-        
+
         .logo {
             font-size: 32px;
             font-weight: bold;
             margin-bottom: 10px;
             letter-spacing: 2px;
         }
-        
+
         .header-subtitle {
             font-size: 16px;
             opacity: 0.9;
             margin-bottom: 20px;
         }
-        
+
         .notification-icon {
             width: 60px;
             height: 60px;
@@ -56,25 +56,25 @@
             justify-content: center;
             font-size: 30px;
         }
-        
+
         .content {
             padding: 40px 30px;
         }
-        
+
         .title {
             font-size: 24px;
             color: #333;
             margin-bottom: 20px;
             text-align: center;
         }
-        
+
         .message {
             font-size: 16px;
             color: #666;
             margin-bottom: 30px;
             line-height: 1.8;
         }
-        
+
         .notification-content {
             background-color: #f8f9fa;
             border-radius: 8px;
@@ -82,23 +82,23 @@
             margin: 30px 0;
             border-left: 4px solid #4facfe;
         }
-        
+
         .notification-content h3 {
             color: #333;
             margin-bottom: 15px;
             font-size: 18px;
         }
-        
+
         .notification-body {
             color: #555;
             line-height: 1.8;
         }
-        
+
         .cta-section {
             text-align: center;
             margin: 40px 0;
         }
-        
+
         .cta-button {
             display: inline-block;
             background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
@@ -111,12 +111,12 @@
             transition: transform 0.2s ease;
             box-shadow: 0 4px 15px rgba(79, 172, 254, 0.4);
         }
-        
+
         .cta-button:hover {
             transform: translateY(-2px);
             box-shadow: 0 6px 20px rgba(79, 172, 254, 0.6);
         }
-        
+
         .info-box {
             background-color: #e3f2fd;
             border: 1px solid #bbdefb;
@@ -125,37 +125,37 @@
             margin: 20px 0;
             color: #1565c0;
         }
-        
+
         .info-box strong {
             color: #0d47a1;
         }
-        
+
         .footer {
             background-color: #2c3e50;
             color: #ecf0f1;
             padding: 30px;
             text-align: center;
         }
-        
+
         .footer-content {
             margin-bottom: 20px;
         }
-        
+
         .footer-links {
             margin: 20px 0;
         }
-        
+
         .footer-links a {
             color: #3498db;
             text-decoration: none;
             margin: 0 15px;
             font-size: 14px;
         }
-        
+
         .footer-links a:hover {
             text-decoration: underline;
         }
-        
+
         .copyright {
             font-size: 12px;
             color: #95a5a6;
@@ -163,7 +163,7 @@
             padding-top: 20px;
             border-top: 1px solid #34495e;
         }
-        
+
         .timestamp {
             text-align: right;
             font-size: 12px;
@@ -172,21 +172,21 @@
             padding-top: 15px;
             border-top: 1px solid #eee;
         }
-        
+
         @media (max-width: 600px) {
             .email-container {
                 margin: 0;
                 box-shadow: none;
             }
-            
+
             .header, .content, .footer {
                 padding: 20px;
             }
-            
+
             .logo {
                 font-size: 24px;
             }
-            
+
             .title {
                 font-size: 20px;
             }
@@ -201,14 +201,14 @@
             <div class="header-subtitle">企业级数字化解决方案</div>
             <div class="notification-icon">📢</div>
         </div>
-        
+
         <!-- Content -->
         <div class="content">
             <h1 class="title">${title!'系统通知'}</h1>
             <p class="message">
                 ${greeting!'您好！'}我们有一条重要通知需要告知您，请查看以下详细信息。
             </p>
-            
+
             <!-- Notification Content -->
             <div class="notification-content">
                 <h3>📋 通知详情</h3>
@@ -216,40 +216,40 @@
                     ${content!'这是一条系统通知消息。'}
                 </div>
             </div>
-            
+
             <!-- Info Box -->
-            <% if(infoMessage!) { %>
+            <% if(has(infoMessage)) { %>
             <div class="info-box">
                 <strong>ℹ️ 温馨提示：</strong> ${infoMessage!}
             </div>
             <% } %>
-            
+
             <!-- CTA Button -->
-            <% if(actionUrl!) { %>
+            <% if(has(actionUrl)) { %>
             <div class="cta-section">
                 <a href="${actionUrl!}" class="cta-button">${actionText!'查看详情'}</a>
             </div>
             <% } %>
-            
+
             <!-- Timestamp -->
             <div class="timestamp">
                 发送时间：${sendTime!}
             </div>
         </div>
-        
+
         <!-- Footer -->
         <div class="footer">
             <div class="footer-content">
                 <strong>南宁网宿信息科技有限公司</strong><br>
                 专业的企业数字化转型服务商
             </div>
-            
+
             <div class="footer-links">
                 <a href="https://www.gxwebsoft.com">官方网站</a>
                 <a href="https://www.gxwebsoft.com/help">帮助中心</a>
                 <a href="https://www.gxwebsoft.com/contact">联系我们</a>
             </div>
-            
+
             <div class="copyright">
                 © 2024 南宁网宿信息科技有限公司 版权所有<br>
                 如有疑问，请联系客服：170083662@qq.com
diff --git a/src/main/resources/templates/password-reset.html b/src/main/resources/templates/password-reset.html
index 830c77d..c1b0262 100644
--- a/src/main/resources/templates/password-reset.html
+++ b/src/main/resources/templates/password-reset.html
@@ -10,41 +10,41 @@
             padding: 0;
             box-sizing: border-box;
         }
-        
+
         body {
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif;
             line-height: 1.6;
             color: #333;
             background-color: #f5f5f5;
         }
-        
+
         .email-container {
             max-width: 600px;
             margin: 0 auto;
             background-color: #ffffff;
             box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
         }
-        
+
         .header {
             background: linear-gradient(135deg, #ff6b6b 0%, #ee5a24 100%);
             padding: 40px 30px;
             text-align: center;
             color: white;
         }
-        
+
         .logo {
             font-size: 32px;
             font-weight: bold;
             margin-bottom: 10px;
             letter-spacing: 2px;
         }
-        
+
         .header-subtitle {
             font-size: 16px;
             opacity: 0.9;
             margin-bottom: 20px;
         }
-        
+
         .warning-icon {
             width: 60px;
             height: 60px;
@@ -56,18 +56,18 @@
             justify-content: center;
             font-size: 30px;
         }
-        
+
         .content {
             padding: 40px 30px;
         }
-        
+
         .title {
             font-size: 24px;
             color: #333;
             margin-bottom: 20px;
             text-align: center;
         }
-        
+
         .message {
             font-size: 16px;
             color: #666;
@@ -75,7 +75,7 @@
             text-align: center;
             line-height: 1.8;
         }
-        
+
         .reset-info {
             background-color: #fff5f5;
             border-radius: 8px;
@@ -83,13 +83,13 @@
             margin: 30px 0;
             border-left: 4px solid #ff6b6b;
         }
-        
+
         .reset-info h3 {
             color: #333;
             margin-bottom: 15px;
             font-size: 18px;
         }
-        
+
         .info-item {
             display: flex;
             justify-content: space-between;
@@ -97,17 +97,17 @@
             padding: 10px 0;
             border-bottom: 1px solid #fee;
         }
-        
+
         .info-item:last-child {
             border-bottom: none;
         }
-        
+
         .info-label {
             font-weight: 600;
             color: #555;
             min-width: 80px;
         }
-        
+
         .info-value {
             color: #333;
             font-family: 'Courier New', monospace;
@@ -116,12 +116,12 @@
             border-radius: 4px;
             border: 1px solid #ddd;
         }
-        
+
         .cta-section {
             text-align: center;
             margin: 40px 0;
         }
-        
+
         .cta-button {
             display: inline-block;
             background: linear-gradient(135deg, #ff6b6b 0%, #ee5a24 100%);
@@ -134,69 +134,69 @@
             transition: transform 0.2s ease;
             box-shadow: 0 4px 15px rgba(255, 107, 107, 0.4);
         }
-        
+
         .cta-button:hover {
             transform: translateY(-2px);
             box-shadow: 0 6px 20px rgba(255, 107, 107, 0.6);
         }
-        
+
         .security-tips {
             background-color: #f8f9fa;
             border-radius: 8px;
             padding: 25px;
             margin: 30px 0;
         }
-        
+
         .security-tips h3 {
             color: #333;
             margin-bottom: 15px;
             font-size: 18px;
         }
-        
+
         .security-tips ul {
             list-style: none;
             padding: 0;
         }
-        
+
         .security-tips li {
             padding: 8px 0;
             color: #666;
             position: relative;
             padding-left: 25px;
         }
-        
+
         .security-tips li:before {
             content: "🔒";
             position: absolute;
             left: 0;
         }
-        
+
         .footer {
             background-color: #2c3e50;
             color: #ecf0f1;
             padding: 30px;
             text-align: center;
         }
-        
+
         .footer-content {
             margin-bottom: 20px;
         }
-        
+
         .footer-links {
             margin: 20px 0;
         }
-        
+
         .footer-links a {
             color: #3498db;
             text-decoration: none;
             margin: 0 15px;
             font-size: 14px;
         }
-        
+
         .footer-links a:hover {
             text-decoration: underline;
         }
-        
+
         .copyright {
             font-size: 12px;
             color: #95a5a6;
@@ -204,7 +204,7 @@
             padding-top: 20px;
             border-top: 1px solid #34495e;
         }
-        
+
         .warning-notice {
             background-color: #fff3cd;
             border: 1px solid #ffeaa7;
@@ -213,25 +213,25 @@
             margin: 20px 0;
             color: #856404;
         }
-        
+
         .warning-notice strong {
             color: #533f03;
         }
-        
+
         @media (max-width: 600px) {
             .email-container {
                 margin: 0;
                 box-shadow: none;
             }
-            
+
             .header, .content, .footer {
                 padding: 20px;
             }
-            
+
             .logo {
                 font-size: 24px;
             }
-            
+
             .title {
                 font-size: 20px;
             }
@@ -246,14 +246,14 @@
             <div class="header-subtitle">企业级数字化解决方案</div>
             <div class="warning-icon">⚠️</div>
         </div>
-        
+
         <!-- Content -->
         <div class="content">
             <h1 class="title">密码重置通知</h1>
             <p class="message">
                 您好！我们收到了您的密码重置请求。为了保障您的账户安全，请查看以下信息。
             </p>
-            
+
             <!-- Reset Information -->
             <div class="reset-info">
                 <h3>🔑 重置信息</h3>
@@ -269,24 +269,24 @@
                     <span class="info-label">重置时间：</span>
                     <span class="info-value">${resetTime!}</span>
                 </div>
-                <% if(newPassword!) { %>
+                <% if(has(newPassword)) { %>
                 <div class="info-item">
                     <span class="info-label">新密码：</span>
                     <span class="info-value">${newPassword!}</span>
                 </div>
                 <% } %>
             </div>
-            
+
             <!-- Warning Notice -->
             <div class="warning-notice">
                 <strong>⚠️ 重要提醒：</strong> 如果这不是您本人的操作，请立即联系客服并修改密码！
             </div>
-            
+
             <!-- CTA Button -->
             <div class="cta-section">
-                <a href="https://www.gxwebsoft.com/login" class="cta-button">立即登录</a>
+                <a href="https://websoft.top/login" class="cta-button">立即登录</a>
             </div>
-            
+
             <!-- Security Tips -->
             <div class="security-tips">
                 <h3>🛡️ 安全建议</h3>
@@ -299,23 +299,22 @@
                 </ul>
             </div>
         </div>
-        
+
         <!-- Footer -->
         <div class="footer">
             <div class="footer-content">
-                <strong>南宁网宿信息科技有限公司</strong><br>
+                <strong>网宿软件</strong><br>
                 专业的企业数字化转型服务商
             </div>
-            
+
             <div class="footer-links">
-                <a href="https://www.gxwebsoft.com">官方网站</a>
-                <a href="https://www.gxwebsoft.com/help">帮助中心</a>
-                <a href="https://www.gxwebsoft.com/contact">联系我们</a>
+                <a href="https://websoft.top">官方网站</a>
+                <a href="https://websoft.top/help">帮助中心</a>
+                <a href="https://websoft.top/contact">联系我们</a>
             </div>
-            
+
             <div class="copyright">
-                © 2024 南宁网宿信息科技有限公司 版权所有<br>
-                如有疑问，请联系客服：170083662@qq.com
+                © 2025 WebSoft Inc.
             </div>
         </div>
     </div>
diff --git a/src/main/resources/templates/register-success.html b/src/main/resources/templates/register-success.html
index 718aa00..42b2bed 100644
--- a/src/main/resources/templates/register-success.html
+++ b/src/main/resources/templates/register-success.html
@@ -10,41 +10,41 @@
             padding: 0;
             box-sizing: border-box;
         }
-        
+
         body {
             font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif;
             line-height: 1.6;
             color: #333;
             background-color: #f5f5f5;
         }
-        
+
         .email-container {
             max-width: 600px;
             margin: 0 auto;
             background-color: #ffffff;
             box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
         }
-        
+
         .header {
             background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
             padding: 40px 30px;
             text-align: center;
             color: white;
         }
-        
+
         .logo {
             font-size: 32px;
             font-weight: bold;
             margin-bottom: 10px;
             letter-spacing: 2px;
         }
-        
+
         .header-subtitle {
             font-size: 16px;
             opacity: 0.9;
             margin-bottom: 20px;
         }
-        
+
         .success-icon {
             width: 60px;
             height: 60px;
@@ -56,18 +56,18 @@
             justify-content: center;
             font-size: 30px;
         }
-        
+
         .content {
             padding: 40px 30px;
         }
-        
+
         .welcome-title {
             font-size: 24px;
             color: #333;
             margin-bottom: 20px;
             text-align: center;
         }
-        
+
         .welcome-message {
             font-size: 16px;
             color: #666;
@@ -75,7 +75,7 @@
             text-align: center;
             line-height: 1.8;
         }
-        
+
         .account-info {
             background-color: #f8f9fa;
             border-radius: 8px;
@@ -83,13 +83,13 @@
             margin: 30px 0;
             border-left: 4px solid #667eea;
         }
-        
+
         .account-info h3 {
             color: #333;
             margin-bottom: 15px;
             font-size: 18px;
         }
-        
+
         .info-item {
             display: flex;
             justify-content: space-between;
@@ -97,17 +97,17 @@
             padding: 10px 0;
             border-bottom: 1px solid #e9ecef;
         }
-        
+
         .info-item:last-child {
             border-bottom: none;
         }
-        
+
         .info-label {
             font-weight: 600;
             color: #555;
             min-width: 80px;
         }
-        
+
         .info-value {
             color: #333;
             font-family: 'Courier New', monospace;
@@ -116,12 +116,12 @@
             border-radius: 4px;
             border: 1px solid #ddd;
         }
-        
+
         .cta-section {
             text-align: center;
             margin: 40px 0;
         }
-        
+
         .cta-button {
             display: inline-block;
             background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
@@ -134,78 +134,78 @@
             transition: transform 0.2s ease;
             box-shadow: 0 4px 15px rgba(102, 126, 234, 0.4);
         }
-        
+
         .cta-button:hover {
             transform: translateY(-2px);
             box-shadow: 0 6px 20px rgba(102, 126, 234, 0.6);
         }
-        
+
         .features {
             margin: 40px 0;
         }
-        
+
         .features h3 {
             text-align: center;
             margin-bottom: 25px;
             color: #333;
         }
-        
+
         .feature-grid {
             display: grid;
             grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
             gap: 20px;
         }
-        
+
         .feature-item {
             text-align: center;
             padding: 20px;
             background-color: #f8f9fa;
             border-radius: 8px;
         }
-        
+
         .feature-icon {
             font-size: 24px;
             margin-bottom: 10px;
         }
-        
+
         .feature-title {
             font-size: 14px;
             font-weight: 600;
             color: #333;
             margin-bottom: 5px;
         }
-        
+
         .feature-desc {
             font-size: 12px;
             color: #666;
         }
-        
+
         .footer {
             background-color: #2c3e50;
             color: #ecf0f1;
             padding: 30px;
             text-align: center;
         }
-        
+
         .footer-content {
             margin-bottom: 20px;
         }
-        
+
         .footer-links {
             margin: 20px 0;
         }
-        
+
         .footer-links a {
             color: #3498db;
             text-decoration: none;
             margin: 0 15px;
             font-size: 14px;
         }
-        
+
         .footer-links a:hover {
             text-decoration: underline;
         }
-        
+
         .copyright {
             font-size: 12px;
             color: #95a5a6;
@@ -213,7 +213,7 @@
             padding-top: 20px;
             border-top: 1px solid #34495e;
         }
-        
+
         .security-notice {
             background-color: #fff3cd;
             border: 1px solid #ffeaa7;
@@ -222,29 +222,29 @@
             margin: 20px 0;
             color: #856404;
         }
-        
+
         .security-notice strong {
             color: #533f03;
         }
-        
+
         @media (max-width: 600px) {
             .email-container {
                 margin: 0;
                 box-shadow: none;
             }
-            
+
             .header, .content, .footer {
                 padding: 20px;
             }
-            
+
             .logo {
                 font-size: 24px;
             }
-            
+
             .welcome-title {
                 font-size: 20px;
             }
-            
+
             .feature-grid {
                 grid-template-columns: 1fr;
             }
@@ -259,14 +259,14 @@
             <div class="header-subtitle">企业级数字化解决方案</div>
             <div class="success-icon">✓</div>
         </div>
-        
+
         <!-- Content -->
         <div class="content">
             <h1 class="welcome-title">恭喜！账号注册成功</h1>
             <p class="welcome-message">
                 欢迎加入WebSoft大家庭！您的账号已成功创建，现在可以开始体验我们的企业级服务了。
             </p>
-            
+
             <!-- Account Information -->
             <div class="account-info">
                 <h3>📋 您的账号信息</h3>
@@ -282,24 +282,24 @@
                     <span class="info-label">登录密码：</span>
                     <span class="info-value">${password!}</span>
                 </div>
-                <% if(email!) { %>
+                <% if(has(email)) { %>
                 <div class="info-item">
                     <span class="info-label">邮箱：</span>
                     <span class="info-value">${email!}</span>
                 </div>
                 <% } %>
             </div>
-            
+
             <!-- Security Notice -->
             <div class="security-notice">
                 <strong>🔒 安全提醒：</strong> 请妥善保管您的登录信息，建议首次登录后立即修改密码。
             </div>
-            
+
             <!-- CTA Button -->
             <div class="cta-section">
                 <a href="https://www.gxwebsoft.com/login" class="cta-button">立即登录体验</a>
             </div>
-            
+
             <!-- Features -->
             <div class="features">
                 <h3>🚀 开始探索WebSoft的强大功能</h3>
@@ -327,20 +327,20 @@
                 </div>
             </div>
         </div>
-        
+
         <!-- Footer -->
         <div class="footer">
             <div class="footer-content">
                 <strong>南宁网宿信息科技有限公司</strong><br>
                 专业的企业数字化转型服务商
             </div>
-            
+
             <div class="footer-links">
                 <a href="https://www.gxwebsoft.com">官方网站</a>
                 <a href="https://www.gxwebsoft.com/help">帮助中心</a>
                 <a href="https://www.gxwebsoft.com/contact">联系我们</a>
             </div>
-            
+
             <div class="copyright">
                 © 2024 南宁网宿信息科技有限公司 版权所有<br>
                 如有疑问，请联系客服：170083662@qq.com