Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-8975_load_users
# Conflicts: # config/micord.env # resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page
This commit is contained in:
commit
715e60cdc5
88 changed files with 6091 additions and 13604 deletions
|
|
@ -56,6 +56,7 @@
|
|||
<property name="fias.enable" value="false"/>
|
||||
<property name="registration.enabled" value="false"/>
|
||||
<property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
|
||||
<property name="ervu.url" value="https://ervu-uat.test.gosuslugi.ru"/>
|
||||
</system-properties>
|
||||
<management>
|
||||
<audit-log>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ DB_SEC_HOST=10.10.31.118
|
|||
DB_SEC_PORT=5432
|
||||
DB_SEC_NAME=account_applications
|
||||
|
||||
# ERVU properties
|
||||
ERVU_URL=
|
||||
ERVU_HTTP_TIMEOUT=
|
||||
ERVU_URL=https://ervu-uat.test.gosuslugi.ru
|
||||
TEST_USER_ID=
|
||||
TEST_TOKEN=
|
||||
ERVU_HTTP_TIMEOUT=
|
||||
|
|
@ -50,3 +50,5 @@ SECURITY_MANAGER="false"
|
|||
# If you wish to further customize your tomcat environment,
|
||||
# put your own definitions here
|
||||
# (i.e. LD_LIBRARY_PATH for some jdbc drivers)
|
||||
|
||||
JAVA_OPTS="$JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8787"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue