Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
Shwasher
/
ShWasher
2
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

更改OrderStatusMg.js缓存

klzhangweiya 1 жил өмнө
parent
851a8b8c9c
commit
aa56d27ae3
10 өөрчлөгдсөн 300 нэмэгдсэн , 3 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 1 1
      src_0nline/ShwasherSys/ShwasherSys.Application/Common/CommonAppService.cs
  2. 50 0
      src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/EmailTemplateProvider.cs
  3. 174 0
      src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/EmailTemplates/default.html
  4. 8 0
      src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/IEmailTemplateProvider.cs
  5. 21 0
      src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/IwbZeroTemplateMailKitSmtpBuilder.cs
  6. 17 0
      src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/IwbZeroTemplateSmtpEmailSenderConfiguration.cs
  7. 4 1
      src_0nline/ShwasherSys/ShwasherSys.Core/ShwasherCoreModule.cs
  8. 19 0
      src_0nline/ShwasherSys/ShwasherSys.Core/ShwasherSys.Core.csproj
  9. 5 0
      src_0nline/ShwasherSys/ShwasherSys.Core/packages.config
  10. 1 1
      src_0nline/ShwasherSys/ShwasherSys.Web/Views/OrderInfo/OrderStatusMg.cshtml

+ 1 - 1
src_0nline/ShwasherSys/ShwasherSys.Application/Common/CommonAppService.cs
Файл харах 

@@ -258,7 +258,7 @@ namespace ShwasherSys.Common
 
                     //if (mail.To.Any())
 
                     //{
 
                         
-                    //   await EmailSender.SendAsync(mail);
 
+                      // await EmailSender.SendAsync(mail);
 
                   
                     //}
 
                     List<string> receiveEmails = new List<string>();

+ 50 - 0
src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/EmailTemplateProvider.cs
Файл харах 

@@ -0,0 +1,50 @@
 
+using System;
 
+using System.Collections.Concurrent;
 
+using System.Text;
 
+using Abp.Dependency;
 
+using Abp.IO.Extensions;
 
+using Abp.Reflection.Extensions;
 
+using IwbZeroCore.Net.Emailing;
 
+
 
+namespace ShwasherSys.Emailing
 
+{
 
+    public class EmailTemplateProvider : IEmailTemplateProvider, ISingletonDependency
 
+    {
 
+        //private readonly IWebUrlService _webUrlService;
 
+        private readonly ConcurrentDictionary<string, string> _defaultTemplates;
 
+
 
+        public EmailTemplateProvider()
 
+        {
 
+            //_webUrlService = webUrlService;
 
+            _defaultTemplates = new ConcurrentDictionary<string, string>();
 
+        }
 
+
 
+        public string GetDefaultTemplate(int? tenantId)
 
+        {
 
+            var tenancyKey = tenantId.HasValue ? tenantId.Value.ToString() : "host";
 
+
 
+            return _defaultTemplates.GetOrAdd(tenancyKey, key =>
 
+            {
 
+                using (var stream = typeof(EmailTemplateProvider).GetAssembly().GetManifestResourceStream("ShwasherSys.Emailing.EmailTemplates.default.html"))
 
+                {
 
+                    var bytes = stream.GetAllBytes();
 
+                    var template = Encoding.UTF8.GetString(bytes, 3, bytes.Length - 3);
 
+                    template = template.Replace("{THIS_YEAR}", DateTime.Now.Year.ToString());
 
+                    return template.Replace("{EMAIL_LOGO_URL}", GetTenantLogoUrl(tenantId));
 
+                }
 
+            });
 
+        }
 
+
 
+        private string GetTenantLogoUrl(int? tenantId)
 
+        {
 
+            return ""; //_webUrlService.GetServerRootAddress().EnsureEndsWith('/') + "img/logo.png";
 
+            //if (!tenantId.HasValue)
 
+            //{
 
+            //    return _webUrlService.GetServerRootAddress().EnsureEndsWith('/') + "img/logo/logo.png";
 
+            //}
 
+
 
+            //var tenant = _tenantCache.Get(tenantId.Value);
 
+            //return _webUrlService.GetServerRootAddress(tenant.TenancyName).EnsureEndsWith('/') + "img/logo/" + tenantId.Value+ "/logo.png";
 
+        }
 
+    }
 
+}

+ 174 - 0
src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/EmailTemplates/default.html
Файл харах 

@@ -0,0 +1,174 @@
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
+<html style="-webkit-text-size-adjust: none;-ms-text-size-adjust: none;">
 
+<head>
 
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
+    <title>IwbTemplate | {EMAIL_TITLE}</title>
 
+</head>
 
+<body style="padding: 0px; margin: 0px;">
 
+    <div id="mailsub" class="notification" align="center">
 
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
+            <tr>
 
+                <td align="center" bgcolor="#eff3f8">
 
+
 
+                    <!--[if gte mso 10]>
 
+                    <table width="680" border="0" cellspacing="0" cellpadding="0">
 
+                    <tr><td>
 
+                    <![endif]-->
 
+                    <table border="0" cellspacing="0" cellpadding="0" class="table_width_100" width="100%" style="max-width: 680px;">
 
+                        <!--header -->
 
+                        <tr>
 
+                            <td align="center" bgcolor="#eff3f8">
 
+                                <!-- padding --><div style="height: 20px; line-height: 20px; font-size: 10px;">&nbsp;</div>
 
+                                <table width="96%" border="0" cellspacing="0" cellpadding="0">
 
+                                    <tr>
 
+                                        <td align="left">
 
+                                            <!--Item -->
 
+                                            <div class="mob_center_bl" style="float: left; display: inline-block; width: 115px;">
 
+                                                <table class="mob_center" width="115" border="0" cellspacing="0" cellpadding="0" align="left" style="border-collapse: collapse;">
 
+                                                    <tr>
 
+                                                        <td align="left" valign="middle">
 
+                                                            <!-- padding --><div style="height: 20px; line-height: 20px; font-size: 10px;">&nbsp;</div>
 
+                                                            <table width="115" border="0" cellspacing="0" cellpadding="0">
 
+                                                                <tr>
 
+                                                                    <td align="left" valign="top" class="mob_center">
 
+                                                                        <a href="#" target="_blank" style="color: #596167; font-family: Arial, Helvetica, sans-serif; font-size: 13px;">
 
+                                                                            <font face="Arial, Helvetica, sans-seri; font-size: 13px;" size="3" color="#596167">
 
+                                                                                <img src="{EMAIL_LOGO_URL}" width="168" height="33" alt="IwbZero" border="0" style="display: block;">
 
+                                                                            </font>
 
+                                                                        </a>
 
+                                                                    </td>
 
+                                                                </tr>
 
+                                                            </table>
 
+                                                        </td>
 
+                                                    </tr>
 
+                                                </table>
 
+                                            </div><!-- Item END-->
 
+                                            <!--[if gte mso 10]>
 
+                                                </td>
 
+                                                <td align="right">
 
+                                            <![endif]-->
 
+                                            <!--
 
+
 
+                                            Item -->
 
+                                            <div class="mob_center_bl" style="float: right; display: inline-block; width: 88px;">
 
+                                                <table width="88" border="0" cellspacing="0" cellpadding="0" align="right" style="border-collapse: collapse;">
 
+                                                    <tr>
 
+                                                        <td align="right" valign="middle">
 
+                                                            <!-- padding --><div style="height: 20px; line-height: 20px; font-size: 10px;">&nbsp;</div>
 
+                                                            <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
+                                                                <tr>
 
+                                                                    <td align="right">
 
+                                                                        <!--social -->
 
+                                                                        <div class="mob_center_bl" style="width: 88px;">
 
+                                                                            <table border="0" cellspacing="0" cellpadding="0">
 
+                                                                                <tr>
 
+                                                                                    <td width="39" align="center" style="line-height: 19px;">
 
+                                                                                        <a href="https://twitter.com/aspnetzero" target="_blank" style="color: #596167; font-family: Arial, Helvetica, sans-serif; font-size: 12px;">
 
+                                                                                            <font face="Arial, Helvetica, sans-serif" size="2" color="#596167">
 
+                                                                                                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABmElEQVR4Ae3OvUvVcRjG4ScTo0WSloiQIoLEoGhyDRTX6GWJEImWQKIQGrIhoheioNaGKGhpiKCh/yADKUJqcJLGoMheDkJx1KdrjDie8/tyzhkCb7ju+RMb21gnd/LZUj+nucNtTtFPANBLEOH+NUyU4gzfSAC+MEGwgynurRdwmGVGiAIXyBYWWKPGvvUCpkl+MkpUMESdrOAzE5xlvFHALZKkzgw9RBN3yYpWSF6wuVHAeRKAdxwh1vGaLPCUPqJRwG5WyQbmmGSA+Ms8WdEim4jGAfCYbKLOWx4wwwJZ0QeiWcBBdjJHdsFsq4Cr1HhDdsGTVgFjZBddbBXQwzzZJYeaB8AwX8kOWyRaB8B+XpEddKUkYIRpXrJGtukH20sCdrFMdshlonoATLJGtuk9feUBcJxPZDH4zhBRGgCwhaM8Jwv8YoxoN2AbN/hNVlRjnCgJ6CXYyh6O8ZAaWWCeA0RpwCCPWCVLscQl+ojSAIC9XOMj2cIKs5yjn4D2AgAGOcE0N7nPdaYYZYAA2g8o998HbAT8AXjZKQTgI9L4AAAAAElFTkSuQmCC" width="19" height="16" alt="Twitter" border="0" style="display: block;">
 
+                                                                                            </font>
 
+                                                                                        </a>
 
+                                                                                    </td>
 
+                                                                                </tr>
 
+                                                                            </table>
 
+                                                                        </div>
 
+                                                                        <!--social END-->
 
+                                                                    </td>
 
+                                                                </tr>
 
+                                                            </table>
 
+                                                        </td>
 
+                                                    </tr>
 
+                                                </table>
 
+                                            </div><!-- Item END-->
 
+                                        </td>
 
+                                    </tr>
 
+                                </table>
 
+                                <!-- padding --><div style="height: 30px; line-height: 30px; font-size: 10px;">&nbsp;</div>
 
+                            </td>
 
+                        </tr>
 
+                        <!--header END-->
 
+                        <!--content 1 -->
 
+                        <tr>
 
+                            <td align="center" bgcolor="#ffffff">
 
+                                <table width="90%" border="0" cellspacing="0" cellpadding="0">
 
+                                    <tr>
 
+                                        <td align="center">
 
+                                            <!-- padding --><div style="height: 100px; line-height: 100px; font-size: 10px;">&nbsp;</div>
 
+                                            <div style="line-height: 44px;">
 
+                                                <font face="Arial, Helvetica, sans-serif" size="5" color="#57697e" style="font-size: 34px;">
 
+                                                    <span style="font-family: Arial, Helvetica, sans-serif; font-size: 34px; color: #57697e;">
 
+                                                        {EMAIL_TITLE}
 
+                                                    </span>
 
+                                                </font>
 
+                                            </div>
 
+                                            <!-- padding --><div style="height: 30px; line-height: 30px; font-size: 10px;">&nbsp;</div>
 
+                                        </td>
 
+                                    </tr>
 
+                                    <tr>
 
+                                        <td align="center">
 
+                                            <div style="line-height: 30px;">
 
+                                                <font face="Arial, Helvetica, sans-serif" size="5" color="#4db3a4" style="font-size: 17px;">
 
+                                                    <span style="font-family: Arial, Helvetica, sans-serif; font-size: 17px; color: #4db3a4;">
 
+                                                        {EMAIL_SUB_TITLE}
 
+                                                    </span>
 
+                                                </font>
 
+                                            </div>
 
+                                            <!-- padding --><div style="height: 35px; line-height: 35px; font-size: 10px;">&nbsp;</div>
 
+                                        </td>
 
+                                    </tr>
 
+                                    <tr>
 
+                                        <td align="center">
 
+                                            <table width="80%" align="center" border="0" cellspacing="0" cellpadding="0">
 
+                                                <tr>
 
+                                                    <td align="center">
 
+                                                        <div style="line-height: 24px;">
 
+                                                            <font face="Arial, Helvetica, sans-serif" size="4" color="#57697e" style="font-size: 16px;">
 
+                                                                <span style="font-family: Arial, Helvetica, sans-serif; font-size: 15px; color: #57697e;">
 
+                                                                    {EMAIL_BODY}
 
+                                                                </span>
 
+                                                            </font>
 
+                                                        </div>
 
+                                                    </td>
 
+                                                </tr>
 
+                                            </table>
 
+                                            <!-- padding --><div style="height: 45px; line-height: 45px; font-size: 10px;">&nbsp;</div>
 
+                                        </td>
 
+                                    </tr>
 
+                                </table>
 
+                            </td>
 
+                        </tr>
 
+                        <!--content 1 END-->
 
+                        <!--footer -->
 
+                        <tr>
 
+                            <td class="iage_footer" align="center" bgcolor="#eff3f8">
 
+                                <!-- padding --><div style="height: 40px; line-height: 40px; font-size: 10px;">&nbsp;</div>
 
+
 
+                                <table width="100%" border="0" cellspacing="0" cellpadding="0">
 
+                                    <tr>
 
+                                        <td align="center">
 
+                                            <font face="Arial, Helvetica, sans-serif" size="3" color="#96a5b5" style="font-size: 13px;">
 
+                                                <span style="font-family: Arial, Helvetica, sans-serif; font-size: 13px; color: #96a5b5;">
 
+                                                    {THIS_YEAR} &copy; Iwb.
 
+                                                </span>
 
+                                            </font>
 
+                                        </td>
 
+                                    </tr>
 
+                                </table>
 
+
 
+                                <!-- padding --><div style="height: 50px; line-height: 50px; font-size: 10px;">&nbsp;</div>
 
+                            </td>
 
+                        </tr>
 
+                        <!--footer END-->
 
+                    </table>
 
+                    <!--[if gte mso 10]>
 
+                    </td></tr>
 
+                    </table>
 
+                    <![endif]-->
 
+
 
+                </td>
 
+            </tr>
 
+        </table>
 
+
 
+    </div>
 
+</body>
 
+</html>

+ 8 - 0
src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/IEmailTemplateProvider.cs
Файл харах 

@@ -0,0 +1,8 @@
 
+
 
+namespace IwbZeroCore.Net.Emailing
 
+{
 
+    public interface IEmailTemplateProvider
 
+    {
 
+        string GetDefaultTemplate(int? tenantId);
 
+    }
 
+}

+ 21 - 0
src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/IwbZeroTemplateMailKitSmtpBuilder.cs
Файл харах 

@@ -0,0 +1,21 @@
 
+using Abp.MailKit;
 
+using Abp.Net.Mail.Smtp;
 
+
 
+namespace ShwasherSys.Emailing
 
+{
 
+    public class IwbZeroTemplateMailKitSmtpBuilder : DefaultMailKitSmtpBuilder
 
+    {
 
+        public IwbZeroTemplateMailKitSmtpBuilder(
 
+            ISmtpEmailSenderConfiguration smtpEmailSenderConfiguration,
 
+            IAbpMailKitConfiguration abpMailKitConfiguration) : base(smtpEmailSenderConfiguration, abpMailKitConfiguration)
 
+        {
 
+
 
+        }
 
+
 
+        protected override void ConfigureClient(MailKit.Net.Smtp.SmtpClient client)
 
+        {
 
+            client.ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true;
 
+            base.ConfigureClient(client);
 
+        }
 
+    }
 
+}

+ 17 - 0
src_0nline/ShwasherSys/ShwasherSys.Core/Emailing/IwbZeroTemplateSmtpEmailSenderConfiguration.cs
Файл харах 

@@ -0,0 +1,17 @@
 
+using Abp.Configuration;
 
+using Abp.Net.Mail;
 
+using Abp.Net.Mail.Smtp;
 
+using Abp.Runtime.Security;
 
+
 
+namespace ShwasherSys.Emailing
 
+{
 
+    public class IwbZeroTemplateSmtpEmailSenderConfiguration : SmtpEmailSenderConfiguration
 
+    {
 
+        public IwbZeroTemplateSmtpEmailSenderConfiguration(ISettingManager settingManager) : base(settingManager)
 
+        {
 
+
 
+        }
 
+
 
+        public override string Password => SimpleStringCipher.Instance.Decrypt(GetNotEmptySettingValue(EmailSettingNames.Smtp.Password));
 
+    }
 
+}

+ 4 - 1
src_0nline/ShwasherSys/ShwasherSys.Core/ShwasherCoreModule.cs
Файл харах 

@@ -10,6 +10,9 @@ using IwbZero.Authorization.Permissions;
 
 using IwbZero.Navigation;
 
 using IwbZero.Setting;
 
 using ShwasherSys.Authorization;
 
+using Abp.Configuration.Startup;
 
+using Abp.MailKit;
 
+using ShwasherSys.Emailing;
 
 
 namespace ShwasherSys
 
 {
 
@@ -32,7 +35,7 @@ namespace ShwasherSys
 
             }
 
             Configuration.Localization.Languages.Add(new LanguageInfo("zh-CN", "简体中文", "famfamfam-flag-cn", true));
 
             //Configuration.Localization.Languages.Add(new LanguageInfo("en", "English", "famfamfam-flag-england"));
 
-
 
+            Configuration.ReplaceService<IMailKitSmtpBuilder, IwbZeroTemplateMailKitSmtpBuilder>();
 
             //Add/remove localization sources here
 
             Configuration.Localization.Sources.Add(
 
                 new DictionaryBasedLocalizationSource(

+ 19 - 0
src_0nline/ShwasherSys/ShwasherSys.Core/ShwasherSys.Core.csproj
Файл харах 

@@ -41,6 +41,9 @@
 
     <Reference Include="Abp.AutoMapper, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\Abp.AutoMapper.4.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
 
     </Reference>
 
+    <Reference Include="Abp.MailKit, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
 
+      <HintPath>..\..\packages\Abp.MailKit.4.1.0\lib\netstandard2.0\Abp.MailKit.dll</HintPath>
 
+    </Reference>
 
     <Reference Include="Abp.Owin, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\Abp.Owin.4.1.0\lib\net461\Abp.Owin.dll</HintPath>
 
     </Reference>
 
@@ -62,6 +65,9 @@
 
     <Reference Include="AutoMapper.Collection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=e57c3f0a3d6646db, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\AutoMapper.Collection.5.0.0\lib\net461\AutoMapper.Collection.dll</HintPath>
 
     </Reference>
 
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
 
+      <HintPath>..\..\packages\BouncyCastle.1.8.2\lib\BouncyCastle.Crypto.dll</HintPath>
 
+    </Reference>
 
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
 
     </Reference>
 
@@ -83,6 +89,9 @@
 
     <Reference Include="JetBrains.Annotations, Version=2018.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\JetBrains.Annotations.2018.3.0\lib\net20\JetBrains.Annotations.dll</HintPath>
 
     </Reference>
 
+    <Reference Include="MailKit, Version=2.1.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
 
+      <HintPath>..\..\packages\MailKit.2.1.2\lib\net45\MailKit.dll</HintPath>
 
+    </Reference>
 
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\Microsoft.AspNet.Identity.Core.2.2.2\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
 
     </Reference>
 
@@ -143,6 +152,9 @@
 
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
 
     </Reference>
 
+    <Reference Include="MimeKit, Version=2.1.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
 
+      <HintPath>..\..\packages\MimeKit.2.1.2\lib\net45\MimeKit.dll</HintPath>
 
+    </Reference>
 
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
 
     </Reference>
 
@@ -186,6 +198,7 @@
 
     <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
 
     </Reference>
 
+    <Reference Include="System.ComponentModel.Composition" />
 
     <Reference Include="System.ComponentModel.DataAnnotations" />
 
     <Reference Include="System.Configuration" />
 
     <Reference Include="System.Configuration.ConfigurationManager, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
 
@@ -232,6 +245,7 @@
 
       <HintPath>..\..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
 
       <Private>True</Private>
 
     </Reference>
 
+    <Reference Include="System.Security" />
 
     <Reference Include="System.Security.AccessControl, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
 
       <HintPath>..\..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll</HintPath>
 
     </Reference>
 
@@ -350,6 +364,10 @@
 
     <Compile Include="CustomerInfo\Customers.cs" />
 
     <Compile Include="CustomerInfo\CustomerSend.cs" />
 
     <Compile Include="DecimalPrecisionAttribute.cs" />
 
+    <Compile Include="Emailing\EmailTemplateProvider.cs" />
 
+    <Compile Include="Emailing\IEmailTemplateProvider.cs" />
 
+    <Compile Include="Emailing\IwbZeroTemplateMailKitSmtpBuilder.cs" />
 
+    <Compile Include="Emailing\IwbZeroTemplateSmtpEmailSenderConfiguration.cs" />
 
     <Compile Include="Inspection\CustomerDisabledProduct.cs" />
 
     <Compile Include="Inspection\DisqualifiedProduct.cs" />
 
     <Compile Include="Inspection\ProductInspectReportContent.cs" />
 
@@ -441,6 +459,7 @@
 
       <Generator>TextTemplatingFileGenerator</Generator>
 
       <LastGenOutput>PermissionNames.cs</LastGenOutput>
 
     </Content>
 
+    <Content Include="Emailing\EmailTemplates\default.html" />
 
     <EmbeddedResource Include="Localization\Language\Language-en.xml" />
 
     <EmbeddedResource Include="Localization\Language\Language.xml">
 
       <SubType>Designer</SubType>

+ 5 - 0
src_0nline/ShwasherSys/ShwasherSys.Core/packages.config
Файл харах 

@@ -2,6 +2,7 @@
 
 <packages>
 
   <package id="Abp" version="4.1.0" targetFramework="net461" />
 
   <package id="Abp.AutoMapper" version="4.1.0" targetFramework="net461" />
 
+  <package id="Abp.MailKit" version="4.1.0" targetFramework="net461" />
 
   <package id="Abp.Owin" version="4.1.0" targetFramework="net461" />
 
   <package id="Abp.Web" version="4.1.0" targetFramework="net461" />
 
   <package id="Abp.Web.Api" version="4.1.0" targetFramework="net461" />
 
@@ -9,6 +10,7 @@
 
   <package id="Abp.Web.Mvc" version="4.1.0" targetFramework="net461" />
 
   <package id="AutoMapper" version="8.0.0" targetFramework="net461" />
 
   <package id="AutoMapper.Collection" version="5.0.0" targetFramework="net461" />
 
+  <package id="BouncyCastle" version="1.8.2" targetFramework="net461" />
 
   <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
 
   <package id="Castle.LoggingFacility" version="4.1.1" targetFramework="net461" />
 
   <package id="Castle.Windsor" version="4.1.1" targetFramework="net461" />
 
@@ -16,6 +18,7 @@
 
   <package id="EntityFramework.DynamicFilters" version="3.0.1" targetFramework="net461" />
 
   <package id="IwbZero" version="1.0.0" targetFramework="net461" />
 
   <package id="JetBrains.Annotations" version="2018.3.0" targetFramework="net461" />
 
+  <package id="MailKit" version="2.1.2" targetFramework="net461" />
 
   <package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net461" />
 
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.2" targetFramework="net461" />
 
   <package id="Microsoft.AspNet.Identity.Owin" version="2.2.2" targetFramework="net461" />
 
@@ -43,6 +46,7 @@
 
   <package id="Microsoft.Owin.Security.OAuth" version="4.0.1" targetFramework="net461" />
 
   <package id="Microsoft.Owin.StaticFiles" version="4.0.0" targetFramework="net461" />
 
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
 
+  <package id="MimeKit" version="2.1.2" targetFramework="net461" />
 
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
 
   <package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
 
   <package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
 
@@ -60,6 +64,7 @@
 
   <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
 
   <package id="System.Memory" version="4.5.2" targetFramework="net461" />
 
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
 
+  <package id="System.Runtime" version="4.3.0" targetFramework="net461" />
 
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
 
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
 
   <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />

+ 1 - 1
src_0nline/ShwasherSys/ShwasherSys.Web/Views/OrderInfo/OrderStatusMg.cshtml
Файл харах 

@@ -610,7 +610,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 
     <script src="~/Content/Plugins/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"></script>
 
     <script src="~/Content/Plugins/bootstrap-table-fixd-columns/bootstrap-table-fixed-columns.js"></script>
 
     <script src="http://apps.bdimg.com/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
 
-    <script src="~/Views/OrderInfo/js/OrderStatusMg.js"></script>
 
+    <script src="~/Views/OrderInfo/js/OrderStatusMg.js?v=1.1"></script>
 
     @*<script src="~/Views/OrderInfo/js/OrderMg.js"></script>*@
 
     <script type="text/javascript">
 
         var customerNo;