Merge branch 'feature/new_report' into dev

performance/Performance.Api/appsettings.json

@@ -20,7 +20,8 @@
   "EmailOptions": {
     "SmtpServer": "smtpdm.aliyun.com",
     "Account": "service@email.suvalue.com",
-    "Password": "SuValue123456"
+    "Password": "SuValue123456",
+    "IsEnable": true
   },
   "Application": {
     //登录过期时间

performance/Performance.ConsoleApp/Program.cs

@@ -55,7 +55,7 @@ static void Main(string[] args)
 
             var option = services.BuildServiceProvider().GetService<IOptions<EmailOptions>>();
 
-            services.AddEmailUtil(config => { config.Account = option.Value.Account; config.Password = option.Value.Password; config.SmtpServer = option.Value.SmtpServer; });
+            services.AddEmailUtil(config => { config.Account = option.Value.Account; config.Password = option.Value.Password; config.SmtpServer = option.Value.SmtpServer; config.IsEnable = option.Value.IsEnable; });
             var emailService = services.BuildServiceProvider().GetService<IEmailService>();
             var message = new EmailMessage
             {

performance/Performance.ConsoleApp/appsettings.json

@@ -20,7 +20,8 @@
   "EmailOptions": {
     "SmtpServer": "smtpdm.aliyun.com",
     "Account": "service@email.suvalue.com",
-    "Password": "SuValue123456"
+    "Password": "SuValue123456",
+    "IsEnable": true
   },
   "Application": {
     //登录过期时间

performance/Performance.Extract.Api/appsettings.json

@@ -22,7 +22,8 @@
   "EmailOptions": {
     "SmtpServer": "smtpdm.aliyun.com",
     "Account": "service@email.suvalue.com",
-    "Password": "SuValue123456"
+    "Password": "SuValue123456",
+    "IsEnable": true
   },
   "Application": {
     //登录过期时间

performance/Performance.Infrastructure/Util/EmailService.cs

@@ -25,6 +25,10 @@ public class EmailOptions
         /// 密码
         /// </summary>
         public string Password { get; set; }
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
     }
 
 
@@ -80,6 +84,9 @@ public Task<bool> SendAsync(EmailMessage message)
 
         public bool Send(EmailMessage message)
         {
+            if (!options.IsEnable)
+                return true;
+
             MailMessage mail = new MailMessage();
             try
             {

performance/Performance.Services/AllotService.cs

@@ -382,7 +382,7 @@ private void SendEmail(per_allot allot, string mail, int type, DateTime time)
                     $"您可以登录<a href=\"http://jixiao.suvalue.com\" target=\"_blank\">http://jixiao.suvalue.com</a>查看详细清空。</p>";
             }
 
-            //emailService.SendAsync(message);
+            emailService.SendAsync(message);
         }
 
         /// <summary>

performance/Performance.Services/DFExtractService.cs

@@ -1123,7 +1123,7 @@ private void SendEmail(string mail, string path, string subject, string body)
             };
             if (!string.IsNullOrEmpty(path))
                 message.Attachments = new List<string> { path };
-            //emailService.Send(message);
+            emailService.Send(message);
         }
 
         /// <summary>