micord/ervu-lkrp-av
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/release/1.0.0'

Browse source
This commit is contained in:
Zaripov Emil 2024-09-24 16:39:39 +03:00
commit 7295b4b68f
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/resources/application.properties
View file

@ -8,11 +8,11 @@ spring.kafka.admin.properties.sasl.jaas.config=org.apache.kafka.common.security.
spring.kafka.admin.properties.sasl.mechanism=SCRAM-SHA-256 spring.kafka.admin.properties.sasl.mechanism=SCRAM-SHA-256
# kafka out servers for admin bean # kafka out servers for admin bean
#host1:port1, host2:port2 #host1:port1, host2:port2
spring.kafka.bootstrap.servers=${OUT_KAFKA_SERVERS} spring.kafka.bootstrap.servers=${ERVU_KAFKA_BOOTSTRAP_SERVERS}
# #
# kafka in consumer (with possibility for default bean) # kafka in consumer (with possibility for default bean)
#host1:port1, host2:port2 #host1:port1, host2:port2
spring.kafka.consumer.bootstrap.servers=${AV_KAFKA_SERVERS} spring.kafka.consumer.bootstrap.servers=${AV_KAFKA_BOOTSTRAP_SERVERS}
spring.kafka.consumer.security.protocol=SASL_PLAINTEXT spring.kafka.consumer.security.protocol=SASL_PLAINTEXT
#login password to set #login password to set
spring.kafka.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${AV_KAFKA_USERNAME}" password="${AV_KAFKA_PASSWORD}"; spring.kafka.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${AV_KAFKA_USERNAME}" password="${AV_KAFKA_PASSWORD}";
@ -25,7 +25,7 @@ spring.kafka.listener.ack.mode=MANUAL_IMMEDIATE
# #
# kafka out producer (with possibility for default bean) # kafka out producer (with possibility for default bean)
#host1:port1, host2:port2 #host1:port1, host2:port2
spring.kafka.producer.bootstrap.servers=${ERVU_KAFKA_SERVERS} spring.kafka.producer.bootstrap.servers=${ERVU_KAFKA_BOOTSTRAP_SERVERS}
spring.kafka.producer.security.protocol=SASL_PLAINTEXT spring.kafka.producer.security.protocol=SASL_PLAINTEXT
#login password to set #login password to set
spring.kafka.producer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${ERVU_KAFKA_USERNAME}" password="${ERVU_KAFKA_PASSWORD}"; spring.kafka.producer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${ERVU_KAFKA_USERNAME}" password="${ERVU_KAFKA_PASSWORD}";
@ -40,7 +40,7 @@ spring.kafka.properties.sasl.mechanism=SCRAM-SHA-256
# #
# kafka out consumer (not for default bean creation by spring) # kafka out consumer (not for default bean creation by spring)
#host1:port1, host2:port2 #host1:port1, host2:port2
spring.kafka.out.consumer.bootstrap.servers=${ERVU_KAFKA_SERVERS} spring.kafka.out.consumer.bootstrap.servers=${ERVU_KAFKA_BOOTSTRAP_SERVERS}
spring.kafka.out.consumer.security.protocol=SASL_PLAINTEXT spring.kafka.out.consumer.security.protocol=SASL_PLAINTEXT
#login password to set #login password to set
spring.kafka.out.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${ERVU_KAFKA_USERNAME}" password="${ERVU_KAFKA_PASSWORD}"; spring.kafka.out.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${ERVU_KAFKA_USERNAME}" password="${ERVU_KAFKA_PASSWORD}";

4
test.env
View file

@ -1,8 +1,8 @@
AV_KAFKA_SERVERS=10.10.31.11:32609 AV_KAFKA_BOOTSTRAP_SERVERS=10.10.31.11:32609
AV_KAFKA_USERNAME=user1 AV_KAFKA_USERNAME=user1
AV_KAFKA_PASSWORD=Blfi9d2OFG AV_KAFKA_PASSWORD=Blfi9d2OFG
AV_KAFKA_TOPIC_NAME=file-to-upload AV_KAFKA_TOPIC_NAME=file-to-upload
ERVU_KAFKA_SERVERS=10.10.31.11:32609 ERVU_KAFKA_BOOTSTRAP_SERVERS=10.10.31.11:32609
ERVU_KAFKA_USERNAME=user1 ERVU_KAFKA_USERNAME=user1
ERVU_KAFKA_PASSWORD=Blfi9d2OFG ERVU_KAFKA_PASSWORD=Blfi9d2OFG
ERVU_KAFKA_ERROR_TOPIC_NAME=ervu.lkrp.download.request ERVU_KAFKA_ERROR_TOPIC_NAME=ervu.lkrp.download.request