diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml index f7f9cb1e1b99060a5a2df52f16b87c0492871e0d..923194a80153e6034708fd1a30ea881c59a35fcd 100644 --- a/bescheid-manager/pom.xml +++ b/bescheid-manager/pom.xml @@ -46,7 +46,7 @@ <artifactId>api-lib-core</artifactId> <version>${api-lib.version}</version> </dependency> - + <!-- spring --> <dependency> @@ -66,17 +66,21 @@ <groupId>org.springframework</groupId> <artifactId>spring-webflux</artifactId> </dependency> + <dependency> + <groupId>io.projectreactor.netty</groupId> + <artifactId>reactor-netty-http</artifactId> + </dependency> <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId> </dependency> - + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-configuration-processor</artifactId> <optional>true</optional> </dependency> - + <!--dev tools--> <dependency> <groupId>org.mapstruct</groupId> diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java index ee4c2e5bd75ad4c0d28e13a2c88e9fc476d602c1..4f5adf641674190ce5b16f09b6a25f211c099925 100644 --- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java +++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java @@ -35,10 +35,10 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import de.itvsh.kop.common.errorhandling.TechnicalException; import de.ozgcloud.apilib.user.OzgCloudUserId; import de.ozgcloud.apilib.user.OzgCloudUserProfileService; import de.ozgcloud.command.Command; +import de.ozgcloud.common.errorhandling.TechnicalException; import lombok.RequiredArgsConstructor; @RequiredArgsConstructor diff --git a/vorgang-manager-server/src/main/resources/application.yml b/vorgang-manager-server/src/main/resources/application.yml index db30d0cdd9662b6bdf94a422c4297438b4c79ede..9de3521b9614e35cb6236209508d87d13a651e6e 100644 --- a/vorgang-manager-server/src/main/resources/application.yml +++ b/vorgang-manager-server/src/main/resources/application.yml @@ -74,11 +74,10 @@ ozgcloud: # file-manager: # address: ${ozgcloud.vorgang-manager.address} # negotiation-type: plaintext -# command-manager: -# address: ${ozgcloud.vorgang-manager.address} -# address: self:self -# negotiation-type: plaintext -# user-manager: -# address: ${grpc.client.user-manager.address:false} -# address: static://127.0.0.1:9000 -# negotiation-type: ${grpc.client.user-manager.negotiationType:TLS} \ No newline at end of file + command-manager: + address: self:self + negotiation-type: plaintext + user-manager: + address: ${grpc.client.user-manager.address} + negotiation-type: ${grpc.client.user-manager.negotiationType + } \ No newline at end of file