diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..66c6627 Binary files /dev/null and b/.DS_Store differ diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 0000000..a1d5015 Binary files /dev/null and b/.github/.DS_Store differ diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..02f561c Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000..e74ac63 Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties deleted file mode 100644 index fb53d4d..0000000 --- a/src/main/resources/application-prod.properties +++ /dev/null @@ -1,21 +0,0 @@ -http.port=${HTTP_PORT} -server.port=${SERVER_PORT} -server.ssl.enabled=true -server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE} -server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION} -server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD} -server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS} -trust.store=${SERVER_SSL_TRUST_STORE_LOCATION} -trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD} - -spring.datasource.url=${SERVER_DB_URL} -spring.datasource.username=${SERVER_DB_USERNAME} -spring.datasource.password=${SERVER_DB_PASSWORD} -spring.datasource.driver-class-name=${SERVER_DB_DRIVER_CLASS_NAME} -#spring.jpa.database-platform=${SERVER_DB_DIALECT} -spring.jpa.hibernate.ddl-auto=update -spring.jpa.show-sql=true -spring.jpa.properties.hibernate.format_sql=true - -google.safebrowsing.api.key=${GOOGLE_SAFE_BROWSING_API_KEY} -virustotal.api.key=${VIRUSTOTAL_API_KEY} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6eac79d..fe5cab5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,23 @@ spring.application.name=SafeQR-app -spring.profiles.active=prod \ No newline at end of file +spring.profiles.active=local +http.port=${HTTP_PORT} +server.port=${SERVER_PORT} +server.ssl.enabled=true +server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE} +server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION} +server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD} +server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS} +trust.store=${SERVER_SSL_TRUST_STORE_LOCATION} +trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD} + +spring.datasource.url=${SERVER_DB_URL} +spring.datasource.username=${SERVER_DB_USERNAME} +spring.datasource.password=${SERVER_DB_PASSWORD} +spring.datasource.driver-class-name=${SERVER_DB_DRIVER_CLASS_NAME} +#spring.jpa.database-platform=${SERVER_DB_DIALECT} +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.format_sql=true + +google.safebrowsing.api.key=${GOOGLE_SAFE_BROWSING_API_KEY} +virustotal.api.key=${VIRUSTOTAL_API_KEY} \ No newline at end of file