From 6412316e2eac58c3f1dbc5144e0809385a5358bd Mon Sep 17 00:00:00 2001 From: salmanoe Date: Thu, 7 Jan 2021 20:15:05 +0700 Subject: [PATCH] application context configuration fixed --- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../medifirst2000/applicationContext.xml | 13 +++++--- .../main/resources/jdbc.logging.properties | 10 +++--- .../main/resources/jdbc.mirroring.properties | 25 +++++++++++++++ .../main/resources/jdbc.production.properties | 31 ++++++++++++++----- .../main/resources/jdbc.testing.properties | 18 +++++------ .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- jasamedika-it/src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- 14 files changed, 79 insertions(+), 36 deletions(-) create mode 100644 jasamedika-config/src/main/resources/jdbc.mirroring.properties diff --git a/jasamedika-bridging/src/main/webapp/WEB-INF/web.xml b/jasamedika-bridging/src/main/webapp/WEB-INF/web.xml index 73911d37..1ca52a06 100644 --- a/jasamedika-bridging/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-bridging/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production diff --git a/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/applicationContext.xml b/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/applicationContext.xml index 50530510..c11fad12 100644 --- a/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/applicationContext.xml +++ b/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/applicationContext.xml @@ -9,11 +9,14 @@ http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"> - + classpath*:jdbc.${spring.profiles.default}.properties" /> --> + + @@ -33,7 +36,7 @@ - + ${jdbc.serverName} @@ -61,8 +64,8 @@ org.hibernate.dialect.PostgreSQLDialect - true - true + ${hibernate.format_sql} + ${hibernate.show_sql} none com.jasamedika.medifirst2000.logging.hibernate.interceptor.HibernateInterceptor diff --git a/jasamedika-config/src/main/resources/jdbc.logging.properties b/jasamedika-config/src/main/resources/jdbc.logging.properties index 9fbde295..902c36d4 100644 --- a/jasamedika-config/src/main/resources/jdbc.logging.properties +++ b/jasamedika-config/src/main/resources/jdbc.logging.properties @@ -1,7 +1,7 @@ # DB Logging -jdbcLogging.driver=com.mysql.jdbc.Driver +#jdbcLogging.driver=com.mysql.jdbc.Driver #jdbcLogging.url=jdbc:mysql://localhost:3306/medifirst2000 -jdbcLogging.url=jdbc:mysql://192.168.12.1:3306/rsab_hk_development -jdbcLogging.username=root -jdbcLogging.password= -hibernate.hbm2ddl = update +#jdbcLogging.url=jdbc:mysql://192.168.12.1:3306/rsab_hk_development +#jdbcLogging.username=root +#jdbcLogging.password= +#hibernate.hbm2ddl = update diff --git a/jasamedika-config/src/main/resources/jdbc.mirroring.properties b/jasamedika-config/src/main/resources/jdbc.mirroring.properties new file mode 100644 index 00000000..e64458b9 --- /dev/null +++ b/jasamedika-config/src/main/resources/jdbc.mirroring.properties @@ -0,0 +1,25 @@ +jdbc.driver = org.postgresql.Driver + +hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +hibernate.hbm2ddl = none +hibernate.format_sql = false +hibernate.show_sql = false + +hikari.config.maximum.pool.size = 100 + +# DB Mirroring +jdbc.url = jdbc:postgresql://ds.rsabhk.lan:5432/rsab_hk_production +jdbc.username = postgres +jdbc.password = root +jdbc.serverName = ds.rsabhk.lan +jdbc.databaseName = rsab_hk_production +jdbc.portNumber = 5432 + +corePoolSizeAsyncConfigurer = 50 +maxPoolSizeAsyncConfigurer = 100 + +presensiCapturePath=//mnt//images// +reportDirectory=/home/svradmin/app-back/uploadfile/ + +urlServiceSarPras=http://localhost:8888/jasamedika-web/ +urlService=http://192.168.12.2/simrs_harkit/service/transaksi/ \ No newline at end of file diff --git a/jasamedika-config/src/main/resources/jdbc.production.properties b/jasamedika-config/src/main/resources/jdbc.production.properties index a1778291..b2aeade4 100644 --- a/jasamedika-config/src/main/resources/jdbc.production.properties +++ b/jasamedika-config/src/main/resources/jdbc.production.properties @@ -1,10 +1,25 @@ -# DB Live jdbc.driver = org.postgresql.Driver -jdbc.url = jdbc:postgresql://localhost:5432/Medifirst2000 -jdbc.username = postgres -jdbc.password = adminpostgree -jdbc.serverName = localhost -jdbc.databaseName = Medifirst2000 -jdbc.portNumber = 5432 + hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect -hibernate.hbm2ddl = none \ No newline at end of file +hibernate.hbm2ddl = none +hibernate.format_sql = false +hibernate.show_sql = false + +hikari.config.maximum.pool.size = 120 + +# DB Production +jdbc.url = jdbc:postgresql://192.168.12.1:5432/rsab_hk_production +jdbc.username = postgres +jdbc.password = root +jdbc.serverName = 192.168.12.1 +jdbc.databaseName = rsab_hk_production +jdbc.portNumber = 5432 + +corePoolSizeAsyncConfigurer = 50 +maxPoolSizeAsyncConfigurer = 100 + +presensiCapturePath=//mnt//images// +reportDirectory=/home/svradmin/app-back/uploadfile/ + +urlServiceSarPras=http://localhost:8888/jasamedika-web/ +urlService=http://192.168.12.2/simrs_harkit/service/transaksi/ \ No newline at end of file diff --git a/jasamedika-config/src/main/resources/jdbc.testing.properties b/jasamedika-config/src/main/resources/jdbc.testing.properties index ced80bdb..8b975f3f 100644 --- a/jasamedika-config/src/main/resources/jdbc.testing.properties +++ b/jasamedika-config/src/main/resources/jdbc.testing.properties @@ -1,14 +1,14 @@ # DB Development -jdbc.driver = org.postgresql.Driver +#jdbc.driver = org.postgresql.Driver #jdbc.url = jdbc:postgresql://192.168.12.1:5432/rsab_hk_production -jdbc.url = jdbc:postgresql://192.168.12.4:5432/rsab_hk_development -jdbc.username = postgres -jdbc.password = root -jdbc.serverName = 192.168.12.4 -jdbc.databaseName = rsab_hk_development -jdbc.portNumber = 5432 -hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect -hibernate.hbm2ddl = update +#jdbc.url = jdbc:postgresql://192.168.12.4:5432/rsab_hk_development +#jdbc.username = postgres +#jdbc.password = root +#jdbc.serverName = 192.168.12.4 +#jdbc.databaseName = rsab_hk_development +#jdbc.portNumber = 5432 +#hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +#hibernate.hbm2ddl = none #jdbc.driver = com.mysql.jdbc.Driver diff --git a/jasamedika-cssd/src/main/webapp/WEB-INF/web.xml b/jasamedika-cssd/src/main/webapp/WEB-INF/web.xml index 73911d37..1ca52a06 100644 --- a/jasamedika-cssd/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-cssd/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production diff --git a/jasamedika-ipsrs/src/main/webapp/WEB-INF/web.xml b/jasamedika-ipsrs/src/main/webapp/WEB-INF/web.xml index 73911d37..1ca52a06 100644 --- a/jasamedika-ipsrs/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-ipsrs/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production diff --git a/jasamedika-it/src/main/webapp/WEB-INF/web.xml b/jasamedika-it/src/main/webapp/WEB-INF/web.xml index 73911d37..1ca52a06 100644 --- a/jasamedika-it/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-it/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production diff --git a/jasamedika-k3kl/src/main/webapp/WEB-INF/web.xml b/jasamedika-k3kl/src/main/webapp/WEB-INF/web.xml index 152f7240..ec857883 100644 --- a/jasamedika-k3kl/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-k3kl/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production diff --git a/jasamedika-laundry/src/main/webapp/WEB-INF/web.xml b/jasamedika-laundry/src/main/webapp/WEB-INF/web.xml index 73911d37..1ca52a06 100644 --- a/jasamedika-laundry/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-laundry/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml b/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml index 73911d37..d848a0af 100644 --- a/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-reporting/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + mirroring diff --git a/jasamedika-sdm/src/main/webapp/WEB-INF/web.xml b/jasamedika-sdm/src/main/webapp/WEB-INF/web.xml index 73911d37..1ca52a06 100644 --- a/jasamedika-sdm/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-sdm/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production diff --git a/jasamedika-web/src/main/webapp/WEB-INF/web.xml b/jasamedika-web/src/main/webapp/WEB-INF/web.xml index 73911d37..1ca52a06 100644 --- a/jasamedika-web/src/main/webapp/WEB-INF/web.xml +++ b/jasamedika-web/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,7 @@ spring.profiles.default - development + production