Merge branch 'master' into develop
This commit is contained in:
commit
e7c9c14533
3 changed files with 3 additions and 2 deletions
|
|
@ -42,7 +42,7 @@ public class EmployeeInfoFileUploadService {
|
|||
private final UlDataService ulDataService;
|
||||
private final JwtTokenService jwtTokenService;
|
||||
|
||||
@Value("${av.kafka.send.message.topic.name:employee-files}")
|
||||
@Value("${av.kafka.send.message.topic.name}")
|
||||
private String kafkaTopicName;
|
||||
@Value("${file.webdav.upload.url:http://localhost:5757}")
|
||||
private String url;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ DB_APP_NAME=ervu-lkrp-ul
|
|||
FILE_WEBDAV_UPLOAD_URL=https://ervu-webdav.k8s.micord.ru
|
||||
FILE_WEBDAV_UPLOAD_USERNAME=test
|
||||
FILE_WEBDAV_UPLOAD_PASSWORD=test
|
||||
AV_KAFKA_SEND_MESSAGE_TOPIC_NAME=file-upload-v2
|
||||
AV_KAFKA_SEND_MESSAGE_TOPIC_NAME=file-to-upload
|
||||
AV_KAFKA_SEND_URL=http://10.10.31.11:32609
|
||||
AV_KAFKA_SEND_SECURITY_PROTOCOL=SASL_PLAINTEXT
|
||||
AV_KAFKA_SASL_MECHANISM=SCRAM-SHA-256
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
<property name="av.kafka.sasl.mechanism" value="SCRAM-SHA-256"/>
|
||||
<property name="av.kafka.send.username" value="user1"/>
|
||||
<property name="av.kafka.send.password" value="Blfi9d2OFG"/>
|
||||
<property name="av.kafka.send.message.topic.name" value="file-to-upload"/>
|
||||
<property name="ervu.fileupload.max_file_size" value="5242880"/>
|
||||
<property name="ervu.fileupload.max_request_size" value="6291456"/>
|
||||
<property name="ervu.fileupload.file_size_threshold" value="0"/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue