Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e50e769e22 | ||
|
|
b7c85e2368 | ||
|
|
a60289fc49 | ||
|
|
9c4feee043 | ||
|
|
1a50b40eaf |
@@ -31,10 +31,8 @@ jib {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
container {
|
container {
|
||||||
extraClasspath = listOf("/configmap")
|
|
||||||
mainClass = "de.twomartens.wahlrecht.MainApplicationKt"
|
mainClass = "de.twomartens.wahlrecht.MainApplicationKt"
|
||||||
jvmFlags = listOf("-XX:+UseContainerSupport",
|
jvmFlags = listOf("-XX:+UseContainerSupport",
|
||||||
"-XX:MaxRAMPercentage=75.0",
|
"-XX:MaxRAMPercentage=75.0")
|
||||||
"-Dlog4j.configurationFile=/configmap/log4j2.xml")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.security.OAuthFlows
|
|||||||
import io.swagger.v3.oas.annotations.security.SecurityScheme
|
import io.swagger.v3.oas.annotations.security.SecurityScheme
|
||||||
import io.swagger.v3.oas.models.OpenAPI
|
import io.swagger.v3.oas.models.OpenAPI
|
||||||
import io.swagger.v3.oas.models.info.Info
|
import io.swagger.v3.oas.models.info.Info
|
||||||
|
import io.swagger.v3.oas.models.servers.Server
|
||||||
import org.springframework.beans.factory.annotation.Value
|
import org.springframework.beans.factory.annotation.Value
|
||||||
import org.springframework.context.annotation.Bean
|
import org.springframework.context.annotation.Bean
|
||||||
import org.springframework.context.annotation.Configuration
|
import org.springframework.context.annotation.Configuration
|
||||||
@@ -35,5 +36,7 @@ open class OpenApiConfiguration {
|
|||||||
.version(apiVersion)
|
.version(apiVersion)
|
||||||
.description(apiDescription)
|
.description(apiDescription)
|
||||||
)
|
)
|
||||||
|
.addServersItem(Server().url("http://localhost:12000"))
|
||||||
|
.addServersItem(Server().url("https://api.2martens.de"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-1
@@ -20,6 +20,9 @@ open class WebConfiguration(private val headerInterceptorRest: HeaderInterceptor
|
|||||||
HttpMethod.PUT.name(), HttpMethod.OPTIONS.name()
|
HttpMethod.PUT.name(), HttpMethod.OPTIONS.name()
|
||||||
)
|
)
|
||||||
registration.allowCredentials(true)
|
registration.allowCredentials(true)
|
||||||
registration.allowedOrigins("http://localhost:4200")
|
registration.allowedOrigins(
|
||||||
|
"http://localhost:4200",
|
||||||
|
"https://wahlrecht.2martens.de"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ management:
|
|||||||
|
|
||||||
spring:
|
spring:
|
||||||
config:
|
config:
|
||||||
import: "optional:configserver:http://localhost:8888/config"
|
import: "optional:configserver:http://127.0.0.1:8888/config"
|
||||||
main:
|
main:
|
||||||
banner-mode: off
|
banner-mode: off
|
||||||
profiles:
|
profiles:
|
||||||
|
|||||||
Reference in New Issue
Block a user