M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправление бага с регистрацией. v++

Browse Source 
todo рефакторинг системы регистрации багов и прочего.
This commit is contained in:
02090095
2024-11-26 14:45:59 +03:00
parent 3add52b2b7
commit 18414e5c80
9 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -7,7 +7,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckedEmail.java" afterDir="false" />
<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$/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/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/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/_VisualDVM/Passes/All/AppendBugReportField.java
View File

@@ -80,7 +80,7 @@ public class AppendBugReportField extends ComponentsRepositoryPass<BugReport> {
message_text = target.comment;
break;
}
Global.mainModule.getPass(PassCode.Email).Do(
Global.mainModule.getPass(PassCode.CheckedEmail).Do(
new EmailMessage(
message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
message_text,

53
src/_VisualDVM/Passes/All/CheckedEmail.java Normal file
View File

@@ -0,0 +1,53 @@
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> {
//этот емейл только для клиента. все что он делает отправляет на сервер то. что нужно отправить.
@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 (subscriber.mailOn != 0) {
String[] data = target.split("@");
if (data.length > 0) {
String tname = data[0];
targetsNames.add(tname);
}
}
}
}
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));
}
}
}

35
src/_VisualDVM/Passes/All/Email.java
View File

@@ -1,15 +1,8 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
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 Email extends ComponentsRepositoryPass<EmailMessage> {
//этот емейл только для клиента. все что он делает отправляет на сервер то. что нужно отправить.
@Override
@@ -23,32 +16,6 @@ public class Email extends ComponentsRepositoryPass<EmailMessage> {
}
@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 (subscriber.mailOn != 0) {
String[] data = target.split("@");
if (data.length > 0) {
String tname = data[0];
targetsNames.add(tname);
}
}
}
}
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));
}
Command(new ServerExchangeUnit_2021(ServerCode.Email, "", target));
}
}

2
src/_VisualDVM/Passes/All/PublishBugReport.java
View File

@@ -64,7 +64,7 @@ public class PublishBugReport extends Pass<BugReport> {
message.addAttachement(screen);
}
}
Global.mainModule.getPass(PassCode.Email).Do(message);
Global.mainModule.getPass(PassCode.CheckedEmail).Do(message);
}
@Override
protected void showDone() throws Exception {

2
src/_VisualDVM/Passes/All/PublishComponent.java
View File

@@ -108,7 +108,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
new Vector<>(Global.componentsServer.db.subscribers.Data.keySet()));
if (f.fields.cbForceMail.isSelected())
message.addAttachement(target.getFile());
Global.mainModule.getPass(PassCode.Email).Do(message);
Global.mainModule.getPass(PassCode.CheckedEmail).Do(message);
//---
if (target.getComponentType().equals(ComponentType.Sapfor_F) && f.fields.cbAssemblyOnServer.isSelected()) {
Global.mainModule.getUI().getMainWindow().FocusTesting();

2
src/_VisualDVM/Passes/All/UpdateBugReportField.java
View File

@@ -121,7 +121,7 @@ public class UpdateBugReportField extends ComponentsRepositoryPass<BugReport> {
message_header += "состояние изменилось на " + Utils_.Brackets(target.state.getDescription());
break;
}
Global.mainModule.getPass(PassCode.Email).Do(
Global.mainModule.getPass(PassCode.CheckedEmail).Do(
new EmailMessage(message_header,
message_text,
target.getRecipients())

5
src/_VisualDVM/Passes/PassCode.java
View File

@@ -124,6 +124,7 @@ public enum PassCode implements PassCode_ {
SendBugReport,
DeleteDownloadedBugReports,
ExtractRecipients,
CheckedEmail,
Email,
//-
GetComponentsActualVersions,
@@ -356,6 +357,8 @@ public enum PassCode implements PassCode_ {
@Override
public String getDescription() {
switch (this) {
case Email:
return "Отправка по email";
case SPF_RemoveDistArraysFromIO:
return "Устранение конфликтов ввода вывода";
case StartSelectedSAPFORConfigurations:
@@ -745,7 +748,7 @@ public enum PassCode implements PassCode_ {
return "Отправка отчёта об ошибке на сервер";
case ExtractRecipients:
return "Извлечение адресатов";
case Email:
case CheckedEmail:
return "Отправка по email";
case GetComponentsActualVersions:
return "Получение актуальных версий компонент";

2
src/_VisualDVM/Repository/Component/Visualiser.java
View File

@@ -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 = 1121;
version = 1122;
String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime());