add default-management module

clearing-parent/default-management/pom.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>ru.spcex.clearing</groupId>
+        <artifactId>clearing-parent</artifactId>
+        <version>SPCEX-3.22.285</version>
+    </parent>
+
+    <artifactId>default-management</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>ru.spcex.platform</groupId>
+            <artifactId>platform-messaging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.platform</groupId>
+            <artifactId>platform-imdg-api-hazelcast-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>security-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>classes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.platform</groupId>
+            <artifactId>platform-enum</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>clearing-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <!-- special logging -->
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>7.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>test-clearing</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>application.properties</exclude>
+                </excludes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <finalName>${project.artifactId}</finalName>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.21.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.platform</groupId>
+                        <artifactId>junit-platform-surefire-provider</artifactId>
+                        <version>1.2.0-M1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>5.2.0-M1</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+
+    </build>
+</project>

clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/DefaultManagementApplication.java

@@ -0,0 +1,12 @@
+package ru.spcex.clearing.dflt.management;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DefaultManagementApplication {
+    public static void main(String[] args) {
+        SpringApplication app = new SpringApplication(DefaultManagementApplication.class);
+        app.run(args);
+    }
+}

clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/AppConfig.java

@@ -0,0 +1,65 @@
+package ru.spcex.clearing.dflt.management.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import ru.spcex.clearing.dflt.management.config.settings.DefaultManagementSettings;
+import ru.spcex.clearing.dflt.management.error.DefaultManagementErrors;
+import ru.spcex.clearing.util.security.UserRoleVerification;
+import ru.spcex.clearing.util.services.IMDGMessageResolver;
+import ru.spcex.platform.enumeration.UserRole;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
+import ru.spcex.platform.utils.enumeration.IMessageResolver;
+
+@Configuration
+public class AppConfig {
+
+    private static ThreadPoolTaskExecutor createThreadPoolTaskExecutor(int maxPoolSz, boolean waitForCompletion) {
+        ThreadPoolTaskExecutor pool = new ThreadPoolTaskExecutor();
+        if (maxPoolSz > 2) {
+            pool.setKeepAliveSeconds(60);
+            pool.setAllowCoreThreadTimeOut(true);
+        }
+        pool.setCorePoolSize(maxPoolSz);
+        pool.setWaitForTasksToCompleteOnShutdown(waitForCompletion);
+        return pool;
+    }
+
+    @Bean(name = "taskExecutorHazelcastClientInitializer")
+    public ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer() {
+        return createThreadPoolTaskExecutor(1, true);
+    }
+
+    @Bean(name = "taskExecutorIdGeneratorAwaiter")
+    public ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter() {
+        return createThreadPoolTaskExecutor(1, false);
+    }
+
+    @Autowired
+    @Bean
+    public ImdgProvider imdgProvider(
+        @Qualifier("taskExecutorHazelcastClientInitializer") ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer,
+        @Qualifier("taskExecutorIdGeneratorAwaiter") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter,
+        DefaultManagementSettings settings
+    ) {
+        return new HazelcastService(taskExecutorHazelcastClientInitializer,
+            taskExecutorIdGeneratorAwaiter,
+            settings.getHazelcast());
+    }
+
+    @Bean
+    @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+    public UserRoleVerification userRoleVerification(ImdgProvider imdgProvider, IMessageResolver messageResolver) {
+        return new UserRoleVerification(imdgProvider, messageResolver, UserRole.Admin, DefaultManagementErrors.UserVerifyDenial);
+    }
+
+    @Bean
+    public IMessageResolver messageResolver(ImdgProvider imdgProvider) {
+        return new IMDGMessageResolver(imdgProvider);
+    }
+}

clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/KafkaConfig.java

@@ -0,0 +1,65 @@
+package ru.spcex.clearing.dflt.management.config;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.core.ProducerFactory;
+import ru.spcex.clearing.dflt.management.config.settings.DefaultManagementSettings;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.config.KafkaConsumerFactory;
+import ru.spcex.clearing.platform.messaging.config.KafkaProducerFactory;
+import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings;
+import ru.spcex.clearing.platform.messaging.service.RequestInfo;
+import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgId;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Configuration
+public class KafkaConfig {
+    @Autowired
+    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+    @Bean("kafkaConsumer")
+    public Consumer<String, Object> createConsumer(DefaultManagementSettings settings) {
+        return KafkaConsumerFactory.consumer(settings.getKafkaConsumer());
+    }
+
+    @Autowired
+    @Bean("kafkaProducer")
+    public Producer<String, Object> createProducer(DefaultManagementSettings settings) {
+        return KafkaProducerFactory.producer(settings.getKafkaProducer());
+    }
+
+    @Bean
+    public ProducerFactory<String, Object> pf(DefaultManagementSettings settings) {
+        KafkaProducerSettings kafkaSettings = settings.getKafkaProducer();
+        return KafkaProducerFactory.producerFactory(kafkaSettings);
+    }
+
+    @Bean("kafkaTemplate")
+    public KafkaTemplate<String, Object> kafkaTemplate(ProducerFactory<String, Object> pf) {
+        return new KafkaTemplate<>(pf);
+    }
+
+    @Autowired
+    @Bean
+    public KafkaSender kafkaSender(KafkaTemplate<String, Object> kafkaTemplate,
+                                   ImdgProvider imdgProvider) {
+        ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
+        return KafkaSender
+                .setup()
+                .setKafkaTemplate(kafkaTemplate)
+                .idGenerator(imdgIdGenerator::nextId)
+                .imdgProvider(s -> {
+                    Imdg<RequestInfo> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class);
+                    return imdg::insert;
+                })
+                .build();
+    }
+
+}

clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/config/settings/DefaultManagementSettings.java

@@ -0,0 +1,41 @@
+package ru.spcex.clearing.dflt.management.config.settings;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+import ru.spcex.clearing.platform.messaging.config.element.KafkaConsumerSettings;
+import ru.spcex.clearing.platform.messaging.config.element.KafkaProducerSettings;
+import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams;
+
+@Component
+@PropertySource("file:${spring.config.location}/application.properties")
+@ConfigurationProperties("default-management")
+public class DefaultManagementSettings {
+    private HazelcastClientParams hazelcast;
+    private KafkaConsumerSettings kafkaConsumer;
+    private KafkaProducerSettings kafkaProducer;
+
+    public HazelcastClientParams getHazelcast() {
+        return hazelcast;
+    }
+
+    public void setHazelcast(HazelcastClientParams hazelcast) {
+        this.hazelcast = hazelcast;
+    }
+
+    public KafkaConsumerSettings getKafkaConsumer() {
+        return kafkaConsumer;
+    }
+
+    public void setKafkaConsumer(KafkaConsumerSettings kafkaConsumer) {
+        this.kafkaConsumer = kafkaConsumer;
+    }
+
+    public KafkaProducerSettings getKafkaProducer() {
+        return kafkaProducer;
+    }
+
+    public void setKafkaProducer(KafkaProducerSettings kafkaProducer) {
+        this.kafkaProducer = kafkaProducer;
+    }
+}

clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/error/DefaultManagementErrors.java

@@ -0,0 +1,19 @@
+package ru.spcex.clearing.dflt.management.error;
+
+import ru.spcex.platform.utils.enumeration.IErrorEnumId;
+
+public enum DefaultManagementErrors implements IErrorEnumId {
+
+    //todo уточнить порядковый номер ошибки модуля
+    GeneralError(3000L), // Общая ошибка модуля
+    UserVerifyDenial(3001L); // 'Нет прав на проведение данной операции
+
+    private final Long id;
+    DefaultManagementErrors(Long id) {
+        this.id = id;
+    }
+    @Override
+    public Long getId() {
+        return this.id;
+    }
+}

clearing-parent/default-management/src/main/java/ru/spcex/clearing/dflt/management/listener/OvernightSettingsListener.java

@@ -0,0 +1,43 @@
+package ru.spcex.clearing.dflt.management.listener;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.misc.OvernightSettingsNewRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
+import ru.spcex.clearing.util.security.UserRoleVerification;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Service
+public class OvernightSettingsListener extends QueueConsumer implements InitializingBean {
+    protected final Logger log = LoggerFactory.getLogger(getClass());
+    protected ImdgProvider imdgProvider;
+
+    @Autowired
+    public OvernightSettingsListener(Consumer<String, Object> kafkaQueue,
+                           Producer<String, Object> kafkaProducer,
+                           ImdgProvider imdgProvider,
+                           UserRoleVerification userRoleVerification) {
+        super(kafkaQueue, kafkaProducer);
+        this.imdgProvider = imdgProvider;
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        callback(OvernightSettingsNewRequest.class)
+            .setFunction(this::processNewReq)
+            .forDestination(Consts.OVERNIGHT_SETTINGS_NEW, callbacks::put);
+        init();
+    }
+
+    private RequestInfoUpdate processNewReq(BaseRequest<OvernightSettingsNewRequest> newReq) {
+        return null;
+    }
+}

clearing-parent/default-management/src/main/resources/application.properties

@@ -0,0 +1,19 @@
+spring.main.web-application-type=none
+default-management.hazelcast.cluster-members=127.0.0.1:5701
+default-management.hazelcast.login=dev
+default-management.hazelcast.password=dev-pass
+
+default-management.kafka-consumer.bootstrap-servers=localhost:9092
+default-management.kafka-consumer.group-id=dev-group-company-service
+default-management.kafka-consumer.enable-auto-commit=true
+default-management.kafka-consumer.session-timeout-ms=30000
+default-management.kafka-consumer.auto-offset-reset=latest
+default-management.kafka-consumer.linger-ms=1
+default-management.kafka-consumer.buffer-memory=33554432
+
+default-management.kafka-producer.bootstrap-servers=localhost:9092
+default-management.kafka-producer.acks=all
+default-management.kafka-producer.retries=0
+default-management.kafka-producer.batch-size=16384
+default-management.kafka-producer.linger-ms=1
+default-management.kafka-producer.buffer-memory=33554432

clearing-parent/default-management/src/main/resources/logback.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="LOG_PATH" value="./log" />
+    <property name="FILE_NAME" value="default-management" />
+    <property name="CONSOLE_LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %class{0}:%line - %message%n" />
+    <property name="FILE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %class{0}:%msg%n" />
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <!--            |%X{ru.nbch.scoring.web.logging.mdc_key}-->
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+    <!-- first FILE TEXT appender -->
+    <appender name="TEXT_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/${FILE_NAME}-text.log</file>
+        <encoder>
+            <!--            |%X{ru.nbch.scoring.web.logging.mdc_key}-->
+            <Pattern>${FILE_LOG_PATTERN}</Pattern>
+            <charset>utf8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/${FILE_NAME}-text.%d{yyyy-MM-dd}.%i.gz
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>10</maxHistory>
+        </rollingPolicy>
+    </appender>
+    <!-- second FILE JSON appender -->
+    <appender name="JSON_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/${FILE_NAME}-json.log</file>
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/${FILE_NAME}-json.%d{yyyy-MM-dd}.%i.gz
+            </fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>10</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+    <root level="info">
+        <!-- <appender-ref ref="CONSOLE"/> -->
+        <appender-ref ref="TEXT_FILE"/>
+        <appender-ref ref="JSON_FILE" />
+    </root>
+
+    <logger name="ru.spcex" level="debug" additivity="false">
+        <appender-ref ref="TEXT_FILE"/>
+        <appender-ref ref="JSON_FILE" />
+        <!-- <appender-ref ref="CONSOLE"/> -->
+    </logger>
+</configuration>

clearing-parent/pom.xml

@@ -46,6 +46,7 @@
         <module>imdg-hist</module>
         <module>xml-importer</module>
         <module>xml-exporter</module>
+        <module>default-management</module>
     </modules>
 
     <properties>

pom.xml

@@ -56,7 +56,7 @@
         <folder_root_gateway-api>${folder_root_clearing}/clearing-parent/gateway-api</folder_root_gateway-api>
         <folder_root_xml-exporter>${folder_root_clearing}/clearing-parent/xml-exporter</folder_root_xml-exporter>
         <folder_root_xml-importer>${folder_root_clearing}/clearing-parent/xml-importer</folder_root_xml-importer>
-        <folder_root_fix-service>${folder_root_clearing}/clearing-parent/fix-service</folder_root_fix-service>
+        <folder_root_df-management>${folder_root_clearing}/clearing-parent/default-management</folder_root_df-management>
         <!-- IMDG -->
         <external_libraries.hazelcast.version>3.12.4</external_libraries.hazelcast.version>
         <external_libraries.slf4j.version>1.7.33</external_libraries.slf4j.version>

z-distr/pom.xml

@@ -641,6 +641,29 @@
                                     </fileSets>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>copy-df-management-service-bin</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <fileSets>
+                                        <fileSet>
+                                            <sourceFile>${folder_root_df-management}/target/default-management.jar</sourceFile>
+                                            <destinationFile>${folder.clearing.distr.bin}/default-management.jar</destinationFile>
+                                        </fileSet>
+                                        <fileSet>
+                                            <sourceFile>${folder_root_df-management}/target/default-management.jar</sourceFile>
+                                            <destinationFile>${folder.clearing.distr.services}/default-management/default-management.jar</destinationFile>
+                                        </fileSet>
+                                        <fileSet>
+                                            <sourceFile>${folder_root_df-management}/src/main/resources/application.properties</sourceFile>
+                                            <destinationFile>${folder.clearing.distr.settings}/default-management/application.properties</destinationFile>
+                                        </fileSet>
+                                    </fileSets>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                     <plugin>

z-distr/src/main/resources/distr/sh/default-management.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+CLEARING_HOME=/opt/mfd/clearing/
+cd $CLEARING_HOME/bin
+
+CMD="java -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6044 -jar default-management.jar --spring.config.location=$CLEARING_HOME/settings/default-management/"
+
+$CMD >/dev/null 2>&1 &
+

z-distr/src/main/resources/distr/sh/kill_all.sh

@@ -23,3 +23,4 @@ kill -9 $(ps -ef | grep java | grep gateway-api.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep xml-exporter.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep xml-importer.jar | awk '{print $2}')
 kill -9 $(ps -ef | grep java | grep fix-service.jar | awk '{print $2}')
+kill -9 $(ps -ef | grep java | grep default-management.jar | awk '{print $2}')

z-distr/src/main/resources/distr/sh/launch_all.sh

@@ -23,3 +23,4 @@ cd /opt/mfd/clearing/bin
 /opt/mfd/clearing/bin/xml-exporter.sh
 /opt/mfd/clearing/bin/xml-importer.sh
 /opt/mfd/clearing/bin/fix-service.sh
+/opt/mfd/clearing/bin/default-management.sh