Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
ltiongku
2024-08-07 19:02:13 +08:00

View File

@@ -1,14 +1,14 @@
spring.application.name=SafeQR-app
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.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}