From 7462b38f9f6d090a538c92c0ddb00b1fe9b98b75 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 4 Jan 2024 10:33:08 +0200 Subject: [PATCH] Fixed dev profile and fixed not working swagger in production - issue relates to spring dependency updates and how cascade yamls are handled --- src/main/resources/application-dev.yaml | 14 ++++++++++++++ src/main/resources/application.yml | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index f17b18c..32dc6a6 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -30,6 +30,20 @@ fforesight: springdoc: auth-server-url: http://localhost:8080 +dev.tenant.storage: + mode: 'S3' + s3: + key: minioadmin + secret: minioadmin + bucket: redaction + endpoint: http://localhost:9000 +dev.tenant.db: + port: 5432 + host: localhost + database: master + schema: public + username: fforesight + password: fforesight cors.enabled: true diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7f001ea..655c803 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -113,6 +113,19 @@ fforesight: user-exchange: name: 'users-exchange' springdoc: + swagger-ui: + path: ${fforesight.springdoc.base-path}/docs/swagger-ui + operations-sorter: alpha + tags-sorter: alpha + oauth: + client-id: swagger-ui-client + doc-expansion: none + config-url: ${fforesight.springdoc.base-path}/docs/swagger-config + + api-docs: + path: ${fforesight.springdoc.base-path}/docs?tenantId=${fforesight.springdoc.default-tenant} + enabled: ${fforesight.springdoc.enabled} + pre-loading-enabled: true packages-to-scan: [ 'com.knecon.fforesight.tenantusermanagement.controller.external' ] storage: