From 94cf1b384109a43dc391679fc0b0f3df6a5a611e Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 20 Nov 2023 23:10:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BE=D1=82=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BA=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=BE=20=D0=BF=D0=BE=D1=87=D1=82?=
 =?UTF-8?q?=D0=B5.=20=D1=83=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=87=D0=B8=D1=81=D0=BB=D0=BE=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=B4=D0=BE=205?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                         |  5 +-
 src/Repository/RepositoryServer.java        | 60 ++++++++++++---------
 src/TestingSystem/Common/TestingServer.java |  3 +-
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index df5c4ab3..744657e1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,8 @@
   <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/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index 8c68e20c..64d0e2c1 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -118,37 +118,45 @@ public abstract class RepositoryServer<D extends Database> {
                     System.out.println("target=" + target);
                     if (needsEmail(target)) {
                         System.out.println("needs email");
-                        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()) {
+                        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(f);
+                                    DataSource source = new FileDataSource(innerFiles.get(aName));
                                     attachmentBodyPart.setDataHandler(new DataHandler(source));
-                                    attachmentBodyPart.setFileName(f.getName());
+                                    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);
+                                System.out.println("message sent");
+                                done = true;
+                            } catch (Exception ex) {
+                                System.out.println("Исключение во время отправки сообщения абоненту " + Utils.Brackets(target));
+                                ex.printStackTrace();
+                                Utils.sleep(1000);
+                            } finally {
+                                attempts--;
                             }
-                            message.setContent(multipart);
-                            Transport.send(message);
-                            System.out.println("message sent");
-                        } catch (Exception ex) {
-                            System.out.println("Исключение во время отправки сообщения абоненту " + Utils.Brackets(target));
-                            ex.printStackTrace();
                         }
                     } else System.out.println("does not need email");
                 }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index e46c09fd..a9cddf4f 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -247,8 +247,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Vector<String> assembly_info = (Vector<String>) request.object;
                 File out = Paths.get(Global.RepoDirectory.getAbsolutePath(), Constants.SAPFOR_REPOSITORY_BIN, Constants.out_file).toFile();
                 File err = Paths.get(Global.RepoDirectory.getAbsolutePath(), Constants.SAPFOR_REPOSITORY_BIN, Constants.err_file).toFile();
-                Vector<String> targets = new Vector<>();//Arrays.asList(Global.admins_mails));
-                targets.add("vmk-post@yandex.ru");
+                Vector<String> targets = new Vector<>(Arrays.asList(Global.admins_mails));
                 EmailMessage message = new EmailMessage(
                         "Выполнена сборка системы SAPFOR",
                         "Версия: " + assembly_info.get(0) + "\n" + "Статус: " + assembly_info.get(1),