рефактиринг рассылки.v++

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

src/_VisualDVM/Repository/Server/ServerCode.java

@@ -88,5 +88,6 @@ public enum ServerCode {
     GetSapforForCompilation,
     GetMaxSapforVersion,
     PerformAutoSapforTesting,
+    Email_new
     ;
 }