Fix

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/DefaultCatalog.java

@@ -4,10 +4,7 @@
 package ervu_lkrp_ul.ervu_lkrp_ul.db_beans;
 
 
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.appeals.Appeals;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.ratings.Ratings;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.security.Security;
 
 import java.util.Arrays;
 import java.util.List;
@@ -30,26 +27,11 @@ public class DefaultCatalog extends CatalogImpl {
      */
     public static final DefaultCatalog DEFAULT_CATALOG = new DefaultCatalog();
 
-    /**
-     * The schema <code>appeals</code>.
-     */
-    public final Appeals APPEALS = Appeals.APPEALS;
-
     /**
      * The schema <code>public</code>.
      */
     public final Public PUBLIC = Public.PUBLIC;
 
-    /**
-     * The schema <code>ratings</code>.
-     */
-    public final Ratings RATINGS = Ratings.RATINGS;
-
-    /**
-     * The schema <code>security</code>.
-     */
-    public final Security SECURITY = Security.SECURITY;
-
     /**
      * No further instances allowed
      */
@@ -60,10 +42,7 @@ public class DefaultCatalog extends CatalogImpl {
     @Override
     public final List<Schema> getSchemas() {
         return Arrays.asList(
-            Appeals.APPEALS,
-            Public.PUBLIC,
-            Ratings.RATINGS,
-            Security.SECURITY
+            Public.PUBLIC
         );
     }
 

backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java

@@ -6,6 +6,7 @@ import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -46,7 +47,7 @@ public class ReplyingKafkaConfig {
   @Value("${ervu-kafka.sasl.mechanism}")
   private String saslMechanism;
 
-  @Bean
+  @Bean("ervu")
   public ProducerFactory<String, String> producerFactory() {
     Map<String, Object> configProps = new HashMap<>();
     configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
@@ -96,7 +97,7 @@ public class ReplyingKafkaConfig {
 
   @Bean
   public ReplyingKafkaTemplate<String, String, String> replyingKafkaTemplate(
-      ProducerFactory<String, String> pf,
+      @Qualifier("ervu") ProducerFactory<String, String> pf,
       ConcurrentMessageListenerContainer<String, String> container) {
     ReplyingKafkaTemplate<String, String, String> replyingKafkaTemplate =
         new ReplyingKafkaTemplate<>(pf, container);

config/patches/default.cli

@@ -54,4 +54,8 @@ xa-data-source add \
 /system-property=ervu-kafka.org-request-topic:add(value="ervu.organization.request")
 /system-property=ervu-kafka.reply-timeout:add(value="30")
 /system-property=esnsi.okopf.cron.load:add(value="0 0 */1 * * *")
-/system-property=esnsi.okopf.url:add(value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8")
+/system-property=esnsi.okopf.url:add(value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8")
+/system-property=ervu-kafka.send.security.protocol:add(value="SASL_PLAINTEXT")
+/system-property=ervu-kafka.sasl.mechanism:add(value="SCRAM-SHA-256")
+/system-property=ervu-kafka.send.username:add(value="user1")
+/system-property=ervu-kafka.send.password:add(value="Blfi9d2OFG")

config/standalone/dev/standalone.xml

@@ -80,8 +80,12 @@
         <property name="ervu-kafka.reply-timeout" value="30"/>
         <property name="client-cert-hash" value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD"/>
         <property name="bpmn.enable" value="false"/>
-      <property name="esnsi.okopf.cron.load" value="0 0 */1 * * *"/>
-      <property name="esnsi.okopf.url" value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&amp;encoding=UTF_8"/>
+        <property name="ervu-kafka.send.security.protocol" value="SASL_PLAINTEXT"/>
+        <property name="ervu-kafka.sasl.mechanism" value="SCRAM-SHA-256"/>
+        <property name="ervu-kafka.send.username" value="user1"/>
+        <property name="ervu-kafka.send.password" value="Blfi9d2OFG"/>
+        <property name="esnsi.okopf.cron.load" value="0 0 */1 * * *"/>
+        <property name="esnsi.okopf.url" value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&amp;encoding=UTF_8"/>
     </system-properties>
     <management>
         <audit-log>

config/tomcat/tomee/conf/webbpm.properties

@@ -42,4 +42,8 @@ ervu-kafka.group-id=1
 ervu-kafka.org-request-topic=ervu.organization.request
 ervu-kafka.reply-timeout=30
 esnsi.okopf.url=https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8
-esnsi.okopf.cron.load=0 0 */1 * * *
+esnsi.okopf.cron.load=0 0 */1 * * *
+ervu-kafka.send.security.protocol=SASL_PLAINTEXT
+ervu-kafka.sasl.mechanism=SCRAM-SHA-256
+ervu-kafka.send.username=user1
+ervu-kafka.send.password=Blfi9d2OFG

frontend/src/resources/app-config.json

@@ -4,7 +4,7 @@
   "filter_cleanup_interval_hours": 720,
   "filter_cleanup_check_period_minutes": 30,
   "auth_method": "form",
-  "enable.version.in.url": "%enable.version.in.url%",
+  "enable.version.in.url": "false",
   "backend.context": "ul/ul",
   "guard.confirm_exit": false,
   "message_service_error_timeout": "",

frontend/src/resources/app.version

@@ -1 +1 @@
-%project.version%
+1.0.0-SNAPSHOT