From 9687dc9f29bb1ae80b684172bd0574ea95201894 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 29 Mar 2024 01:39:14 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BB=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BE=D0=BC=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=82=20=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=BE?=
 =?UTF-8?q?=D0=B2.=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81?=
 =?UTF-8?q?=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 12 ++---
 .../Passes/All/PingComponentsServer.java      | 38 +++++++++++++
 .../Passes/All/PublishComponentsServer.java   | 53 +++++++++++++++++++
 .../Passes/All/RemoteSingleCommand.java       |  5 +-
 .../Passes/All/ShutdownComponentsServer.java  | 29 ++++++++++
 .../Passes/All/StartComponentsServer.java     | 32 +++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java | 18 ++++++-
 src/Visual_DVM_2021/UI/Main/CallbackForm.form |  8 +++
 src/Visual_DVM_2021/UI/Main/CallbackForm.java | 22 ++++++++
 9 files changed, 208 insertions(+), 9 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/PingComponentsServer.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/StartComponentsServer.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1f60e4f8..4fbad644 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestingServer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartComponentsServer.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/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShutdownTestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TestingServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/RepositoryServerSSHPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/CallbackForm.form" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java b/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java
new file mode 100644
index 00000000..51c06927
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/PingComponentsServer.java
@@ -0,0 +1,38 @@
+package Visual_DVM_2021.Passes.All;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import Visual_DVM_2021.Passes.Server.ComponentsRepositoryPass;
+import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+
+import java.net.ConnectException;
+public class PingComponentsServer extends ComponentsRepositoryPass {
+    boolean flag;
+    boolean silent;
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        flag = false;
+        silent = args.length > 0 ? (boolean) args[0] : false;
+        return super.canStart(args);
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.Ping));
+        flag = true;
+    }
+    @Override
+    protected boolean validate() {
+        return flag;
+    }
+    @Override
+    protected void CheckException(Exception ex) {
+        if (silent) {
+            Throwable cause = getCauseRec(ex);
+            if ((cause instanceof ConnectException) && cause.getMessage().contains("Connection refused: connect")) {
+                //так как это пинг, игнорируем.
+                System.out.println("Server inactive");
+                return;
+            }
+        }
+        super.CheckException(ex);
+    }
+}
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java b/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java
new file mode 100644
index 00000000..f173f390
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/PublishComponentsServer.java
@@ -0,0 +1,53 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import Common.Utils.Utils;
+import GlobalData.RemoteFile.RemoteFile;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.PassException;
+import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
+
+import java.io.File;
+public class PublishComponentsServer extends RepositoryServerSSHPass {
+    @Override
+    protected String getServerFileName() {
+        return "VisualSapfor.jar";
+    }
+    @Override
+    protected String getServerHomeName() {
+        return "_sapfor_x64";
+    }
+    @Override
+    public String getIconPath() {
+        return "/icons/Publish.png";
+    }
+    //1. остановить сервер.
+    //2. заменить файл сервера на компонент визуализатора. переименовать его.
+    //3. запустить сервер.
+    @Override
+    protected void ServerAction() throws Exception {
+        if (passes.get(PassCode_2021.PingComponentsServer).Do(true))
+            ShutdownServer();
+        if (passes.get(PassCode_2021.PingComponentsServer).Do(true)) {
+            throw new PassException("Не удалось остановить сервер.");
+        }
+        File src = Global.visualiser.getFile();
+        //-
+        RemoteFile dst = new RemoteFile(serverHome, getServerFileName());
+        user.connection.tryRM(dst);
+        user.connection.putSingleFile(src, dst);
+        //-
+
+        StartServer();
+        System.out.println("userHome=" + Utils.Brackets(userHome.full_name));
+        System.out.println("testingHome=" + Utils.Brackets(serverHome.full_name));
+    }
+    @Override
+    protected boolean validate() {
+
+        if (!passes.get(PassCode_2021.PingComponentsServer).Do(true)) {
+            Log.Writeln_("Не удалось запустить сервер.");
+        }
+        return true;
+    }
+}
+
diff --git a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
index db957673..f59cf658 100644
--- a/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
+++ b/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java
@@ -15,9 +15,10 @@ public class RemoteSingleCommand extends CurrentConnectionPass<String> {
     @Override
     protected void ServerAction() throws Exception {
         RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), Utils.getDateName("out"));
-        user.connection.ShellCommand(command+" 1>"+Utils.DQuotes(file.full_name));
-        if (user.connection.Exists(file)){
+        user.connection.ShellCommand(command + " 1>" + Utils.DQuotes(file.full_name));
+        if (user.connection.Exists(file)) {
             target = user.connection.readFromFile(file);
+            user.connection.sftpChannel.rm(file.full_name);
         }
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java b/src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java
new file mode 100644
index 00000000..9c32c794
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/ShutdownComponentsServer.java
@@ -0,0 +1,29 @@
+package Visual_DVM_2021.Passes.All;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
+public class ShutdownComponentsServer extends RepositoryServerSSHPass {
+    @Override
+    protected String getServerFileName() {
+        return  "VisualSapfor.jar";
+    }
+    @Override
+    protected String getServerHomeName() {        return "_sapfor_x64";
+    }
+    @Override
+    public String getIconPath() {
+        return "/icons/Stop25.png";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (passes.get(PassCode_2021.PingTestingServer).Do(true)){
+            return true;
+        }else {
+            Log.Writeln_("Сервер уже неактивен!");
+            return false;
+        }
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        ShutdownServer();
+    }
+}
\ No newline at end of file
diff --git a/src/Visual_DVM_2021/Passes/All/StartComponentsServer.java b/src/Visual_DVM_2021/Passes/All/StartComponentsServer.java
new file mode 100644
index 00000000..3a654192
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/StartComponentsServer.java
@@ -0,0 +1,32 @@
+package Visual_DVM_2021.Passes.All;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.SSH.RepositoryServerSSHPass;
+public class StartComponentsServer extends RepositoryServerSSHPass {
+    @Override
+    public String getIconPath() {
+        return "/icons/GreenStart.png";
+    }
+    @Override
+    protected String getServerHomeName() {return "_sapfor_x64"; }
+    @Override
+    protected String getServerFileName() {
+        return "VisualSapfor.jar";
+    }
+    //--
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (passes.get(PassCode_2021.PingComponentsServer).Do(true)) {
+            Log.Writeln_("Сервер уже активен!");
+            return false;
+        }
+        return true;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        StartServer();
+    }
+    @Override
+    protected boolean validate() {
+        return passes.get(PassCode_2021.PingComponentsServer).Do();
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 9997e03f..321c9eb0 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -326,13 +326,29 @@ public enum PassCode_2021 {
     PingTestingServer,
     ShutdownTestingServer,
     StartTestingServer,
-    SPF_InsertImplicitNone,
     PublishTestingServer,
+    //---
+    PingComponentsServer,
+    ShutdownComponentsServer,
+    StartComponentsServer,
+    PublishComponentsServer,
+    //---
+    SPF_InsertImplicitNone,
     ;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            //--
+            case PublishComponentsServer:
+                return "Опубликовать сервер компонент и отчётов об ошибках";
+            case PingComponentsServer:
+                return "Проверить активносто сервера компонент и отчётов об ошибках";
+            case StartComponentsServer:
+                return "Запустить сервер компонент и отчётов об ошибках";
+            case ShutdownComponentsServer:
+                return "Остановить сервер компонент и отчётов об ошибках";
+            //--
             case PublishTestingServer:
                 return "Опубликовать тестовый сервер.";
             case SPF_InsertImplicitNone:
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.form b/src/Visual_DVM_2021/UI/Main/CallbackForm.form
index 63d5d9f6..fbb4e868 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.form
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.form
@@ -92,6 +92,14 @@
               <text value="    "/>
             </properties>
           </component>
+          <component id="a77b0" class="javax.swing.JLabel" binding="adminLabel">
+            <constraints/>
+            <properties>
+              <font name="Times New Roman" size="16" style="2"/>
+              <foreground color="-16777216"/>
+              <text value="управление сервером "/>
+            </properties>
+          </component>
         </children>
       </toolbar>
       <grid id="3838e" binding="accountPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
diff --git a/src/Visual_DVM_2021/UI/Main/CallbackForm.java b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
index d51d5c0f..22f0d884 100644
--- a/src/Visual_DVM_2021/UI/Main/CallbackForm.java
+++ b/src/Visual_DVM_2021/UI/Main/CallbackForm.java
@@ -121,6 +121,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
     private JTextField BugReportsCommentFilter;
     public JSplitPane SC67;
     private JPanel workspacesPanel;
+    private JLabel adminLabel;
     private Viewer BugReportSettings;
     public void LockMyOnly() {
         if (!BugReportsMyOnlyFilter.isSelected()) {
@@ -271,6 +272,11 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
             BugReportInterface.filterOpenedOnly = BugReportsOpenedOnly.isSelected();
             ShowBugReports();
         });
+        //-
+        accountTools.addSeparator();
+        accountTools.add(Pass_2021.passes.get(PassCode_2021.StartComponentsServer).createButton());
+        accountTools.add(Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).createButton());
+        accountTools.add(Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).createButton());
     }
     //-------------------------------------------
     DescriptionTabs descriptionTabs = new DescriptionTabs();
@@ -375,10 +381,15 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
         //
+        Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.StartComponentsServer).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).setControlsVisible(false);
+        //
         Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(false);
         UI.testingBar.showServerAdminLabel(false);
+        adminLabel.setVisible(false);
     }
     private void setDeveloperRights() {
         UnlockMyOnly();
@@ -390,10 +401,15 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(false);
         //
+        Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.StartComponentsServer).setControlsVisible(false);
+        Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).setControlsVisible(false);
+        //
         Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(false);
         Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(false);
         UI.testingBar.showServerAdminLabel(false);
+        adminLabel.setVisible(false);
     }
     @Override
     public void setAdminRights() {
@@ -405,11 +421,17 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
         Pass_2021.passes.get(PassCode_2021.DeleteSubscriberWorkspace).setControlsVisible(true);
         Pass_2021.passes.get(PassCode_2021.InstallServerSapfor).setControlsVisible(true);
         Pass_2021.passes.get(PassCode_2021.DeleteServerSapfor).setControlsVisible(true);
+        //
+        Pass_2021.passes.get(PassCode_2021.ShutdownComponentsServer).setControlsVisible(true);
+        Pass_2021.passes.get(PassCode_2021.StartComponentsServer).setControlsVisible(true);
+        Pass_2021.passes.get(PassCode_2021.PublishComponentsServer).setControlsVisible(true);
         //--
         Pass_2021.passes.get(PassCode_2021.ShutdownTestingServer).setControlsVisible(true);
         Pass_2021.passes.get(PassCode_2021.StartTestingServer).setControlsVisible(true);
         Pass_2021.passes.get(PassCode_2021.PublishTestingServer).setControlsVisible(true);
+        //--
         UI.testingBar.showServerAdminLabel(true);
+        adminLabel.setVisible(true);
     }
     @Override
     public void ShowAccount() {