Merge branch 'dev' into 'master' (a1b6acdd) · Commits · REDMIC Project / Server / OAuth

src/main/resources/application-dev.properties

+3 −1

Original line number	Diff line number	Diff line
		# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
		spring.datasource.name=redmic
		spring.datasource.url=jdbc:postgresql://redmic.net:5432/redmic?currentSchema=app

		logging.level.es.redmic=debug
		No newline at end of file

+2 −0

Original line number	Diff line number	Diff line
		# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
		spring.datasource.name=redmic
		spring.datasource.url=jdbc:postgresql://db:5432/redmic?currentSchema=app

		logging.level.es.redmic=warn
		No newline at end of file

+3 −1

Original line number	Diff line number	Diff line
		# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
		spring.datasource.name=redmic
		spring.datasource.url=jdbc:postgresql://db:5432/redmic?currentSchema=app

		logging.level.es.redmic=warn
		No newline at end of file

+7 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		server.port=8081
		server.servlet.context-path=/api
		server.servlet.application-display-name=oauth
		server.tomcat.accesslog.enabled=true

		spring.application.name=oauth

		@@ -14,6 +13,10 @@ info.microservice.outputEncoding=@project.reporting.outputEncoding@
		management.endpoints.web.exposure.include=health, info, prometheus
		management.endpoints.web.base-path=/oauth/actuator/

		logging.level.root=warn
		logging.level.org.springframework=warn
		logging.level.es.redmic=${logging.level.es.redmic}

		# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
		spring.datasource.driver-class-name=org.postgresql.Driver
		#spring.datasource.schema=app
		@@ -25,12 +28,14 @@ spring.datasource.username=username
		spring.datasource.password=password
		spring.datasource.url=${spring.datasource.url}

		spring.datasource.hikari.max-lifetime=600000

		# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
		spring.data.jpa.repositories.enabled=true
		spring.jpa.generate-ddl=true
		spring.jpa.hibernate.ddl-auto=validate
		spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
		spring.jpa.show-sql=true
		spring.jpa.show-sql=false
		spring.jpa.properties.dialect=org.hibernate.dialect.PostgreSQLDialect

		spring.jpa.properties.default_schema=app