From ea6819e940cfb3bebcb07a28cd53204fe267f4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=9E=D1=80=D1=83=D0=B4=D0=B6=D0=B5=D0=B2?= Date: Fri, 23 Oct 2020 18:48:52 +0400 Subject: [PATCH] examples updated --- examples/spring-mail-integration-demo/pom.xml | 2 +- .../integration/IntegrationConfig.java | 7 ++----- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/examples/spring-mail-integration-demo/pom.xml b/examples/spring-mail-integration-demo/pom.xml index 6b2b9b0a..ed8dbc9e 100644 --- a/examples/spring-mail-integration-demo/pom.xml +++ b/examples/spring-mail-integration-demo/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.1.RELEASE + 2.3.4.RELEASE diff --git a/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java b/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java index 98b82c57..abdf6183 100644 --- a/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java +++ b/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java @@ -67,11 +67,8 @@ public class IntegrationConfig { , mapping -> mapping.subFlowMapping(true, sub -> sub .transform(messageTransformer, TRANSFORM_METHOD_NAME) .handle(m -> { - val isImportant = m.getHeaders().get(IS_IMPORTANT_MESSAGE, Boolean.class); - if (isImportant != null && isImportant) { - System.out.println("Как будто посылаем письмо: " + m.getPayload()); - //mailSender.send((SimpleMailMessage) m.getPayload()); - } + System.out.println("Как будто посылаем письмо: " + m.getPayload()); + //mailSender.send((SimpleMailMessage) m.getPayload()); }) ) .subFlowMapping(false, IntegrationFlowDefinition::nullChannel) diff --git a/examples/spring-mail-integration-demo/src/main/resources/application.yml b/examples/spring-mail-integration-demo/src/main/resources/application.yml index 604b3bc3..81517b8f 100644 --- a/examples/spring-mail-integration-demo/src/main/resources/application.yml +++ b/examples/spring-mail-integration-demo/src/main/resources/application.yml @@ -12,7 +12,7 @@ spring: generate-ddl: false hibernate: ddl-auto: none - show-sql: true + show-sql: false mail: host: smtp.mail.ru diff --git a/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/src/main/resources/application.yml b/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/src/main/resources/application.yml index 00e977d8..9f524cd3 100644 --- a/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/src/main/resources/application.yml +++ b/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/src/main/resources/application.yml @@ -11,4 +11,4 @@ spring: show-sql: false rabbitmq: - addresses: "192.168.99.100" \ No newline at end of file + addresses: "localhost" \ No newline at end of file diff --git a/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/src/main/resources/application.yml b/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/src/main/resources/application.yml index 5f611b88..c4bce31a 100644 --- a/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/src/main/resources/application.yml +++ b/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/src/main/resources/application.yml @@ -15,7 +15,7 @@ spring: show-sql: true rabbitmq: - addresses: "192.168.99.100" + addresses: "localhost" mail: host: smtp.mail.ru