diff --git a/clearing-parent/backend-api/pom.xml b/clearing-parent/backend-api/pom.xml index 6e33c26e8..6196be095 100644 --- a/clearing-parent/backend-api/pom.xml +++ b/clearing-parent/backend-api/pom.xml @@ -16,7 +16,7 @@ - + 17.0.1 @@ -31,7 +31,7 @@ org.keycloak keycloak-spring-boot-starter - 17.0.1 + ${keycloak-spring-boot-starter.version} @@ -40,14 +40,14 @@ org.keycloak.bom keycloak-adapter-bom - 17.0.1 + ${keycloak-spring-boot-starter.version} pom import + - backend-api src/main/resources @@ -58,23 +58,8 @@ false + - - org.apache.maven.plugins - maven-jar-plugin - - - - - - ru.spcex.clearing.backendapi.BackendApiApplication - - - Maven - - - - org.springframework.boot spring-boot-maven-plugin diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java index 8a7d88003..56ba80c6a 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/StaticData/Company/Company.java @@ -4,10 +4,13 @@ import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.StaticData.Profile.CompanyInfo; import ru.clearing.classes.objects.BusinessObject; +import java.io.Serial; + /** * DB: COMPANY */ public class Company extends BusinessObject { + @Serial private static final long serialVersionUID = ConstSerializable.serialVersionUID; private String clearingCode; diff --git a/clearing-parent/dbf-exporter/pom.xml b/clearing-parent/dbf-exporter/pom.xml index f8d2aa74e..f60d3c4cb 100644 --- a/clearing-parent/dbf-exporter/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -34,7 +34,6 @@ com.mchange c3p0 - 0.9.5.2 org.postgresql @@ -45,26 +44,12 @@ com.github.albfernandez javadbf - 1.13.1 - jar/${project.artifactId} - - org.apache.maven.plugins - maven-jar-plugin - - - - - ru.spcex.clearing.dbf.exporter.DBFLoaderApplication - - - - org.springframework.boot spring-boot-maven-plugin @@ -76,8 +61,7 @@ - true - exec + ${project.artifactId} diff --git a/clearing-parent/dbf-exporter/src/main/resources/logback.xml b/clearing-parent/dbf-exporter/src/main/resources/logback.xml index 33ca393d8..3836401d5 100644 --- a/clearing-parent/dbf-exporter/src/main/resources/logback.xml +++ b/clearing-parent/dbf-exporter/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - ../logs/dbf_export.log + ./logs//dbf_export.log UTF-8 %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n diff --git a/clearing-parent/dbf-importer/pom.xml b/clearing-parent/dbf-importer/pom.xml index 5baf79a9e..cc1df470b 100644 --- a/clearing-parent/dbf-importer/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -35,7 +35,6 @@ com.mchange c3p0 - 0.9.5.2 org.postgresql @@ -46,26 +45,11 @@ com.github.albfernandez javadbf - 1.13.1 - - jar/${project.artifactId} - - org.apache.maven.plugins - maven-jar-plugin - - - - - ru.spcex.clearing.dbf.importer.DBFLoaderApplication - - - - org.springframework.boot spring-boot-maven-plugin @@ -77,8 +61,7 @@ - true - exec + ${project.artifactId} diff --git a/clearing-parent/dbf-importer/src/main/resources/logback.xml b/clearing-parent/dbf-importer/src/main/resources/logback.xml index 560b5061c..346a824bb 100644 --- a/clearing-parent/dbf-importer/src/main/resources/logback.xml +++ b/clearing-parent/dbf-importer/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - ../logs/dbf_loader.log + ./logs//dbf_loader.log UTF-8 %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n diff --git a/clearing-parent/storage/pom.xml b/clearing-parent/storage/pom.xml index 13866a678..2021eb4ba 100644 --- a/clearing-parent/storage/pom.xml +++ b/clearing-parent/storage/pom.xml @@ -49,6 +49,10 @@ org.springframework spring-jdbc + + org.postgresql + postgresql + com.mchange c3p0 diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java index 4a9ecc0ab..ec8ab0853 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/businessevent/CompanyUpdateMapStore.java @@ -2,7 +2,6 @@ package ru.spcex.clearing.storage.businessevent; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.lang.NonNull; -import org.springframework.stereotype.Component; import ru.clearing.classes.StaticData.Company.Company; import ru.clearing.classes.StaticData.Company.CompanyUpdate; import ru.clearing.classes.StaticData.Profile.CompanyInfo; @@ -15,7 +14,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -@Component +//@Component public class CompanyUpdateMapStore extends BusinessEventMapStore { public CompanyUpdateMapStore(JdbcTemplate jdbcTemplate) { diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java index aedfe8610..da5e28c27 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/DbConnectionConfig.java @@ -19,18 +19,18 @@ public class DbConnectionConfig { private ConfigurationRootElement configRoot = DfaConfig.get().getRoot(); @Bean - public DataSource dataSource() /*fixme why: throws PropertyVetoException*/ { + public DataSource dataSource() { DataSource result; - String login = configRoot.getDatabase().getLogin(); - String password = configRoot.getDatabase().getPassword(); + String login = "clearing"; + String password = "Aa111111"; String logTimeoutPart = ""; - String dbPath = configRoot.getDatabase().getJdbcConnectionString(); + String dbPath = "jdbc:postgresql://10.200.200.133:5432/postgres"; int timeoutSec = configRoot.getDatabase().getConnectionAcquireTimeoutSeconds(); ComboPooledDataSource cpds = new ComboPooledDataSource(); try { - cpds.setDriverClass(configRoot.getDatabase().getDriver()); - } catch (Exception ue) { // fixme не компилится из-за PropertyVetoException + cpds.setDriverClass("org.postgresql.Driver"); + } catch (Exception ue) { throw new RuntimeException(ue); } cpds.setJdbcUrl(dbPath); diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java index 2b4821487..d4d02655f 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/HazelcastConfiguration.java @@ -27,21 +27,7 @@ public class HazelcastConfiguration { public Config hazelCastConfig() { Config config = new Config(); config.setInstanceName("instance"); - config.setGroupConfig(new GroupConfig() -// todo config .setName(configRoot.getHazelcast().getLogin()) -// .setPassword(configRoot.getHazelcast().getPassword() -// ) - ); -// if (StringUtils.isEmpty(configRoot.getHazelcast().getMancenterUrl())) { -// config.setManagementCenterConfig(new ManagementCenterConfig() -// .setEnabled(false) -// ); -// } else { -// config.setManagementCenterConfig(new ManagementCenterConfig() -// .setEnabled(true) -// .setUrl(configRoot.getHazelcast().getMancenterUrl()) -// ); -// } + config.setGroupConfig(new GroupConfig()); config.setProperty("hazelcast.shutdownhook.enabled", "true"); config.setProperty("hazelcast.logging.type", "slf4j"); config.setProperty("hazelcast.operation.call.timeout.millis", "600000"); @@ -52,10 +38,6 @@ public class HazelcastConfiguration { .setEnabled(false)) .setTcpIpConfig(new TcpIpConfig() .setEnabled(true) -// .setMembers( -// DfaConfig.get() -// .getRoot().getHazelcast().getClusterMembersList() -// ) ) ) ); @@ -77,7 +59,7 @@ public class HazelcastConfiguration { config.addMapConfig(poolMapConfigs.map_ProfileDocument()); config.addMapConfig(poolMapConfigs.map_Contact()); config.addMapConfig(poolMapConfigs.map_Company()); - config.addMapConfig(poolMapConfigs.map_CompanyUpdate()); +// config.addMapConfig(poolMapConfigs.map_CompanyUpdate()); return config; } diff --git a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java index d2b2b5279..0dcca74d9 100644 --- a/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java +++ b/clearing-parent/storage/src/main/java/ru/spcex/clearing/storage/config/PoolMapConfigs.java @@ -177,7 +177,7 @@ public class PoolMapConfigs { .addMapIndexConfig(makeMapIndexConfig("companyId")); } - @Autowired +// @Autowired private CompanyUpdateMapStore companyUpdateMapStore; public MapConfig map_CompanyUpdate() { diff --git a/pom.xml b/pom.xml index 8f29fd6ed..db9053671 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,8 @@ ${folder_root_clearing_temp} ${folder_root_clearing}/clearing-parent/backend-api + ${folder_root_clearing}/clearing-parent/dbf-exporter + ${folder_root_clearing}/clearing-parent/dbf-importer 3.12.4 @@ -76,6 +78,17 @@ platform-storage-api 1.0.0 + + + com.github.albfernandez + javadbf + 1.13.1 + + + com.mchange + c3p0 + 0.9.5.2 + diff --git a/z-distr/pom.xml b/z-distr/pom.xml index b011b9fc9..6e7e480cc 100644 --- a/z-distr/pom.xml +++ b/z-distr/pom.xml @@ -27,7 +27,7 @@ - distr + distributive @@ -106,9 +106,39 @@ + + + copy-dbf-exporter-bin + prepare-package + + copy + + + + + ${folder_root_dbf-exporter}/target/dbf-exporter.jar + ${folder.clearing.distr.modules}/dbf-exporter/dbf-exporter.jar + + + + + + copy-dbf-importer-bin + prepare-package + + copy + + + + + ${folder_root_dbf-importer}/target/dbf-importer.jar + ${folder.clearing.distr.modules}/dbf-importer/dbf-importer.jar + + + + - org.apache.maven.plugins maven-assembly-plugin @@ -132,27 +162,5 @@ - - - coverage - - - - org.jacoco - jacoco-maven-plugin - - - report-aggregate - verify - - report-aggregate - - - - - - - - \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/backend-api.sh b/z-distr/src/main/resources/distr/bin/backend-api.sh new file mode 100644 index 000000000..8bbec107f --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/backend-api.sh @@ -0,0 +1,3 @@ +#!/bin/sh +docker build -t backend-api:1.0.0 ../modules/backend-api/ +docker run -p 8090:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs backend-api:1.0.0 & \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/dbf-exporter.sh b/z-distr/src/main/resources/distr/bin/dbf-exporter.sh new file mode 100644 index 000000000..a8c5b380c --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/dbf-exporter.sh @@ -0,0 +1,3 @@ +#!/bin/sh +docker build -t dbf-exporter:1.0.0 ../modules/dbf-exporter/ +docker run -p 8070:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs dbf-exporter:1.0.0 & \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/dbf-importer.sh b/z-distr/src/main/resources/distr/bin/dbf-importer.sh new file mode 100644 index 000000000..909b00cdd --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/dbf-importer.sh @@ -0,0 +1,3 @@ +#!/bin/sh +docker build -t dbf-importer:1.0.0 ../modules/dbf-importer/ +docker run -p 8060:8080 -v /opt/clearing/logs:/opt/clearing/bin/logs dbf-importer:1.0.0 & \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/deploy.sh b/z-distr/src/main/resources/distr/bin/deploy.sh new file mode 100644 index 000000000..2ed33c187 --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/deploy.sh @@ -0,0 +1,6 @@ +#!/bin/sh +./os.sh +sleep 60 +./backend-api.sh & +./dbf-exporter.sh & +./dbf-importer.sh & \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/bin/os.sh b/z-distr/src/main/resources/distr/bin/os.sh new file mode 100644 index 000000000..72c4b51ad --- /dev/null +++ b/z-distr/src/main/resources/distr/bin/os.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker build -t debian:stable-20220125-jdk17 ../modules/os/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/bin/backend-api.sh b/z-distr/src/main/resources/distr/modules/bin/backend-api.sh deleted file mode 100644 index 2d46a4ea2..000000000 --- a/z-distr/src/main/resources/distr/modules/bin/backend-api.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker build -t backend-api:1.0.0 ../backend-api/ -docker run -p 8090:8080 backend-api:1.0.0 \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/bin/dbf-exporter.sh b/z-distr/src/main/resources/distr/modules/bin/dbf-exporter.sh deleted file mode 100644 index 14e7b2530..000000000 --- a/z-distr/src/main/resources/distr/modules/bin/dbf-exporter.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker build -t dbf-exporter ../dbf-exporter/ -docker run -p 8090:8080 dbf-exporter:latest \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/bin/dbf-importer.sh b/z-distr/src/main/resources/distr/modules/bin/dbf-importer.sh deleted file mode 100644 index 5d7732e18..000000000 --- a/z-distr/src/main/resources/distr/modules/bin/dbf-importer.sh +++ /dev/null @@ -1,2 +0,0 @@ -docker build -t dbf-importer ../dbf-importer/ -docker run -p 8090:8080 dbf-importer:latest \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/bin/os.sh b/z-distr/src/main/resources/distr/modules/bin/os.sh deleted file mode 100644 index ef791546d..000000000 --- a/z-distr/src/main/resources/distr/modules/bin/os.sh +++ /dev/null @@ -1 +0,0 @@ -docker build -t debian:stable-20220125-jdk17 ../os/ \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile index fa8f8dab3..676abb75f 100644 --- a/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile @@ -1,39 +1,5 @@ -FROM debian:stable-20220125 +FROM debian:stable-20220125-jdk17 - -############################################################################################################################################### -# Global system deps -############################################################################################################################################### - -RUN apt update \ - && apt install apt-file -y \ - && apt upgrade -y - -RUN apt install -y \ - wget \ - tzdata \ - curl \ - ca-certificates - -############################################################################################################################################### -# Java -############################################################################################################################################### - -ENV JAVA_VERSION jdk17.0.4+8 - -RUN set -eux; \ - ESUM='637a742591f75447eaab1f23942db038d411686f'; \ - BINARY_URL='https://download.bell-sw.com/java/17.0.4+8/bellsoft-jdk17.0.4+8-linux-amd64.tar.gz'; \ - curl -LfsSo /tmp/bellsoft-jdk.tar.gz ${BINARY_URL}; \ - mkdir -p /opt/java/bellsoft-jdk; \ - cd /opt/java/bellsoft-jdk; \ - tar -xf /tmp/bellsoft-jdk.tar.gz --strip-components=1; \ - rm -rf /tmp/bellsoft-jdk.tar.gz; - -ENV JAVA_HOME=/opt/java/bellsoft-jdk/ \ - PATH="/opt/java/bellsoft-jdk/bin:$PATH" -# -ADD dbf-exporter.jar /deployments/dbf-exporter.jar +ADD dbf-exporter.jar /opt/clearing/bin/dbf-exporter.jar USER root -RUN mkdir ./logs -ENTRYPOINT java -jar /deployments/dbf-exporter.jar +ENTRYPOINT java -jar /opt/clearing/bin/dbf-exporter.jar diff --git a/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile index 2752db05d..1cdf3eac8 100644 --- a/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile @@ -1,39 +1,5 @@ -FROM debian:stable-20220125 +FROM debian:stable-20220125-jdk17 - -############################################################################################################################################### -# Global system deps -############################################################################################################################################### - -RUN apt update \ - && apt install apt-file -y \ - && apt upgrade -y - -RUN apt install -y \ - wget \ - tzdata \ - curl \ - ca-certificates - -############################################################################################################################################### -# Java -############################################################################################################################################### - -ENV JAVA_VERSION jdk17.0.4+8 - -RUN set -eux; \ - ESUM='637a742591f75447eaab1f23942db038d411686f'; \ - BINARY_URL='https://download.bell-sw.com/java/17.0.4+8/bellsoft-jdk17.0.4+8-linux-amd64.tar.gz'; \ - curl -LfsSo /tmp/bellsoft-jdk.tar.gz ${BINARY_URL}; \ - mkdir -p /opt/java/bellsoft-jdk; \ - cd /opt/java/bellsoft-jdk; \ - tar -xf /tmp/bellsoft-jdk.tar.gz --strip-components=1; \ - rm -rf /tmp/bellsoft-jdk.tar.gz; - -ENV JAVA_HOME=/opt/java/bellsoft-jdk/ \ - PATH="/opt/java/bellsoft-jdk/bin:$PATH" -# -ADD dbf-importer.jar /deployments/dbf-importer.jar +ADD dbf-importer.jar /opt/clearing/bin/dbf-importer.jar USER root -RUN mkdir ./logs -ENTRYPOINT java -jar /deployments/dbf-importer.jar +ENTRYPOINT java -jar /opt/clearing/bin/dbf-importer.jar