diff --git a/credit-tracker.properties b/credit-tracker.properties new file mode 100644 index 0000000..5d7dab5 --- /dev/null +++ b/credit-tracker.properties @@ -0,0 +1,33 @@ +server.port=8099 + +# datasources +# indic +ct.indic-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver +ct.indic-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=INDIC; +ct.indic-data-source-settings.username=tester +ct.indic-data-source-settings.password=tester + +# signal +ct.signal-data-source-settings.driver=org.postgresql.Driver +ct.signal-data-source-settings.url=jdbc:postgresql://10.200.200.133:5432/credit_tracker +ct.signal-data-source-settings.username=credit_tracker_user +ct.signal-data-source-settings.password= + +# scoring +ct.scoring-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver +ct.scoring-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=TEST_2_INDIC; +ct.scoring-data-source-settings.username=tester +ct.scoring-data-source-settings.password=tester + + +# TODO Increase file size limit if needed +#spring.servlet.multipart.max-file-size=10MB +#spring.servlet.multipart.max-request-size=10MB + +# xsd paths +ct.xsd-validation.monitoring-request-path=monitoring-request.xsd +ct.xsd-validation.signal-package-path=signal-package.xsd + +ct.signals-root-uri=http://reports.test-alfa.nbki.ru/signalRUalfa/ +ct.signals-token=gttcHxwcGojoAvZK +ct.signals-user=0001ZZ \ No newline at end of file diff --git a/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java b/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java index f58dcd9..ce50422 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java +++ b/src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java @@ -5,8 +5,10 @@ import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; @Configuration +@PropertySource("file:credit-tracker.properties") @ConfigurationProperties(prefix = "ct") @Getter @Setter @@ -24,5 +26,4 @@ public class CreditTrackerSettings { private String signalsToken; private String signalsuser; - private String tmpFilePath; // TODO throw exception if not created or create } diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java index 09506a8..6d02c14 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java @@ -34,7 +34,6 @@ public class SignalRestService { private final RestTemplate restTemplate; private final XmlUtilService xmlUtilService; private final String authToken; - private final String tmpFilePath; public SignalRestService(@Qualifier(value = "restTemplate") RestTemplate restTemplate, XmlUtilService xmlUtilService, @@ -42,7 +41,6 @@ public class SignalRestService { this.restTemplate = restTemplate; this.xmlUtilService = xmlUtilService; this.authToken = buildToken(config.getSignalsToken(), config.getSignalsuser()); - this.tmpFilePath = config.getTmpFilePath(); } public String update(Signals signals) throws Exception { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6d5d1e3..b32a99b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,34 +1 @@ -spring.application.name=credit_tracker - -# datasources -# indic -ct.indic-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver -ct.indic-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=INDIC; -ct.indic-data-source-settings.username=tester -ct.indic-data-source-settings.password=tester - -# signal -ct.signal-data-source-settings.driver=org.postgresql.Driver -ct.signal-data-source-settings.url=jdbc:postgresql://10.200.200.133:5432/credit_tracker -ct.signal-data-source-settings.username=credit_tracker_user -ct.signal-data-source-settings.password= - -# scoring -ct.scoring-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver -ct.scoring-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=TEST_2_INDIC; -ct.scoring-data-source-settings.username=tester -ct.scoring-data-source-settings.password=tester - - -# TODO Increase file size limit if needed -#spring.servlet.multipart.max-file-size=10MB -#spring.servlet.multipart.max-request-size=10MB - -# xsd paths -ct.xsd-validation.monitoring-request-path=monitoring-request.xsd -ct.xsd-validation.signal-package-path=signal-package.xsd - -ct.signals-root-uri=http://reports.test-alfa.nbki.ru/signalRUalfa/ -ct.signals-token=gttcHxwcGojoAvZK -ct.signals-user=0001ZZ -ct.tmp-file-path=temp_folder \ No newline at end of file +spring.application.name=credit_tracker \ No newline at end of file