Resolved conflicts
This commit is contained in:
@@ -19,8 +19,6 @@ spring.liquibase.default-schema=gepafin_schema
|
||||
spring.liquibase.enabled=true
|
||||
|
||||
|
||||
# Debugging and SQL Output
|
||||
|
||||
# Swagger Configuration
|
||||
springdoc.api-docs.path=/v1/api-docs
|
||||
|
||||
@@ -32,4 +30,11 @@ aws.s3.region=eu-west-1
|
||||
aws.s3.bucket.name=mementoresources
|
||||
aws.s3.url = https://mementoresources.s3.eu-west-1.amazonaws.com/
|
||||
aws.s3.url.folder=gepafin
|
||||
# JWT configuration
|
||||
# Ensure these values match your expectations
|
||||
security.authentication.jwt.secret=my-secret-token-to-change-in-prod-environment-your-super-secure-randomly-generated-key
|
||||
security.authentication.jwt.token-validity-in-seconds=86400
|
||||
|
||||
|
||||
spring.main.allow-circular-references=true
|
||||
|
||||
|
||||
Reference in New Issue
Block a user