no message

This commit is contained in:
2025-02-04 19:28:38 +03:00
parent 7855ce62a4
commit e1fc740321
4 changed files with 22 additions and 14 deletions

5
.idea/workspace.xml generated
View File

@@ -7,8 +7,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.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/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

View File

@@ -1,11 +1,12 @@
package _VisualDVM.Passes.All; package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD; import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.Repository.EmailMessage; import _VisualDVM.Repository.EmailMessage;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import java.util.Vector; import java.util.Vector;
public class Email extends ComponentsRepositoryPass_OLD<EmailMessage> { public class Email extends ComponentsServerPass<EmailMessage> {
Vector<String> recipients; Vector<String> recipients;
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
@@ -28,17 +29,8 @@ public class Email extends ComponentsRepositoryPass_OLD<EmailMessage> {
return false; return false;
} }
@Override @Override
protected int getTimeout() { protected void body() throws Exception {
return 0; SendRequest(ServerCode.EmailBroadcast, String.join("\n",recipients), target);
}
@Override
protected void ServerAction() throws Exception {
int i = 0;
for (String address : recipients) {
ShowProgress(recipients.size(), i, true);
Command(new ServerExchangeUnit_2021(ServerCode.Email, address, target));
++i;
}
} }
} }

View File

@@ -224,6 +224,9 @@ public abstract class RepositoryServer<D extends Database> {
Email((EmailMessage) request.object, request.arg); Email((EmailMessage) request.object, request.arg);
response = new ServerExchangeUnit_2021(ServerCode.OK); response = new ServerExchangeUnit_2021(ServerCode.OK);
break; break;
case EmailBroadcast:
EmailBroadcast();
break;
//</editor-fold> //</editor-fold>
//<editor-fold desc="Главная база данных"> //<editor-fold desc="Главная база данных">
case CheckObjectExistense: case CheckObjectExistense:
@@ -321,6 +324,15 @@ public abstract class RepositoryServer<D extends Database> {
} }
} }
} }
private void EmailBroadcast() throws Exception{
String [] packed = request.arg.split("\n");
for (String address: packed){
if (!address.isEmpty()){
Email((EmailMessage) request.object, address);
}
}
response = new ServerExchangeUnit_2021(ServerCode.OK);
}
//-- //--
protected Database getDefaultDatabase() { protected Database getDefaultDatabase() {
return db; return db;

View File

@@ -15,6 +15,7 @@ public enum ServerCode {
AppendBugReportTextField, AppendBugReportTextField,
//- //-
Email, Email,
EmailBroadcast,
ReceiveAllArchives, ReceiveAllArchives,
//- //-
DownloadTest, DownloadTest,
@@ -111,6 +112,8 @@ public enum ServerCode {
return "Получение журнала изменений компонента с сервера"; return "Получение журнала изменений компонента с сервера";
case CheckURLRegistered: case CheckURLRegistered:
return "Проверка регистрации машины на сервере"; return "Проверка регистрации машины на сервере";
case EmailBroadcast:
return "Рассылка";
default: default:
return this.toString(); return this.toString();
} }