From 7950e67c20454bc31cbbb7db53b3a1c672c490ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B0=D0=BB=D1=82=D0=BE=D0=B1=D0=B8=D0=BD=20=D0=95?= =?UTF-8?q?=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= Date: Wed, 18 Sep 2024 10:56:52 +0300 Subject: [PATCH] moved properties to env file --- config/micord.env | 35 +++++++++++++++++++++ config/tomcat/etc/tomcat/webbpm.properties | 36 ---------------------- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/config/micord.env b/config/micord.env index 8c3a35b4..a4426f69 100644 --- a/config/micord.env +++ b/config/micord.env @@ -5,3 +5,38 @@ DB_APP_PASSWORD=ervu-lkrp-ul DB_APP_HOST=10.10.31.119 DB_APP_PORT=5432 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_URL=http://10.10.31.11:32609 +AV-KAFKA_SEND_SECURITY_PROTOCOL=SASL_PLAINTEXT +AV-KAFKA_SASL_MECHANISM=SCRAM-SHA-256 +AV-KAFKA_SEND_USERNAME=user1 +AV-KAFKA_SEND_PASSWORD=Blfi9d2OFG +ERVU_FILEUPLOAD_MAX_FILE_SIZE=5242880 +ERVU_FILEUPLOAD_MAX_REQUEST_SIZE=6291456 +ERVU_FILEUPLOAD_FILE_SIZE_THRESHOLD=0 + +ESIA-SCOPES=fullname, snils, id_doc, birthdate, usr_org, openid +ESIA-ORG-SCOPES=org_fullname, org_shortname, org_brhs, org_brhs_ctts, org_brhs_addrs, org_type, org_ogrn, org_inn, org_leg, org_kpp, org_ctts, org_addrs, org_grps, org_emps +ESIA-ORG-SCOPE-URL=http://esia.gosuslugi.ru/ +ESIA-URI_BASE-URI=https://test7.ru/ +ESIA-CLIENT-ID=MNSV89 +ESIA-REDIRECT-URL=https://lkrp-dev.micord.ru/ul/ +SIGN-URL=https://ervu-sign-dev.k8s.micord.ru/sign +CLIENT-CERT-HASH=04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD +ERVU-KAFKA_BOOTSTRAP-SERVERS=localhost:9092 +ERVU-KAFKA_ORG-REPLY-TOPIC=ervu.organization.response +ERVU-KAFKA_GROUP-ID=1 +ERVU-KAFKA_ORG-REQUEST-TOPIC=ervu.organization.request +ERVU-KAFKA_REPLY-TIMEOUT=30 +ERVU-KAFKA_JOURNAL-REQUEST-TOPIC=ervu.organization.journal.request +ERVU-KAFKA_JOURNAL-REPLY-TOPIC=ervu.organization.journal.response +ESNSI_OKOPF_URL=https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8 +ESNSI_OKOPF_CRON_LOAD=0 0 */1 * * * +ERVU-KAFKA_SEND_SECURITY_PROTOCOL=SASL_PLAINTEXT +ERVU-KAFKA_SASL_MECHANISM=SCRAM-SHA-256 +ERVU-KAFKA_SEND_USERNAME=user1 +ERVU-KAFKA_SEND_PASSWORD=Blfi9d2OFG \ No newline at end of file diff --git a/config/tomcat/etc/tomcat/webbpm.properties b/config/tomcat/etc/tomcat/webbpm.properties index 574fc256..dbd3ab73 100644 --- a/config/tomcat/etc/tomcat/webbpm.properties +++ b/config/tomcat/etc/tomcat/webbpm.properties @@ -16,39 +16,3 @@ webbpm.mode=production webbpm.jbpm.hibernate_statistics.enabled=false webbpm.cache.hazelcast.hosts=127.0.0.1 webbpm.cache.hazelcast.outbound_port_definitions=5801-5820 - - -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.url=http://10.10.31.11:32609 -av-kafka.send.security.protocol=SASL_PLAINTEXT -av-kafka.sasl.mechanism=SCRAM-SHA-256 -av-kafka.send.username=user1 -av-kafka.send.password=Blfi9d2OFG -ervu.fileupload.max_file_size=5242880 -ervu.fileupload.max_request_size=6291456 -ervu.fileupload.file_size_threshold=0 - -esia-scopes=fullname, snils, id_doc, birthdate, usr_org, openid -esia-org-scopes=org_fullname, org_shortname, org_brhs, org_brhs_ctts, org_brhs_addrs, org_type, org_ogrn, org_inn, org_leg, org_kpp, org_ctts, org_addrs, org_grps, org_emps -esia-org-scope-url=http://esia.gosuslugi.ru/ -esia-uri.base-uri=https://esia-portal1.test.gosuslugi.ru/ -esia-client-id=MNSV89 -esia-redirect-url=https://lkrp-dev.micord.ru/ul/ -sign-url=https://ervu-sign-dev.k8s.micord.ru/sign -client-cert-hash=04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD -ervu-kafka.bootstrap-servers=localhost:9092 -ervu-kafka.org-reply-topic=ervu.organization.response -ervu-kafka.group-id=1 -ervu-kafka.org-request-topic=ervu.organization.request -ervu-kafka.reply-timeout=30 -ervu-kafka.journal-request-topic=ervu.organization.journal.request -ervu-kafka.journal-reply-topic=ervu.organization.journal.response -esnsi.okopf.url=https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8 -esnsi.okopf.cron.load=0 0 */1 * * * -ervu-kafka.send.security.protocol=SASL_PLAINTEXT -ervu-kafka.sasl.mechanism=SCRAM-SHA-256 -ervu-kafka.send.username=user1 -ervu-kafka.send.password=Blfi9d2OFG \ No newline at end of file