Merge remote-tracking branch 'origin/develop' into feature/ERVU-189

This commit is contained in:
m.epshtein 2024-11-26 20:47:16 +03:00
commit ea88e377ee
2 changed files with 4 additions and 5 deletions

View file

@ -165,8 +165,8 @@
<connection-url>jdbc:postgresql://10.10.31.118:5432/account_applications</connection-url> <connection-url>jdbc:postgresql://10.10.31.118:5432/account_applications</connection-url>
<driver>postgres</driver> <driver>postgres</driver>
<security> <security>
<user-name>ervu</user-name> <user-name>ervu_account_applications</user-name>
<password>ervu</password> <password>ervu_account_applications</password>
</security> </security>
<timeout> <timeout>
<query-timeout>300</query-timeout> <query-timeout>300</query-timeout>

View file

@ -5,12 +5,11 @@
<driverClassName>org.postgresql.Driver</driverClassName> <driverClassName>org.postgresql.Driver</driverClassName>
<host>10.10.31.118</host> <host>10.10.31.118</host>
<manually>false</manually> <manually>false</manually>
<password>ervu</password> <password>ervu_account_applications</password>
<port>5432</port> <port>5432</port>
<schemas>public</schemas> <schemas>public</schemas>
<schemas>security</schemas>
<sqlDialect>POSTGRES</sqlDialect> <sqlDialect>POSTGRES</sqlDialect>
<url>jdbc:postgresql://10.10.31.118:5432/account_applications</url> <url>jdbc:postgresql://10.10.31.118:5432/account_applications</url>
<urlPrefix>jdbc:postgresql:</urlPrefix> <urlPrefix>jdbc:postgresql:</urlPrefix>
<user>ervu</user> <user>ervu_account_applications</user>
</datasource> </datasource>