CrazyIter_Bin 1 tahun lalu
induk
melakukan
9b9b532b19

+ 2 - 3
TEAMModelOS.SDK/DI/Mail/MailFactory.cs

@@ -66,16 +66,15 @@ namespace TEAMModelOS.SDK.DI.Mail
             });
             return services;
         }
-        public static string SendEmail(this SmtpClient smtpClient, AzureRedisFactory coreRedisFactory, string subject, string content, string toMail,string tmdid,string tmdname )
+        public static string SendEmail(this SmtpClient smtpClient, AzureRedisFactory coreRedisFactory, string subject, string content, string toMail,string tmdid,string tmdname ,string sender = "醍摩豆客服助手")
         {
             if (smtpClient!=null)
             {
                 NetworkCredential networkCredential = (NetworkCredential)smtpClient.Credentials!;
-                MailMessage mailMessage = new MailMessage(new MailAddress(networkCredential.UserName, "醍摩豆发票助手"), new MailAddress(toMail, "醍摩豆用户"));
+                MailMessage mailMessage = new MailMessage(new MailAddress(networkCredential.UserName, sender), new MailAddress(toMail, $"{tmdname}({tmdid})"));
                 mailMessage.Subject = subject;
                 mailMessage.Body = content;
                 mailMessage.IsBodyHtml = true;
-
                 smtpClient.SendCompleted+=async (sender, e) =>
                 {
                     int result = 0;

+ 14 - 2
TEAMModelOS/Controllers/System/WeChatPayController.cs

@@ -446,8 +446,8 @@ namespace TEAMModelOS.Controllers
 
         [EnableCors("AllowSpecificOrigin")]
         [ProducesDefaultResponseType]
-        [HttpPost("send-mail")]
-        public async Task<IActionResult> SendMail(JsonElement json) {
+        [HttpPost("send-email")]
+        public async Task<IActionResult> SendEmail(JsonElement json) {
             if (!json.TryGetProperty("email", out JsonElement email))
             {
                 return Ok(new { error = 400 });
@@ -521,5 +521,17 @@ namespace TEAMModelOS.Controllers
         /// </summary>
         public string openid { get; set; }
         public string client_id { get; set; }
+        /// <summary>
+        /// 发票代码
+        /// </summary>
+        public string invoiceCode { get; set; }
+        /// <summary>
+        /// 发票号码
+        /// </summary>
+        public string invoiceNum { get; set; }
+        /// <summary>
+        /// 发票文件地址
+        /// </summary>
+        public string invoiceUrl { get; set; }
     }
 }

+ 30 - 21
TEAMModelOS/JsonFile/Core/mail.html

@@ -10,6 +10,7 @@
             margin: 0;
             padding: 0;
         }
+
         .container {
             display: flex;
             flex-direction: column;
@@ -17,33 +18,36 @@
             align-items: center;
             height: 100vh;
         }
+
         p {
             margin-bottom: 20px;
             font-size: 20px;
             text-align: center;
             word-wrap: break-word;
         }
+
         a {
             width: 100%;
             text-decoration: none;
-            color: gray;
+            color: rgba(74, 144, 236, 0.808);
             font-weight: bold
         }
+
         label {
             background-color: lightgrey;
         }
     </style>
 </head>
+
 <body>
     <div class="container">
         <table width="650" bgcolor="#ffffff" align="center" cellpadding="0" cellspacing="0" border="0">
             <tbody>
                 <tr>
                     <td align="left" valign="middle" class="img-wrapper" style="text-align: left;padding-left: 35px;">
-                        <a href="https://www.habook.com.cn/"
-                           rel="noopener" target="_blank">
+                        <a href="https://www.habook.com.cn/" rel="noopener" target="_blank">
                             <img src="https://teammodelos.blob.core.chinacloudapi.cn/0-public/school/88ab1b98-c373-41b1-9917-6dd0577344d8.jpg"
-                                 border="0" height="88px">
+                                border="0" height="88" width="88">
                         </a>
                     </td>
                 </tr>
@@ -58,28 +62,31 @@
                             <tbody>
                                 <tr>
                                     <td align="left"
-                                        style="font-weight:bold; font-size:18px; padding-top:10px; padding-bottom:8px; color:#5b5b5b;">
+                                        style="font-weight:bold; font-size:20px; padding-top:10px; padding-bottom:8px; color:#5b5b5b;">
                                         亲爱的{tmdname}客户,您好:
                                     </td>
                                 </tr>
                                 <tr>
                                     <td align="left"
-                                        style="font-size:18px; color:#5b5b5b; padding-top:5px; padding-bottom:5px; line-height:40px;font-family:Verdana;">
-                                        感谢您在醍摩豆CN ( <a href="https://www.habook.com.cn"
-                                                       rel="noopener" target="_blank">www.habook.com.cn</a> ) 购买产品!<br> 已经为您开具订单<a href=""
-                                                                                                                                   rel="noopener" target="_blank">{产品名称}({orderId})</a>的电子普通发票,如下:
-                                        <br>发票类型:增值税电子普通发票,发票代码:{invoiceCode},发票号码: {invoiceNum},您可以点击“ <a href="{invoiceUrl}"
-                                                                                                           rel="noopener" target="_blank">发票文件下载</a> ”获取该发票文件; <br>同时您也可以访问<a href="https://www.habook.com.cn"
-                                                                                                                                                                              rel="noopener" target="_blank">醍摩豆CN(www.habook.com.cn)</a>网站订单管理及下载安装<a href="https://www.habook.com.cn/download.php?act=view&id=54">HiTA5</a>中的通知中心详情查看下载电子普通发票。
+                                        style="font-size:15px; color:#5b5b5b; padding-top:5px; padding-bottom:5px; line-height:40px;font-family:Verdana;">
+                                        感谢您在醍摩豆CN ( <a href="https://www.habook.com.cn" rel="noopener"
+                                            target="_blank">www.habook.com.cn</a> ) 购买产品!<br> 已经为您开具订单,产品名称:<a href=""
+                                            rel="noopener" target="_blank">{productName},{orderId}</a>的电子普通发票,如下:
+                                        <br>发票类型:增值税电子普通发票,订单支付金额{pay_amount}元,发票代码:{invoiceCode},发票号码: {invoiceNum},您可以点击“ <a
+                                            href="{invoiceUrl}" rel="noopener" target="_blank">发票文件下载</a> ”获取该发票文件;
+                                        <br>同时您也可以访问<a href="https://www.habook.com.cn" rel="noopener"
+                                            target="_blank">醍摩豆CN(www.habook.com.cn)</a>网站订单管理及下载安装<a
+                                            href="https://www.habook.com.cn/download.php?act=view&id=54">HiTA5</a>中的通知中心详情查看下载电子普通发票。
                                         <br>电子普通发票是税务机关认可的有效收付款凭证,与纸质发票具有同等法律效力,可用于报销入账、售后维权等。
                                     </td>
                                 </tr>
                                 <tr>
                                     <td align="left"
-                                        style="font-size:18px; color:#5b5b5b; padding-top:5px; padding-bottom:5px; line-height:40px;font-family:Verdana;">
-                                        <b>温馨提示</b>:如您有校园采购需求,可<a href="https://www.teammodel.cn/"
-                                                                  rel="noopener"
-                                                                  target="_blank">注册醍摩豆会员</a>在学校管理设置申请建立学校,填写相关学校信息及联系方式后,我们会有工作人员为您介绍产品及服务开通流程。您也可以关注【<u><b>醍摩豆智慧教育研究院</b></u>】微信公众号或拨打企业热线 <a title="028-8600-8651" href="tel:028-8600-8651">028-8600-8651</a>联系我们。
+                                        style="font-size:15px; color:#5b5b5b; padding-top:5px; padding-bottom:5px; line-height:40px;font-family:Verdana;">
+                                        <b>温馨提示</b>:如您有校园采购需求,可<a href="https://www.teammodel.cn/" rel="noopener"
+                                            target="_blank">注册醍摩豆会员</a>在学校管理设置申请建立学校,填写相关学校信息及联系方式后,我们会有工作人员为您介绍产品及服务开通流程。您也可以关注【<u><b
+                                                style="color: rgba(74, 144, 236, 0.808)">醍摩豆智慧教育研究院</b></u>】微信公众号或拨打企业热线
+                                        <a title="028-8600-8651" href="tel:028-8600-8651">028-8600-8651</a>联系我们。
                                     </td>
                                 </tr>
                             </tbody>
@@ -99,13 +106,14 @@
                             <tbody>
                                 <tr>
                                     <td align="center">
-                                        <a href="https://www.habook.com.cn/"
-                                           target="_blank" rel="noopener">
+                                        <a href="https://www.habook.com.cn/" target="_blank" rel="noopener">
                                             <img src="https://teammodelos.blob.core.chinacloudapi.cn/0-public/school/88ab1b98-c373-41b1-9917-6dd0577344d8.jpg"
-                                                 width="30" height="30" border="0" style=" margin-top:5px;">
+                                                width="30" height="30" border="0" style=" margin-top:5px;">
                                         </a> <br> <a href="https://www.habook.com.cn/"
-                                                     style="font-size: 18px;text-decoration: none" target="_blank" rel="noopener">
-                                            <font color="#323335"> Copyright ©2004-2023 HABOOK Group. All rights reserved.  </font>
+                                            style="font-size: 12px;text-decoration: none" target="_blank"
+                                            rel="noopener">
+                                            <font color="#323335"> Copyright ©2004-2023 HABOOK Group. All rights
+                                                reserved. </font>
                                         </a>
                                     </td>
                                 </tr>
@@ -117,4 +125,5 @@
         </table>
     </div>
 </body>
+
 </html>

+ 1 - 1
TEAMModelOS/Startup.cs

@@ -188,7 +188,7 @@ namespace TEAMModelOS
             //services.AddHostedService<>
             //services.AddSingleton<ILoggerProvider, BlobLoggerProvider>();
             // services.AddMvcFilter<RequestAuditFilter>();
-            //services.AddNetMail(Configuration.GetSection("MailOption").Get<MailOptions>());
+            services.AddNetMail(Configuration.GetSection("MailOption").Get<MailOptions>());
 #if !DEBUG
  //第一步: 配置gzip与br的压缩等级为最优
             //builder.Services.AddMyResponseCompression();

+ 5 - 5
TEAMModelOS/appsettings.Development.json

@@ -98,11 +98,11 @@
     "getuserinfo_bycode": "https://oapi.dingtalk.com/sns/getuserinfo_bycode?accessKey=xxx&timestamp=xxx&signature=xxx"
   },
   "MailOption": {
-    "fromMail": "353897079@qq.com",
-    "smtp": "smtp.qq.com",
-    "port": 465,
-    "username": "353897079@qq.com",
-    "password": "gsvpdyglpmlpcadg"
+    "fromMail": "chhabook_customer@163.com",
+    "smtp": "smtp.163.com",
+    "port": 25,
+    "username": "chhabook_customer@163.com",
+    "password": "ZXMIRDYLVLJFWGJD"
   },
   "Third": {
     //"scsyxpt": {

+ 5 - 5
TEAMModelOS/appsettings.json

@@ -41,11 +41,11 @@
     }
   },
   "MailOption": {
-    "fromMail": "353897079@qq.com",
-    "smtp": "smtp.qq.com",
-    "port": 465,
-    "username": "353897079@qq.com",
-    "password": "gsvpdyglpmlpcadg"
+    "fromMail": "chhabook_customer@163.com",
+    "smtp": "smtp.163.com",
+    "port": 25,
+    "username": "chhabook_customer@163.com",
+    "password": "ZXMIRDYLVLJFWGJD"
   },
   "HaBookAuth": {
     "CoreId": {