no message

This commit is contained in:
2025-02-05 19:30:16 +03:00
parent 68c21c6955
commit 905a31da1f
5 changed files with 22 additions and 27 deletions

4
.idea/workspace.xml generated
View File

@@ -7,9 +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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.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/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.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/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
</list> </list>

View File

@@ -18,7 +18,7 @@
"collapseProjectTrees": false, "collapseProjectTrees": false,
"EditorFontSize": 17, "EditorFontSize": 17,
"ComponentsWindowWidth": 929, "ComponentsWindowWidth": 929,
"ComponentsWindowHeight": 300, "ComponentsWindowHeight": 250,
"Kernels": 8, "Kernels": 8,
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe", "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,

View File

@@ -2,11 +2,20 @@ package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Server.ComponentsServerPass; 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 java.util.Vector; import java.util.Vector;
public class Email extends ComponentsServerPass<EmailMessage> { public class Email extends ComponentsServerPass<EmailMessage> {
Vector<String> recipients; Vector<String> recipients;
@Override @Override
protected boolean requestNeedsAnimation() {
return false;
}
@Override
protected boolean needsAnimation() {
return true;
}
@Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
recipients = null; recipients = null;
if (args.length<=1) { if (args.length<=1) {
@@ -28,7 +37,12 @@ public class Email extends ComponentsServerPass<EmailMessage> {
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
SendRequest(ServerCode.EmailBroadcast, String.join("\n",recipients), target); int i = 0;
for (String address : recipients) {
ShowProgress(recipients.size(), i, true);
SendRequest(ServerCode.Email, address, target,0);
++i;
}
} }
} }

View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1143; version = 1144;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

View File

@@ -103,9 +103,9 @@ public abstract class RepositoryServer<D extends Database> {
props.put("mail.smtp.port", String.valueOf(Constants.SMTPPort)); props.put("mail.smtp.port", String.valueOf(Constants.SMTPPort));
props.put("mail.smtp.socketFactory.port", String.valueOf(Constants.MailSocketPort)); props.put("mail.smtp.socketFactory.port", String.valueOf(Constants.MailSocketPort));
props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
props.put("mail.smtp.connectiontimeout", String.valueOf(Global.properties.SocketTimeout)); props.put("mail.smtp.connectiontimeout", String.valueOf(15000));
props.put("mail.smtp.timeout", String.valueOf(Global.properties.SocketTimeout)); props.put("mail.smtp.timeout", String.valueOf(15000));
props.put("mail.smtp.writetimeout", String.valueOf(Global.properties.SocketTimeout)); props.put("mail.smtp.writetimeout", String.valueOf(15000));
//------------------------------ //------------------------------
LinkedHashMap<String, File> innerFiles = new LinkedHashMap<>(); LinkedHashMap<String, File> innerFiles = new LinkedHashMap<>();
for (String aName : message_in.files.keySet()) { for (String aName : message_in.files.keySet()) {
@@ -123,9 +123,6 @@ public abstract class RepositoryServer<D extends Database> {
Constants.MailPassword); Constants.MailPassword);
} }
}); });
boolean done = false;
int attempts = 5;
while (!done && (attempts > 0)) {
try { try {
MimeMessage message = new MimeMessage(session); MimeMessage message = new MimeMessage(session);
message.setFrom(new InternetAddress(Constants.MailAddress)); message.setFrom(new InternetAddress(Constants.MailAddress));
@@ -144,14 +141,10 @@ public abstract class RepositoryServer<D extends Database> {
} }
message.setContent(multipart); message.setContent(multipart);
Transport.send(message); Transport.send(message);
done = true;
} catch (Exception ex) { } catch (Exception ex) {
System.out.println("Исключение во время отправки сообщения абоненту " + Utils_.Brackets(address_in)); System.out.println("Исключение во время отправки сообщения абоненту " + Utils_.Brackets(address_in));
ex.printStackTrace(); ex.printStackTrace();
Utils_.sleep(1000); Utils_.sleep(1000);
} finally {
attempts--;
}
} }
} catch (Exception ex) { } catch (Exception ex) {
System.out.println("Исключение во время выполнения рассылки."); System.out.println("Исключение во время выполнения рассылки.");
@@ -223,9 +216,6 @@ 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:
@@ -326,15 +316,6 @@ 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;