Доработки по выносу библиотек JDBC

This commit is contained in:
Постнов Андрей 2025-06-06 12:44:56 +03:00
parent fbc056c1b6
commit 7d89e24c2a

View File

@ -14,7 +14,7 @@ services:
target: /data/application.yaml target: /data/application.yaml
- source: hikari - source: hikari
target: /data/hikari.properties target: /data/hikari.properties
entrypoint: ["java", "-Dexpertisa.branch=${BRANCH}", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-jar", "/app.war"] entrypoint: ["java", "-Dexpertisa.branch=${BRANCH}", "-Dhikaricp.configurationFile=/data/hikari.properties", "-Djgroups.tunnel.hosts=app-eisa.expertdwh.ru[12001]", "-cp", "/app.war", "org.springframework.boot.loader.launch.PropertiesLauncher"]
environment: environment:
JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90" JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=90"
@ -100,34 +100,62 @@ configs:
url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
username: admin username: admin
password: admin password: admin
pool:
pool-name: psql
minimum-idle: 1
maximum-pool-size: 50
psql-camunda: psql-camunda:
url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true url: jdbc:postgresql://psql-${BRANCH}:5432/expertisa-metadata?reWriteBatchedInserts=true
username: admin username: admin
password: admin password: admin
pool:
pool-name: psql-camunda
minimum-idle: 1
maximum-pool-size: 50
EWH: EWH:
url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh?reWriteBatchedInserts=true url: jdbc:postgresql://adb-master.expertdwh.ru:5432/ewh?reWriteBatchedInserts=true
username: ewh username: ewh
password: ${EWH_PASSWORD} password: ${EWH_PASSWORD}
pre-script: core-postgresql.preScript pre-script: core-postgresql.preScript
post-script: core-postgresql.postScript post-script: core-postgresql.postScript
pool:
pool-name: ewh
minimum-idle: 1
maximum-pool-size: 50
EWH_ORA: EWH_ORA:
url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
username: ewh username: ewh
password: ${EWH_PASSWORD} password: ${EWH_PASSWORD}
pre-script: core-oracle.preScript pre-script: core-oracle.preScript
pool:
pool-name: ewh_ora
minimum-idle: 1
maximum-pool-size: 50
DWH_ORA: DWH_ORA:
url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh url: jdbc:oracle:thin:@oracle.expertdwh.ru:1521:ewh
username: dwh username: dwh
password: ${DWH_PASSWORD} password: ${DWH_PASSWORD}
pre-script: core-oracle.preScript pre-script: core-oracle.preScript
pool:
pool-name: dwh_ora
minimum-idle: 1
maximum-pool-size: 50
MSSQL: MSSQL:
url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true url: jdbc:sqlserver://;serverName=app.expertdwh.ru;databaseName=master;encrypt=true;trustServerCertificate=true
username: sa username: sa
password: ${EWH_PASSWORD} password: ${EWH_PASSWORD}
pool:
pool-name: mssql
minimum-idle: 1
maximum-pool-size: 50
uwh: uwh:
url: jdbc:postgresql://app.expertdwh.ru/uwh?reWriteBatchedInserts=true url: jdbc:postgresql://app.expertdwh.ru/uwh?reWriteBatchedInserts=true
username: uwh username: uwh
password: uwh password: uwh
pool:
pool-name: uwh
minimum-idle: 1
maximum-pool-size: 50
audit.enabled: true audit.enabled: true
hikari: hikari: