Merge branch 'develop'

YanSergey · May 22, 2024 · ece9056 · ece9056
2 parents f146c11 + 7a4e52b
commit ece9056
Show file tree

Hide file tree

Showing 57 changed files with 5,599 additions and 897 deletions.
diff --git a/.github/workflows/SonarCloud.yml b/.github/workflows/SonarCloud.yml
@@ -14,16 +14,16 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: ''
       - run: |
           git fetch --prune --unshallow
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Download and install Libs
         env:
@@ -42,7 +42,7 @@ jobs:
         run: >
           cd clusterAdminLibrary
 
-          mvn -B verify sonar:sonar
+          mvn -B verify -DskipTests sonar:sonar
           -Dsonar.projectKey=YanSergey_OneS_ClusterAdmin
           -Dsonar.projectName="OneS ClusterAdmin"
           -Dsonar.organization=yansergey

diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1

diff --git a/.github/workflows/build-macOS.yml b/.github/workflows/build-macOS.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1

diff --git a/README.md b/README.md
@@ -6,6 +6,9 @@
 
 ## Утилита для интерактивного администрирования серверов 1С
 
+![Donate](/clusterAdminLibrary/src/main/resources/icons/Rouble.png)
+Поддержать проект https://boosty.to/YanSergeyCoder
+
 Статья с описанием возможностей утилиты на Infostart https://infostart.ru/public/1489055/
 
 Разработка ведется в `Eclipse IDE for Java Developers`

diff --git a/clusterAdminApplication/pom.xml b/clusterAdminApplication/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>ru.yanygin</groupId>
 	<artifactId>ru.yanygin.clusterAdminApplication</artifactId>
-	<version>0.3.0</version>
+	<version>0.4.0</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -86,42 +86,42 @@
 		<dependency>
 		    <groupId>org.slf4j</groupId>
 		    <artifactId>slf4j-api</artifactId>
-		    <version>1.7.30</version>
+		    <version>2.0.13</version>
 		</dependency>
 
 		<!-- Logback -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<version>1.5.6</version>
 		</dependency>
 
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.2.3</version>
+			<version>1.5.6</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.eclipse.platform/org.eclipse.swt.win32.win32.x86_64 -->
 		<!-- https://mvnrepository.com/artifact/org.eclipse.platform/org.eclipse.swt.gtk.linux.x86_64 -->
 		<dependency>
 		    <groupId>org.eclipse.platform</groupId>
 		    <artifactId>${swt.artifactId}</artifactId>
-		    <version>3.116.0</version>
+		    <version>3.120.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.eclipse.platform/org.eclipse.jface -->
 		<dependency>
 			<groupId>org.eclipse.platform</groupId>
 			<artifactId>org.eclipse.jface</artifactId>
-			<version>3.22.0</version>
+			<version>3.22.100</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.6</version>
+			<version>2.10.1</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.jboss.netty/netty -->

diff --git a/clusterAdminApplication/scripts/echo_fast.bat b/clusterAdminApplication/scripts/echo_fast.bat
@@ -0,0 +1,10 @@
+# пока что каждый командный файл должен содержать строку chcp 65001
+
+@echo off
+chcp 65001
+echo server: %v8serverName%:%v8managerPort%
+echo password: %v8password%
+echo infobase: %v8infobase%
+echo username: %v8username%
+echo infobase1: %infobase1%
+echo end
diff --git a/clusterAdminApplication/scripts/echo_long.bat b/clusterAdminApplication/scripts/echo_long.bat
@@ -0,0 +1,9 @@
+# пока что каждый командный файл должен содержать строку chcp 65001
+
+@echo off
+chcp 65001
+#chcp
+ping 127.0.0.1 -n 20
+echo server: %v8serverName%:%v8managerPort%
+echo infobase: %v8infobase%
+echo end
diff --git a/clusterAdminApplication/scripts/Выгрузка_CF.bat b/clusterAdminApplication/scripts/Выгрузка_CF.bat
@@ -0,0 +1,2 @@
+chcp 65001
+"C:\Program Files\1cv8\common\1cestart.exe" DESIGNER /S %v8serverName%:%v8managerPort%\%v8infobase% /N Администратор /P 1234 /DumpCfg D:\DumpIB\%v8infobase%.cf
diff --git a/clusterAdminApplication/scripts/Выгрузка_DT.bat b/clusterAdminApplication/scripts/Выгрузка_DT.bat
@@ -0,0 +1,2 @@
+chcp 65001
+"C:\Program Files\1cv8\common\1cestart.exe" DESIGNER /S %v8serverName%:%v8managerPort%\%v8infobase% /N Администратор /P 1234 /DumpIB D:\DumpIB\%v8infobase%.dt
diff --git a/clusterAdminApplication/scripts/Запуск_Конфигуратор.bat b/clusterAdminApplication/scripts/Запуск_Конфигуратор.bat
@@ -0,0 +1,2 @@
+chcp 65001
+"C:\Program Files\1cv8\common\1cestart.exe" DESIGNER /S %v8serverName%:%v8managerPort%\%v8infobase% /N Администратор /P 1234
diff --git a/clusterAdminApplication/scripts/Запуск_Предприятие.bat b/clusterAdminApplication/scripts/Запуск_Предприятие.bat
@@ -0,0 +1,2 @@
+chcp 65001
+"C:\Program Files\1cv8\common\1cestart.exe" ENTERPRISE /S %v8serverName%:%v8managerPort%\%v8infobase% /N Администратор /P 1234
diff --git a/clusterAdminLibrary/.settings/org.eclipse.m2e.core.prefs b/clusterAdminLibrary/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
-activeProfiles=
+activeProfiles=windows-x86_64
 eclipse.preferences.version=1
 resolveWorkspaceProjects=true
 version=1
diff --git a/clusterAdminLibrary/pom.xml b/clusterAdminLibrary/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>ru.yanygin</groupId>
 	<artifactId>${artifactId}</artifactId>
-	<version>0.3.0-SNAPSHOT</version>
+	<version>0.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<properties>
@@ -87,50 +87,51 @@
 		<dependency>
 		    <groupId>org.eclipse.platform</groupId>
 		    <artifactId>${swt.artifactId}</artifactId>
-		    <version>3.116.0</version>
+		    <version>3.120.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.eclipse.platform/org.eclipse.swt -->
 		<dependency>
 		    <groupId>org.eclipse.platform</groupId>
 		    <artifactId>org.eclipse.swt</artifactId>
-		    <version>3.116.0</version>
+		    <version>3.120.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
 		<dependency>
 		    <groupId>org.junit.jupiter</groupId>
 		    <artifactId>junit-jupiter-api</artifactId>
-		    <version>5.8.2</version>
+		    <version>5.10.2</version>
 		    <scope>test</scope>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
 		<dependency>
 		    <groupId>org.slf4j</groupId>
 		    <artifactId>slf4j-api</artifactId>
-		    <version>1.7.30</version>
+		    <version>2.0.13</version>
 		</dependency>
 
 
-		<!-- Logback -->
+		<!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<version>1.5.6</version>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-core -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.2.3</version>
+			<version>1.5.6</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.eclipse.platform/org.eclipse.core.commands -->
 		<dependency>
 		    <groupId>org.eclipse.platform</groupId>
 		    <artifactId>org.eclipse.core.commands</artifactId>
-		    <version>3.9.800</version>
+		    <version>3.10.400</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.eclipse.platform/org.eclipse.equinox.common -->
@@ -169,7 +170,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.2</version>
+			<version>2.10.1</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.jboss.netty/netty -->
@@ -215,14 +216,14 @@
 		<dependency>
 		    <groupId>org.apache.maven</groupId>
 		    <artifactId>maven-model</artifactId>
-		    <version>3.8.5</version>
+		    <version>3.9.6</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.json/json -->
 		<dependency>
 		    <groupId>org.json</groupId>
 		    <artifactId>json</artifactId>
-		    <version>20220320</version>
+		    <version>20240303</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/fluent-hc -->

diff --git a/...inLibrary/src/main/java/ru/yanygin/clusterAdminLibrary/AssignmentRuleContentProvider.java b/...inLibrary/src/main/java/ru/yanygin/clusterAdminLibrary/AssignmentRuleContentProvider.java
@@ -0,0 +1,34 @@
+package ru.yanygin.clusterAdminLibrary;
+
+import com._1c.v8.ibis.admin.IAssignmentRuleInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+
+/** Контент-провайдер для заполнения таблицы с ТНФ. */
+public class AssignmentRuleContentProvider implements IStructuredContentProvider {
+
+  static Map<IAssignmentRuleInfo, Integer> ruleNumbers = new HashMap<>();
+
+  /**
+   * Returns the elements in the input, which must be either an array or a <code>Collection</code> .
+   */
+  @Override
+  public Object[] getElements(Object inputElement) {
+    List<IAssignmentRuleInfo> listTnf = (List<IAssignmentRuleInfo>) inputElement;
+    setRuleNumbers(listTnf);
+    return listTnf.toArray();
+  }
+
+  private static void setRuleNumbers(List<IAssignmentRuleInfo> rules) {
+    ruleNumbers.clear();
+    for (int i = 0; i < rules.size(); i++) {
+      ruleNumbers.put(rules.get(i), i + 1);
+    }
+  }
+
+  public static int getRuleNumber(IAssignmentRuleInfo rule) {
+    return ruleNumbers.getOrDefault(rule, 0);
+  }
+}