diff --git a/.gitignore b/.gitignore index 0700a0f..a6b69db 100644 --- a/.gitignore +++ b/.gitignore @@ -369,3 +369,7 @@ EuroTran/.vs/Eurotran/v16/.suo EuroTran/.vs/Eurotran/v16/.suo EuroTran/.vs/Eurotran/config/applicationhost.config EuroTran/.vs/Eurotran/v16/.suo +EuroTran/.vs/Eurotran/config/applicationhost.config +EuroTran/WebApp/Web.config +EuroTran/WebApp/Web.config +EuroTran/.vs/Eurotran/config/applicationhost.config diff --git a/EuroTran/EasyBL.WEBAPP/EasyBL.WEBAPP.csproj b/EuroTran/EasyBL.WEBAPP/EasyBL.WEBAPP.csproj index d1e85be..8efba50 100644 --- a/EuroTran/EasyBL.WEBAPP/EasyBL.WEBAPP.csproj +++ b/EuroTran/EasyBL.WEBAPP/EasyBL.WEBAPP.csproj @@ -108,6 +108,7 @@ + diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs index 35efc72..3cb21eb 100644 --- a/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/OnsiteService.cs @@ -1292,8 +1292,8 @@ namespace EasyBL.WEBAPP.ShowEasy oEmail.IsCCSelf = false; oEmail.Attachments = null; oEmail.EmailTo = toEmail; - var bSend = new MailService(sORIGID, true).MailFactory(oEmail, out sError); - + //var bSend = new MailService(sORIGID, true).MailFactory(oEmail, out sError); + SendEmailTask.send(sORIGID, true, oEmail, sError); } } @@ -1358,8 +1358,8 @@ namespace EasyBL.WEBAPP.ShowEasy oEmail.IsCCSelf = false; oEmail.Attachments = null; oEmail.EmailTo = toEmail; - var bSend = new MailService(sORIGID, true).MailFactory(oEmail, out sError); - + //var bSend = new MailService(sORIGID, true).MailFactory(oEmail, out sError); + SendEmailTask.send(sORIGID, true, oEmail, sError); } } catch (Exception ex) diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SendEmailTask.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SendEmailTask.cs new file mode 100644 index 0000000..3b39d2b --- /dev/null +++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SendEmailTask.cs @@ -0,0 +1,19 @@ +using DocumentFormat.OpenXml.Presentation; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EasyBL.WEBAPP.ShowEasy +{ + public static class SendEmailTask + { + public static void send(string sORIGID, Boolean isConfig, Emails Email, string sError) { + + Task mailTask = Task.Run(() => new MailService(sORIGID, isConfig).MailFactory(Email, out sError)); + + } + + } +} diff --git a/EuroTran/EasyBL/MailService.cs b/EuroTran/EasyBL/MailService.cs index 90b86ed..bc3e079 100644 --- a/EuroTran/EasyBL/MailService.cs +++ b/EuroTran/EasyBL/MailService.cs @@ -355,7 +355,9 @@ namespace EasyBL objEmail.Subject = i_oEmail.Title; //**信件主旨**// objEmail.Body = i_oEmail.EmailBody; - objEmail.Body = HttpContext.Current.Server.HtmlDecode(objEmail.Body); + + //objEmail.Body = HttpContext.Current.Server.HtmlDecode(objEmail.Body); + objEmail.IsBodyHtml = true; //'**设置正文的编码形式.这里的设置为取系统默认编码 //objEmail.BodyEncoding = System.Text.Encoding.Default;