micord/ervu-secret
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small fixes

Browse source
This commit is contained in:
kochetkov 2024-09-19 12:46:24 +03:00
parent 2cb70d71b7
commit d762e3f034
5 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/main/java/AppConfig.java
View file

@ -46,9 +46,9 @@ import java.time.Duration;
@EnableScheduling @EnableScheduling
public class AppConfig { public class AppConfig {
@Value("${config-data-executor.socket-timeout:10}") @Value("${config.data.executor.socket.timeout:10}")
private int socketTimeout; private int socketTimeout;
@Value("${config-data-executor.connection-timeout:10}") @Value("${config.data.executor.connection.timeout:10}")
private int connectionTimeout; private int connectionTimeout;
@Bean @Bean

2
backend/src/main/java/service/ConfigExecutorService.java
View file

@ -22,7 +22,7 @@ public class ConfigExecutorService {
private final String url; private final String url;
public ConfigExecutorService(@Autowired RestTemplate restTemplate, public ConfigExecutorService(@Autowired RestTemplate restTemplate,
@Value("${config-data-executor.url}") String url) { @Value("${config.data.executor.url}") String url) {
this.restTemplate = restTemplate; this.restTemplate = restTemplate;
this.url = url; this.url = url;
} }

5
config/patches/default.cli
View file

@ -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.hosts:add(value="127.0.0.1")
/system-property=webbpm.cache.hazelcast.outbound_port_definitions:add(value="5801-5820") /system-property=webbpm.cache.hazelcast.outbound_port_definitions:add(value="5801-5820")
/system-property=webbpm.security.session.active.count:add(value="20") /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=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=fias.enable:add(value=false)
/system-property=bpmn.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")

6
config/standalone.xml
View file

@ -55,9 +55,9 @@
<property name="fias.enable" value="false"/> <property name="fias.enable" value="false"/>
<property name="bpmn.enable" value="false"/> <property name="bpmn.enable" value="false"/>
<property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/> <property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
<property name="config-data-executor.url" value="http://127.0.0.1:8090/api"/> <property name="config.data.executor.url" value="http://localhost:8090/api"/>
<property name="config-data-executor.socket-timeout" value="10"/> <property name="config.data.executor.socket.timeout" value="10"/>
<property name="config-data-executor.connectionTimeout" value="10"/> <property name="config.data.executor.connection.timeout" value="10"/>
</system-properties> </system-properties>
<management> <management>
<audit-log> <audit-log>

16
сonfig-data-executor/src/main/resources/application.yml
View file

@ -1,15 +1,3 @@
configDirectory: /Users/maksim/Projects/Micord/configs configDirectory: /Users/maksim/Projects/Micord/configs
server:
#spring: port: 8090
# 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