From d559e9963d8660dd0d91227f75f6f12402c93ca0 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 27 Nov 2024 02:42:26 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=BA=D0=B8.v++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 17 +++++
 src/_VisualDVM/Constants.java                 |  3 +-
 .../Passes/All/AppendBugReportField.java      | 12 ++--
 src/_VisualDVM/Passes/All/CheckedEmail.java   | 48 ++-----------
 src/_VisualDVM/Passes/All/EditAccount.java    |  8 +--
 src/_VisualDVM/Passes/All/Email.java          |  5 +-
 .../Passes/All/PublishBugReport.java          | 11 +--
 .../Passes/All/PublishComponent.java          | 22 +++++-
 .../Passes/All/UpdateBugReportField.java      | 10 +--
 .../Repository/BugReport/BugReport.java       |  7 ++
 .../Repository/Component/Visualiser.java      |  2 +-
 src/_VisualDVM/Repository/EmailMessage.java   | 10 +--
 .../Repository/RepositoryServer.java          | 72 ++++++++-----------
 .../Repository/Server/ComponentsServer.java   | 31 +++-----
 .../Repository/Server/ServerCode.java         |  1 +
 .../TestingSystem/Common/TestingPlanner.java  |  3 +-
 .../TestingSystem/Common/TestingServer.java   |  9 +--
 .../SAPFOR/SapforTestingPlanner.java          |  8 +--
 src/_VisualDVM/Utils.java                     |  8 ---
 19 files changed, 135 insertions(+), 152 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb1d2cbc..6f2136d8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,6 +8,23 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AppendBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckedEmail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckedEmail.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditAccount.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Email.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/EmailMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/EmailMessage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 3359ba97..50404712 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -447,7 +447,8 @@ public class Constants {
             //</editor-fold>
     };
     public static Vector<String> admins_mails = new Vector_<>(
+            "sapfor.tracker@internet.ru",
             "vmk-post@yandex.ru",
-                "79854210702@ya.ru"
+            "79854210702@ya.ru"
     );
 }
diff --git a/src/_VisualDVM/Passes/All/AppendBugReportField.java b/src/_VisualDVM/Passes/All/AppendBugReportField.java
index babba494..d6a6c52e 100644
--- a/src/_VisualDVM/Passes/All/AppendBugReportField.java
+++ b/src/_VisualDVM/Passes/All/AppendBugReportField.java
@@ -80,12 +80,12 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
                 message_text = target.comment;
                 break;
         }
-        Global.mainModule.getPass(PassCode.CheckedEmail).Do(
-                new EmailMessage(
-                        message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
-                        message_text,
-                        target.getRecipients()
-                )
+        EmailMessage message=  new EmailMessage(
+                message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
+                message_text
         );
+        for (String address: target.getRecipients()) {
+            Global.mainModule.getPass(PassCode.CheckedEmail).Do(message, address);
+        }
     }
 }
diff --git a/src/_VisualDVM/Passes/All/CheckedEmail.java b/src/_VisualDVM/Passes/All/CheckedEmail.java
index 1548615f..9b8bf2ce 100644
--- a/src/_VisualDVM/Passes/All/CheckedEmail.java
+++ b/src/_VisualDVM/Passes/All/CheckedEmail.java
@@ -1,53 +1,19 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
-import _VisualDVM.Repository.EmailMessage;
-import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Repository.Subscribes.Subscriber;
-import _VisualDVM.Utils;
-
-import java.util.Vector;
 //http://java-online.ru/javax-mail.xhtml
 //https://javarush.ru/groups/posts/1226-kak-otpravitjh-pisjhmo-iz-java-prilozhenija-s-primerom
-public class CheckedEmail extends ComponentsRepositoryPass<EmailMessage> {
-    //этот емейл только для клиента. все что он делает отправляет на сервер то. что нужно отправить.
+public class CheckedEmail extends Email {
+    //отправляет с учетом включения рассылки у подписчика.
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        target = (EmailMessage) args[0];
-        return true;
-    }
-    @Override
-    protected int getTimeout() {
-        return 0;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Vector<String> targetsNames = new Vector<>();
-        for (String target : target.targets) {
-            if (server.db.subscribers.containsKey(target)) {
-                Subscriber subscriber = server.db.subscribers.get(target);
+        if (super.canStart(args)) {
+            if (server.db.subscribers.containsKey(address)) {
+                Subscriber subscriber = server.db.subscribers.get(address);
                 if (subscriber.mailOn != 0) {
-                    String[] data = target.split("@");
-                    if (data.length > 0) {
-                        String tname = data[0];
-                        targetsNames.add(tname);
-                    }
+                    return true;
                 }
             }
         }
-        Utils.addDefaultMails(target.targets);
-        String text_ =
-                "Адресаты: " + String.join(", ", targetsNames) + "\n" +
-                        target.text;
-        //нужно разделить сообщение на несколько одинаковых, по числу адресатов.
-        for (String recipient : target.targets) {
-            System.out.println(recipient);
-            EmailMessage part = new EmailMessage();
-            part.subject = target.subject;
-            part.text = text_;
-            part.targets.add(recipient);
-            part.files.putAll(target.files);
-            Command(new ServerExchangeUnit_2021(ServerCode.Email, "", part));
-        }
+        return false;
     }
 }
diff --git a/src/_VisualDVM/Passes/All/EditAccount.java b/src/_VisualDVM/Passes/All/EditAccount.java
index da6e70ac..e4cd744c 100644
--- a/src/_VisualDVM/Passes/All/EditAccount.java
+++ b/src/_VisualDVM/Passes/All/EditAccount.java
@@ -7,7 +7,6 @@ import _VisualDVM.Repository.Subscribes.Subscriber;
 import _VisualDVM.Repository.Subscribes.UI.SubscriberDialog;
 
 import javax.swing.*;
-import java.util.Vector;
 public class EditAccount extends Email {
     public String name;
     public String email;
@@ -29,10 +28,11 @@ public class EditAccount extends Email {
             }
             name = res.name;
             email = res.address;
-            Vector<String> rec = new Vector<>();
-            rec.add(email);
             password = String.valueOf(getRandomIntegerBetweenRange(1111, 9999));
-            return super.canStart(new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(name), password, rec));
+            return super.canStart(
+                    new EmailMessage("Код подтверждения визуализатора для: " + Utils_.Brackets(name), password),
+                    email
+            );
         }
         return false;
     }
diff --git a/src/_VisualDVM/Passes/All/Email.java b/src/_VisualDVM/Passes/All/Email.java
index 823891b1..f4b3cf5c 100644
--- a/src/_VisualDVM/Passes/All/Email.java
+++ b/src/_VisualDVM/Passes/All/Email.java
@@ -4,10 +4,11 @@ import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 public class Email extends ComponentsRepositoryPass<EmailMessage> {
-    //этот емейл только для клиента. все что он делает отправляет на сервер то. что нужно отправить.
+    protected String address;
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (EmailMessage) args[0];
+        address = (String) args[1];
         return true;
     }
     @Override
@@ -16,6 +17,6 @@ public class Email extends ComponentsRepositoryPass<EmailMessage> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.Email, "", target));
+        Command(new ServerExchangeUnit_2021(ServerCode.Email, address, target));
     }
 }
diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index d1bd5f47..683c28e1 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -52,9 +52,10 @@ public class PublishBugReport extends Pass<BugReport> {
         Global.mainModule.getPass(PassCode.SendBugReport).Do();
         Global.componentsServer.db.Update(target);
         //3- рассылка
-        EmailMessage message = new EmailMessage("Обнаружена ошибка " + Utils_.Brackets(target.id),
-                target.getNewMailText(),
-                target.getRecipients());
+        EmailMessage message = new EmailMessage(
+                "Обнаружена ошибка " + Utils_.Brackets(target.id),
+                target.getNewMailText()
+        );
         if (!target.project_version.isEmpty()) {
             message.addAttachement(target.getArchiveFile());
             //со скринами будет небольшой трабл. потому что теретически возможна ситуация,
@@ -64,7 +65,9 @@ public class PublishBugReport extends Pass<BugReport> {
                     message.addAttachement(screen);
             }
         }
-        Global.mainModule.getPass(PassCode.CheckedEmail).Do(message);
+        for (String address: target.getRecipients()) {
+            Global.mainModule.getPass(PassCode.CheckedEmail).Do(message, address);
+        }
     }
     @Override
     protected void showDone() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java
index 33136e9d..67ca0527 100644
--- a/src/_VisualDVM/Passes/All/PublishComponent.java
+++ b/src/_VisualDVM/Passes/All/PublishComponent.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.AccountRole;
 import _VisualDVM.Passes.PassCode;
@@ -11,6 +12,7 @@ import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.RepositoryServer;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
+import _VisualDVM.Repository.Subscribes.Subscriber;
 
 import java.util.Date;
 import java.util.Vector;
@@ -104,11 +106,25 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
                     Utils_.DQuotes(target.getComponentType().getDescription()));
             EmailMessage message =
                     new EmailMessage(version_mail_header,
-                            f.Result,
-                            new Vector<>(Global.componentsServer.db.subscribers.Data.keySet()));
+                            f.Result
+                    );
             if (f.fields.cbForceMail.isSelected())
                 message.addAttachement(target.getFile());
-            Global.mainModule.getPass(PassCode.CheckedEmail).Do(message);
+            //--
+            Vector<String> mails = new Vector<>();
+            //--
+            for (Subscriber subscriber : Global.componentsServer.db.subscribers.Data.values()) {
+                if ((subscriber.mailOn != 0) && !mails.contains(subscriber.address))
+                    mails.add(subscriber.address);
+            }
+            for (String admin_mail : Constants.admins_mails) {
+                if (!mails.contains(admin_mail))
+                    mails.add(admin_mail);
+            }
+            //--
+            for (String mail : mails) {
+                Global.mainModule.getPass(PassCode.Email).Do(message, mail);
+            }
             //---
             if (target.getComponentType().equals(ComponentType.Sapfor_F) && f.fields.cbAssemblyOnServer.isSelected()) {
                 Global.mainModule.getUI().getMainWindow().FocusTesting();
diff --git a/src/_VisualDVM/Passes/All/UpdateBugReportField.java b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
index 6a412911..018d5bd5 100644
--- a/src/_VisualDVM/Passes/All/UpdateBugReportField.java
+++ b/src/_VisualDVM/Passes/All/UpdateBugReportField.java
@@ -121,11 +121,13 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
                     message_header += "состояние изменилось на " + Utils_.Brackets(target.state.getDescription());
                     break;
             }
-            Global.mainModule.getPass(PassCode.CheckedEmail).Do(
-                    new EmailMessage(message_header,
-                            message_text,
-                            target.getRecipients())
+            EmailMessage message = new EmailMessage(
+                    message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
+                    message_text
             );
+            for (String address : target.getRecipients()) {
+                Global.mainModule.getPass(PassCode.CheckedEmail).Do(message, address);
+            }
         }
     }
 }
diff --git a/src/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/Repository/BugReport/BugReport.java
index 9226d057..cfbe5393 100644
--- a/src/_VisualDVM/Repository/BugReport/BugReport.java
+++ b/src/_VisualDVM/Repository/BugReport/BugReport.java
@@ -3,6 +3,7 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Objects.rDBObject;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.Component.ComponentType;
 import _VisualDVM.Repository.Component.ComponentsSet;
@@ -89,8 +90,14 @@ public class BugReport extends rDBObject {
         for (String a : data)
             if (a.length() > 0)
                 res.add(a);
+        //всегда добавляем себя и админов--
         if (!res.contains(Global.mainModule.getAccount().email))
             res.add(Global.mainModule.getAccount().email);
+        for (String address: Constants.admins_mails) {
+            if (!res.contains(address))
+            res.add(address);
+        }
+        //---------------------------------
         return res;
     }
     public File getArchiveFile() {
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 1587cd3c..baab2c99 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/Repository/Component/Visualiser.java
@@ -61,7 +61,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1122;
+        version = 1123;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/Repository/EmailMessage.java b/src/_VisualDVM/Repository/EmailMessage.java
index 8a0184ab..64044511 100644
--- a/src/_VisualDVM/Repository/EmailMessage.java
+++ b/src/_VisualDVM/Repository/EmailMessage.java
@@ -4,18 +4,20 @@ import Common.Utils.Utils_;
 import java.io.File;
 import java.io.Serializable;
 import java.util.LinkedHashMap;
-import java.util.Vector;
 public class EmailMessage implements Serializable {
     public String subject = ""; //тема письма
     public String text = ""; //текст письма
-    public Vector<String> targets = new Vector<>(); //адресаты
     public LinkedHashMap<String, byte[]> files = new LinkedHashMap<>(); //вложения.
     public EmailMessage() {
     }
-    public EmailMessage(String subject_in, String text_in, Vector<String> targets_in) {
+    public EmailMessage(String subject_in, String text_in) {
         subject = subject_in;
         text = text_in;
-        targets.addAll(targets_in);
+    }
+    public EmailMessage(EmailMessage message_in) {
+        subject = message_in.subject;
+        text = message_in.text;
+        files.putAll(message_in.files);
     }
     public void addAttachement(File f) throws Exception {
         files.put(f.getName(), Utils_.fileToBytes(f));
diff --git a/src/_VisualDVM/Repository/RepositoryServer.java b/src/_VisualDVM/Repository/RepositoryServer.java
index 00998262..6c0096ed 100644
--- a/src/_VisualDVM/Repository/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/RepositoryServer.java
@@ -83,10 +83,7 @@ public abstract class RepositoryServer<D extends Database> {
             ex.printStackTrace();
         }
     }
-    protected void checkTargets(EmailMessage message_in) {
-    }
-    public void Email(EmailMessage message_in, File... directAttachements) throws Exception {
-        checkTargets(message_in);
+    public void Email(EmailMessage message_in, String address_in) throws Exception {
         Thread thread = new Thread(() -> {
             try {
                 Properties props = new Properties();
@@ -115,45 +112,34 @@ public abstract class RepositoryServer<D extends Database> {
                                         Constants.MailPassword);
                             }
                         });
-                for (String target : message_in.targets) {
-                    boolean done = false;
-                    int attempts = 5;
-                    while (!done && (attempts > 0)) {
-                        try {
-                            MimeMessage message = new MimeMessage(session);
-                            message.setFrom(new InternetAddress(Constants.MailAddress));
-                            message.setRecipients(Message.RecipientType.CC, InternetAddress.parse(target));
-                            message.setSubject(message_in.subject);
-                            Multipart multipart = new MimeMultipart();
-                            MimeBodyPart textBodyPart = new MimeBodyPart();
-                            textBodyPart.setText(message_in.text);
-                            multipart.addBodyPart(textBodyPart);
-                            for (String aName : innerFiles.keySet()) {
-                                MimeBodyPart attachmentBodyPart = new MimeBodyPart();
-                                DataSource source = new FileDataSource(innerFiles.get(aName));
-                                attachmentBodyPart.setDataHandler(new DataHandler(source));
-                                attachmentBodyPart.setFileName(aName);
-                                multipart.addBodyPart(attachmentBodyPart);
-                            }
-                            for (File f : directAttachements) {
-                                if (f.exists()) {
-                                    MimeBodyPart attachmentBodyPart = new MimeBodyPart();
-                                    DataSource source = new FileDataSource(f);
-                                    attachmentBodyPart.setDataHandler(new DataHandler(source));
-                                    attachmentBodyPart.setFileName(f.getName());
-                                    multipart.addBodyPart(attachmentBodyPart);
-                                }
-                            }
-                            message.setContent(multipart);
-                            Transport.send(message);
-                            done = true;
-                        } catch (Exception ex) {
-                            System.out.println("Исключение во время отправки сообщения абоненту " + Utils_.Brackets(target));
-                            ex.printStackTrace();
-                            Utils_.sleep(1000);
-                        } finally {
-                            attempts--;
+                boolean done = false;
+                int attempts = 5;
+                while (!done && (attempts > 0)) {
+                    try {
+                        MimeMessage message = new MimeMessage(session);
+                        message.setFrom(new InternetAddress(Constants.MailAddress));
+                        message.setRecipients(Message.RecipientType.CC, InternetAddress.parse(address_in));
+                        message.setSubject(message_in.subject);
+                        Multipart multipart = new MimeMultipart();
+                        MimeBodyPart textBodyPart = new MimeBodyPart();
+                        textBodyPart.setText(message_in.text);
+                        multipart.addBodyPart(textBodyPart);
+                        for (String aName : innerFiles.keySet()) {
+                            MimeBodyPart attachmentBodyPart = new MimeBodyPart();
+                            DataSource source = new FileDataSource(innerFiles.get(aName));
+                            attachmentBodyPart.setDataHandler(new DataHandler(source));
+                            attachmentBodyPart.setFileName(aName);
+                            multipart.addBodyPart(attachmentBodyPart);
                         }
+                        message.setContent(multipart);
+                        Transport.send(message);
+                        done = true;
+                    } catch (Exception ex) {
+                        System.out.println("Исключение во время отправки сообщения абоненту " + Utils_.Brackets(address_in));
+                        ex.printStackTrace();
+                        Utils_.sleep(1000);
+                    } finally {
+                        attempts--;
                     }
                 }
             } catch (Exception ex) {
@@ -224,7 +210,7 @@ public abstract class RepositoryServer<D extends Database> {
                                     break;
                                 case Email:
                                     Print("Отправка сообщения электронной почты");
-                                    Email((EmailMessage) request.object);
+                                    Email((EmailMessage) request.object, request.arg);
                                     response = new ServerExchangeUnit_2021(ServerCode.OK);
                                     break;
                                 //</editor-fold>
diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java
index f4647e30..5df7c660 100644
--- a/src/_VisualDVM/Repository/Server/ComponentsServer.java
+++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java
@@ -2,6 +2,7 @@ package _VisualDVM.Repository.Server;
 import Common.Database.Objects.DBObject;
 import Common.Database.RepositoryRefuseException;
 import Common.Utils.Utils_;
+import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.Account;
 import _VisualDVM.GlobalData.Machine.Machine;
@@ -85,10 +86,12 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                         if (rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
                             EmailMessage message = new EmailMessage(
                                     "db backup",
-                                    "копия баз данных журнала ошибок",
-                                    new Vector<>()
+                                    "копия баз данных журнала ошибок"
                             );
-                            Email(message, db.getFile());
+                            message.addAttachement(db.getFile());
+                            for (String address : Constants.admins_mails) {
+                                Email(message, address);
+                            }
                         }
                     }
                 }
@@ -107,21 +110,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         return Global.properties.ComponentsServerPort;
     }
     @Override
-    protected void checkTargets(EmailMessage message_in) {
-        System.out.println("unckeched targets = "+String.join(" ", message_in.targets));
-        Vector<String> checkedTargets = new Vector<>();
-        for (String email : message_in.targets) {
-            if (db.subscribers.containsKey(email)) {
-                Subscriber subscriber = db.subscribers.get(email);
-                if (subscriber.mailOn > 0) {
-                    checkedTargets.add(email);
-                }
-            } else checkedTargets.add(email); //если почта не зарегана значит это мейл с регистрацией.
-        }
-        message_in.targets = checkedTargets;
-        System.out.println("checked targets = "+String.join(" ", message_in.targets));
-    }
-    @Override
     public void afterDeleteAction(DBObject object) throws Exception {
         if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;
@@ -134,10 +122,11 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         if (Global.properties.EmailAdminsOnStart) {
             EmailMessage message = new EmailMessage(
                     "Сервер Sapfor запущен",
-                    new Date().toString(),
-                    new Vector<>()
+                    new Date().toString()
             );
-            Email(message);
+            for (String address:Constants.admins_mails) {
+                Email(message, address);
+            }
         }
     }
     @Override
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index a56838bc..276d7b7b 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -88,5 +88,6 @@ public enum ServerCode {
     GetSapforForCompilation,
     GetMaxSapforVersion,
     PerformAutoSapforTesting,
+    Email_new
     ;
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
index 79780251..a8f28c28 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
@@ -107,8 +107,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
             message.subject = "Состояние пакета тестирования " + packageDescription() + " " +
                     Utils_.Brackets(testingPackage.id) + " изменилось на " + Utils_.Brackets(testingPackage.state.getDescription());
             message.text = testingPackage.description;
-            message.targets.add(testingPackage.sender_address);
-            ServerCommand(ServerCode.Email, message);
+            ServerCommand(ServerCode.Email, testingPackage.sender_address, message);
         }
     }
     //---
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 874fbbaa..c3c3f722 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -262,13 +262,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 EmailMessage message = Log.isEmpty() ?
                         new EmailMessage(
                                 "Запущено автоматическое тестирование версии " + request.arg + " системы SAPFOR",
-                                "Пакет " + Utils_.Brackets(autoPackage.id), new Vector<>()) :
+                                "Пакет " + Utils_.Brackets(autoPackage.id)) :
                         new EmailMessage(
                                 "Не удалось запустить автоматическое тестирование версии " + request.arg + " системы SAPFOR",
-                                Log.toString(),
-                                new Vector<>()
+                                Log.toString()
                         );
-                Email(message);
+                for (String address: Constants.admins_mails){
+                    Email(message, address);
+                }
                 break;
             case DownloadTest:
                 Print("Отправить клиенту тест " + request.arg);
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index ffa18691..717cfd71 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -24,7 +24,6 @@ import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.Date;
-import java.util.Vector;
 public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     File workspace;
     ServerSapfor sapfor;
@@ -320,12 +319,13 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         //-
         EmailMessage message = new EmailMessage(
                 "Выполнена сборка системы SAPFOR",
-                "Версия: " + version_s + "\n" + "Статус: " + status,
-                new Vector<>()
+                "Версия: " + version_s + "\n" + "Статус: " + status
         );
         message.addAttachement(out);
         message.addAttachement(err);
         //-
-        ServerCommand(ServerCode.Email, "", message);
+        for (String address : Constants.admins_mails) {
+            ServerCommand(ServerCode.Email, address, message);
+        }
     }
 }
diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java
index 98a3fd04..81271fd1 100644
--- a/src/_VisualDVM/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -777,13 +777,5 @@ public class Utils {
         System.out.println(new Date(dates.lastElement()));
         return dates.firstElement();
     }
-    public static void addDefaultMails(Vector<String> mails) {
-        if (!mails.contains(Constants.MailAddress))
-            mails.add(Constants.MailAddress);
-        for (String mail : Constants.admins_mails) {
-            if (!mails.contains(mail))
-                mails.add(mail);
-        }
-    }
 }