diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DatabaseConnectionElement.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DatabaseConnectionElement.java new file mode 100644 index 000000000..274839a2c --- /dev/null +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DatabaseConnectionElement.java @@ -0,0 +1,31 @@ +package ru.spcex.clearing.imdg.config; + +public class DatabaseConnectionElement { + private String login; + private String password; + private String url; + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } +} diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java index 483b1942f..8730c9b72 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/DbConnectionConfig.java @@ -14,17 +14,22 @@ import java.sql.Connection; @SuppressWarnings("UnnecessaryLocalVariable") @Configuration public class DbConnectionConfig { - private Logger log = LoggerFactory.getLogger(this.getClass()); + private final Logger log = LoggerFactory.getLogger(this.getClass()); private ConfigurationRootElement configRoot = DfaConfig.get().getRoot(); + private final DatabaseConnectionElement settings; + + public DbConnectionConfig(ImdgSettings settings) { + this.settings = settings.getDatabase(); + } @Bean public DataSource dataSource() { DataSource result; - String login = "clearing"; - String password = "Aa111111"; + String login = settings.getLogin(); + String password = settings.getPassword(); String logTimeoutPart = ""; - String dbPath = "jdbc:postgresql://10.200.200.133:5432/postgres"; + String dbPath = settings.getUrl(); int timeoutSec = configRoot.getDatabase().getConnectionAcquireTimeoutSeconds(); ComboPooledDataSource cpds = new ComboPooledDataSource(); diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java index 61ba1d890..f589a29c4 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/HazelcastConfiguration.java @@ -31,12 +31,15 @@ public class HazelcastConfiguration { public Config hazelCastConfig() { Config config = new Config(); config.setInstanceName("instance"); - config.setGroupConfig(new GroupConfig()); + config.setGroupConfig(new GroupConfig() + .setName(hzSettings.getLogin()) + .setPassword(hzSettings.getPassword()) + ); config.setProperty("hazelcast.shutdownhook.enabled", "true"); config.setProperty("hazelcast.logging.type", "slf4j"); config.setProperty("hazelcast.operation.call.timeout.millis", "600000"); config.setNetworkConfig(new NetworkConfig() -// .setPort(configRoot.getHazelcast().getListenPort()) + .setPort(hzSettings.getListenPort()) .setJoin(new JoinConfig() .setMulticastConfig(new MulticastConfig() .setEnabled(false)) diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ImdgSettings.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ImdgSettings.java index 9a0769932..a178af9fb 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ImdgSettings.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/config/ImdgSettings.java @@ -10,6 +10,15 @@ import org.springframework.stereotype.Component; public class ImdgSettings { private HazelcastServerElement hazelcast; + private DatabaseConnectionElement database; + + public DatabaseConnectionElement getDatabase() { + return database; + } + + public void setDatabase(DatabaseConnectionElement database) { + this.database = database; + } public HazelcastServerElement getHazelcast() { return hazelcast; diff --git a/clearing-parent/imdg/src/main/resources/application.properties b/clearing-parent/imdg/src/main/resources/application.properties index f910e21fe..df7027844 100644 --- a/clearing-parent/imdg/src/main/resources/application.properties +++ b/clearing-parent/imdg/src/main/resources/application.properties @@ -1 +1,8 @@ -imdg.hazelcast.cluster-members[0]=127.0.0.1 \ No newline at end of file +imdg.hazelcast.listenPort=5071 +imdg.hazelcast.login=dev +imdg.hazelcast.password=dev-pass +imdg.hazelcast.cluster-members[0]=127.0.0.1 + +imdg.database.login=clearing +imdg.database.password=Aa111111 +imdg.database.url=jdbc:postgresql://10.200.200.133:5432/postgres \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/resources/logback.xml b/clearing-parent/imdg/src/main/resources/logback.xml new file mode 100644 index 000000000..bb03fe824 --- /dev/null +++ b/clearing-parent/imdg/src/main/resources/logback.xml @@ -0,0 +1,38 @@ + + + + + + %date{HH:mm:ss.SSS} [%thread] %-5level %class{0}:%line - %message%n + utf-8 + + + + ./logs/imdg.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %class{0}:%msg%n + utf8 + + + + ./logs/imdg.%i.log + + 1 + 10 + + + 500MB + + + + + + + + + + + + +