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

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

Browse source 
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/patches/default.cli
#	config/standalone/dev/standalone.xml
#	frontend/src/resources/app-config.json
#	resources/src/main/resources/business-model/Журнал взаимодействия.page
This commit is contained in:
gulnaz 2024-09-13 17:12:11 +03:00
commit 79833feb75
56 changed files with 3908 additions and 667 deletions
Download patch file Download diff file Expand all files Collapse all files

9
config/patches/default.cli
View file

@ -53,8 +53,11 @@ xa-data-source add \
/system-property=ervu-kafka.group-id:add(value="1")
/system-property=ervu-kafka.org-request-topic:add(value="ervu.organization.request")
/system-property=ervu-kafka.reply-timeout:add(value="30")
/system-property=ervu.cron.load.enable(value="true")
/system-property=ervu.cron.load.time(value="0 0 */1 * * *")
/system-property=ervu.esnsi.classifier.url.load(value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8"")
/system-property=esnsi.okopf.cron.load:add(value="0 0 */1 * * *")
/system-property=esnsi.okopf.url:add(value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&encoding=UTF_8")
/system-property=ervu-kafka.send.security.protocol:add(value="SASL_PLAINTEXT")
/system-property=ervu-kafka.sasl.mechanism:add(value="SCRAM-SHA-256")
/system-property=ervu-kafka.send.username:add(value="user1")
/system-property=ervu-kafka.send.password:add(value="Blfi9d2OFG")
/system-property=ervu-kafka.journal-request-topic:add(value="ervu.organization.journal.request")
/system-property=ervu-kafka.journal-reply-topic:add(value="ervu.organization.journal.response")

8
config/standalone/dev/standalone.xml
View file

@ -80,8 +80,12 @@
<property name="ervu-kafka.reply-timeout" value="30"/>
<property name="client-cert-hash" value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD"/>
<property name="bpmn.enable" value="false"/>
<property name="ervu.cron.load.time" value="0 0 */1 * * *"/>
<property name="ervu.esnsi.classifier.url.load" value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&amp;encoding=UTF_8"/>
<property name="ervu-kafka.send.security.protocol" value="SASL_PLAINTEXT"/>
<property name="ervu-kafka.sasl.mechanism" value="SCRAM-SHA-256"/>
<property name="ervu-kafka.send.username" value="user1"/>
<property name="ervu-kafka.send.password" value="Blfi9d2OFG"/>
<property name="esnsi.okopf.cron.load" value="0 0 */1 * * *"/>
<property name="esnsi.okopf.url" value="https://esnsi.gosuslugi.ru/rest/ext/v1/classifiers/11465/file?extension=JSON&amp;encoding=UTF_8"/>
<property name="ervu-kafka.journal-request-topic" value="ervu.organization.journal.request"/>
<property name="ervu-kafka.journal-reply-topic" value="ervu.organization.journal.response"/>
</system-properties>

8
config/tomcat/tomee/conf/webbpm.properties
View file

@ -40,4 +40,10 @@ 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.reply-timeout=30
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