diff --git a/file-upload/src/main/java/ru/cg/subproject/kafka/config/KafkaTopicConfig.java b/file-upload/src/main/java/ru/cg/subproject/kafka/config/KafkaTopicConfig.java index a44b82f..0795327 100644 --- a/file-upload/src/main/java/ru/cg/subproject/kafka/config/KafkaTopicConfig.java +++ b/file-upload/src/main/java/ru/cg/subproject/kafka/config/KafkaTopicConfig.java @@ -11,18 +11,18 @@ import org.springframework.kafka.config.TopicBuilder; */ @Configuration public class KafkaTopicConfig { - @Value("${kafka-out.topic.error.name}") - private String kafkaOutTopicErrorName; - @Value("${kafka-out.topic.success.name}") - private String kafkaOutTopicSuccessName; + @Value("${kafka-out.error.topic.name}") + private String kafkaOutErrorTopicName; + @Value("${kafka-out.success.topic.name}") + private String kafkaOutSuccessTopicName; @Bean public NewTopic outErrorTopic() { - return TopicBuilder.name(kafkaOutTopicErrorName).build(); + return TopicBuilder.name(kafkaOutErrorTopicName).build(); } @Bean public NewTopic outSuccessTopic() { - return TopicBuilder.name(kafkaOutTopicSuccessName).build(); + return TopicBuilder.name(kafkaOutSuccessTopicName).build(); } } diff --git a/file-upload/src/main/java/ru/cg/subproject/service/FileUploadService.java b/file-upload/src/main/java/ru/cg/subproject/service/FileUploadService.java index 78965f4..121aa90 100644 --- a/file-upload/src/main/java/ru/cg/subproject/service/FileUploadService.java +++ b/file-upload/src/main/java/ru/cg/subproject/service/FileUploadService.java @@ -45,8 +45,8 @@ public class FileUploadService { private static final Logger logger = LoggerFactory.getLogger(FileUploadService.class); @Value("${av.rest.address}") private String avRestAddress; - @Value("${file.before.av.path:}") - private String fileBeforeAvPath; + @Value("${file.saving.path}") + private String fileSavingPath; @Value("${http.file.server.out.address:http://localhost/out}") private String httpFileServerOutAddress; private final KafkaTemplate kafkaTemplate; @@ -67,7 +67,7 @@ public class FileUploadService { try { FileUrl fileUrl = parseFileUrl(inMessage.fileInfo().getFileNameBase()); - String filePath = fileBeforeAvPath + fileUrl.fileName(); + String filePath = fileSavingPath + fileUrl.fileName(); String downloadUrl = fileUrl.fileUrl(); downloadFileByHttp(downloadUrl, filePath); @@ -232,4 +232,7 @@ public class FileUploadService { } }); } + + private record FileUrl(String fileName, String fileUrl) { + } } diff --git a/file-upload/src/main/java/ru/cg/subproject/service/FileUrl.java b/file-upload/src/main/java/ru/cg/subproject/service/FileUrl.java deleted file mode 100644 index 910181d..0000000 --- a/file-upload/src/main/java/ru/cg/subproject/service/FileUrl.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.cg.subproject.service; - -/** - * @author r.latypov - */ -public record FileUrl(String fileName, String fileUrl) { -} diff --git a/file-upload/src/main/resources/application.properties b/file-upload/src/main/resources/application.properties index 35d1ad6..f279a02 100644 --- a/file-upload/src/main/resources/application.properties +++ b/file-upload/src/main/resources/application.properties @@ -24,9 +24,9 @@ spring.kafka.properties.sasl.jaas.config=org.apache.kafka.common.security.scram. spring.kafka.properties.sasl.mechanism=SCRAM-SHA-256 # kafka-in.topic.name=file-to-upload -kafka-out.topic.error.name=error -kafka-out.topic.success.name=success +kafka-out.error.topic.name=error +kafka-out.success.topic.name=success # av.rest.address=http://:/scans -file.before.av.path=/nginx/transfer/ +file.saving.path=/nginx/transfer/ http.file.server.out.address=http://localhost/out