diff --git a/backend/src/main/java/AppConfig.java b/backend/src/main/java/AppConfig.java index 30efe1f..03b77a7 100644 --- a/backend/src/main/java/AppConfig.java +++ b/backend/src/main/java/AppConfig.java @@ -46,9 +46,9 @@ import java.time.Duration; @EnableScheduling public class AppConfig { - @Value("${config-data-executor.socket-timeout:10}") + @Value("${config.data.executor.socket.timeout:10}") private int socketTimeout; - @Value("${config-data-executor.connection-timeout:10}") + @Value("${config.data.executor.connection.timeout:10}") private int connectionTimeout; @Bean diff --git a/backend/src/main/java/service/ConfigExecutorService.java b/backend/src/main/java/service/ConfigExecutorService.java index fcb6660..e5acfaf 100644 --- a/backend/src/main/java/service/ConfigExecutorService.java +++ b/backend/src/main/java/service/ConfigExecutorService.java @@ -22,7 +22,7 @@ public class ConfigExecutorService { private final String url; public ConfigExecutorService(@Autowired RestTemplate restTemplate, - @Value("${config-data-executor.url}") String url) { + @Value("${config.data.executor.url}") String url) { this.restTemplate = restTemplate; this.url = url; } diff --git a/config/patches/default.cli b/config/patches/default.cli index 207fa05..014f110 100644 --- a/config/patches/default.cli +++ b/config/patches/default.cli @@ -59,7 +59,10 @@ xa-data-source add \ /system-property=webbpm.cache.hazelcast.hosts:add(value="127.0.0.1") /system-property=webbpm.cache.hazelcast.outbound_port_definitions:add(value="5801-5820") /system-property=webbpm.security.session.active.count:add(value="20") -/system-property=gar.enable:add(value=false) /system-property=security.password.regex:add(value="^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$") +/system-property=gar.enable:add(value=false) /system-property=fias.enable:add(value=false) /system-property=bpmn.enable:add(value=false) +/system-property=config.data.executor.url:add(value="http://localhost:8090/api") +/system-property=config.data.executor.socket.timeout:add(value="10") +/system-property=config.data.executor.connection.timeout:add(value="10") diff --git a/config/standalone.xml b/config/standalone.xml index 728fdf3..420057c 100644 --- a/config/standalone.xml +++ b/config/standalone.xml @@ -55,9 +55,9 @@ - - - + + + diff --git a/сonfig-data-executor/src/main/resources/application.yml b/сonfig-data-executor/src/main/resources/application.yml index f64b73f..52614b7 100644 --- a/сonfig-data-executor/src/main/resources/application.yml +++ b/сonfig-data-executor/src/main/resources/application.yml @@ -1,15 +1,3 @@ configDirectory: /Users/maksim/Projects/Micord/configs - -#spring: -# datasource: -# url: jdbc:mysql://localhost:3306/micord?useSSL=false -# hikari: -# maximum-pool-size: 10 -# minimum-idle: 5 -# idle-timeout: 30000 -# connection-timeout: 20000 -# max-lifetime: 1800000 -# jpa: -# properties: -# hibernate: -# dialect: org.hibernate.dialect.MySQLDialect +server: + port: 8090