From 5c4825f42c23f3939eace024f22b8a866fc891cb Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Fri, 13 Sep 2024 15:34:51 +0300 Subject: [PATCH] Fix --- .../ervu_lkrp_ul/db_beans/DefaultCatalog.java | 23 +------------------ .../ervu/kafka/ReplyingKafkaConfig.java | 5 ++-- config/patches/default.cli | 6 ++++- config/standalone/dev/standalone.xml | 8 +++++-- config/tomcat/tomee/conf/webbpm.properties | 6 ++++- frontend/src/resources/app-config.json | 2 +- frontend/src/resources/app.version | 2 +- 7 files changed, 22 insertions(+), 30 deletions(-) diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/DefaultCatalog.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/DefaultCatalog.java index 59ff5ea4..49a51e16 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/DefaultCatalog.java +++ b/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 appeals. - */ - public final Appeals APPEALS = Appeals.APPEALS; - /** * The schema public. */ public final Public PUBLIC = Public.PUBLIC; - /** - * The schema ratings. - */ - public final Ratings RATINGS = Ratings.RATINGS; - - /** - * The schema security. - */ - public final Security SECURITY = Security.SECURITY; - /** * No further instances allowed */ @@ -60,10 +42,7 @@ public class DefaultCatalog extends CatalogImpl { @Override public final List getSchemas() { return Arrays.asList( - Appeals.APPEALS, - Public.PUBLIC, - Ratings.RATINGS, - Security.SECURITY + Public.PUBLIC ); } diff --git a/backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java b/backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java index 55b35c14..d9b0392e 100644 --- a/backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java +++ b/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 producerFactory() { Map configProps = new HashMap<>(); configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); @@ -96,7 +97,7 @@ public class ReplyingKafkaConfig { @Bean public ReplyingKafkaTemplate replyingKafkaTemplate( - ProducerFactory pf, + @Qualifier("ervu") ProducerFactory pf, ConcurrentMessageListenerContainer container) { ReplyingKafkaTemplate replyingKafkaTemplate = new ReplyingKafkaTemplate<>(pf, container); diff --git a/config/patches/default.cli b/config/patches/default.cli index 2a7f6b93..8c72d86e 100644 --- a/config/patches/default.cli +++ b/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") \ No newline at end of file +/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") \ No newline at end of file diff --git a/config/standalone/dev/standalone.xml b/config/standalone/dev/standalone.xml index de674f3e..483f7d15 100644 --- a/config/standalone/dev/standalone.xml +++ b/config/standalone/dev/standalone.xml @@ -80,8 +80,12 @@ - - + + + + + + diff --git a/config/tomcat/tomee/conf/webbpm.properties b/config/tomcat/tomee/conf/webbpm.properties index d3fe26ae..106909f6 100644 --- a/config/tomcat/tomee/conf/webbpm.properties +++ b/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 * * * \ No newline at end of file +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 \ No newline at end of file diff --git a/frontend/src/resources/app-config.json b/frontend/src/resources/app-config.json index 5d83fdd5..d9487af6 100644 --- a/frontend/src/resources/app-config.json +++ b/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": "", diff --git a/frontend/src/resources/app.version b/frontend/src/resources/app.version index 8b9b8b3d..5deada82 100644 --- a/frontend/src/resources/app.version +++ b/frontend/src/resources/app.version @@ -1 +1 @@ -%project.version% \ No newline at end of file +1.0.0-SNAPSHOT \ No newline at end of file