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

SUPPORT-8553: fix properties

Browse source
This commit is contained in:
gulnaz 2024-09-19 10:31:54 +03:00
parent 11de13fb13
commit ef02a774d4
9 changed files with 86 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/main/java/ervu/KafkaProducerConfig.java
View file

@ -19,17 +19,17 @@ import org.springframework.kafka.core.ProducerFactory;
*/
@Configuration
public class KafkaProducerConfig {
@Value("${av-kafka.send.url}")
@Value("${av.kafka.send.url}")
private String kafkaUrl;
@Value("${av-kafka.send.security.protocol}")
@Value("${av.kafka.send.security.protocol}")
private String securityProtocol;
@Value("${av-kafka.send.login.module:org.apache.kafka.common.security.scram.ScramLoginModule}")
@Value("${av.kafka.send.login.module:org.apache.kafka.common.security.scram.ScramLoginModule}")
private String loginModule;
@Value("${av-kafka.send.username}")
@Value("${av.kafka.send.username}")
private String username;
@Value("${av-kafka.send.password}")
@Value("${av.kafka.send.password}")
private String password;
@Value("${av-kafka.sasl.mechanism}")
@Value("${av.kafka.sasl.mechanism}")
private String saslMechanism;
@Bean("av-factory")

2
backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java
View file

@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
@Component
public class EsnsiOkopfClient {
@Value("${esnsi.okopf.url:#{null}}")
@Value("${esnsi.okopf.url}")
private String uri;
@Retryable(value = {TimeoutException.class}, backoff =

2
backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
View file

@ -41,7 +41,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:employee-files}")
private String kafkaTopicName;
@Value("${file.webdav.upload.url:http://localhost:5757}")
private String url;

20
backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
View file

@ -24,26 +24,26 @@ import java.util.Map;
@EnableKafka
public class ReplyingKafkaConfig {
@Value("${ervu-kafka.bootstrap-servers}")
@Value("${ervu.kafka.bootstrap.servers}")
private String bootstrapServers;
@Value("${ervu-kafka.org-reply-topic}")
@Value("${ervu.kafka.org.reply.topic}")
private String orgReplyTopic;
@Value("${ervu-kafka.journal-reply-topic}")
@Value("${ervu.kafka.journal.reply.topic}")
private String journalReplyTopic;
@Value("${ervu-kafka.group-id}")
@Value("${ervu.kafka.group.id}")
private String groupId;
@Value("${ervu-kafka.reply-timeout:30}")
@Value("${ervu.kafka.reply.timeout:30}")
private long replyTimeout;
@Value("${ervu-kafka.send.security.protocol}")
@Value("${ervu.kafka.send.security.protocol}")
private String securityProtocol;
@Value("${ervu-kafka.send.login.module:org.apache.kafka.common.security.scram.ScramLoginModule}")
@Value("${ervu.kafka.send.login.module:org.apache.kafka.common.security.scram.ScramLoginModule}")
private String loginModule;
@Value("${ervu-kafka.send.username}")
@Value("${ervu.kafka.send.username}")
private String username;
@Value("${ervu-kafka.send.password}")
@Value("${ervu.kafka.send.password}")
private String password;
@Value("${ervu-kafka.sasl.mechanism}")
@Value("${ervu.kafka.sasl.mechanism}")
private String saslMechanism;
@Bean("ervu")

26
backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
View file

@ -11,43 +11,43 @@ import org.springframework.stereotype.Component;
@Component
public class EsiaConfig {
@Value("${esia-scopes:#{null}}")
@Value("${esia.scopes}")
private String esiaScopes;
@Value("${esia-org-scopes:#{null}}")
@Value("${esia.org.scopes}")
private String esiaOrgScopes;
@Value("${esia-org-scope-url:#{null}}")
@Value("${esia.org.scope.url}")
private String orgScopeUrl;
@Value("${esia-uri.base-uri:#{null}}")
@Value("${esia.base.uri}")
private String esiaBaseUri;
@Value("${esia-client-id:#{null}}")
@Value("${esia.client.id}")
private String clientId;
@Value("${esia-redirect-url:#{null}}")
@Value("${esia.redirect.url}")
private String redirectUrl;
@Value("${sign-url:#{null}}")
@Value("${sign.url}")
private String signUrl;
@Value("${client-cert-hash:#{null}}")
@Value("${client.cert.hash}")
private String clientCertHash;
@Value("${esia.request-timeout:60}")
@Value("${esia.request.timeout:60}")
private long requestTimeout;
@Value("${esia.connection-timeout:30}")
@Value("${esia.connection.timeout:30}")
private long connectionTimeout;
@Value("${esia.logout-url:idp/ext/Logout}")
@Value("${esia.logout.url:idp/ext/Logout}")
private String esiaLogoutUrl;
@Value("${esia.code-url:aas/oauth2/v2/ac}")
@Value("${esia.code.url:aas/oauth2/v2/ac}")
private String esiaCodeUrl;
@Value("${esia.token-url:aas/oauth2/v3/te}")
@Value("${esia.token.url:aas/oauth2/v3/te}")
private String esiaTokenUrl;
public String getEsiaOrgScopes() {

4
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
View file

@ -72,10 +72,10 @@ public class EsiaAuthService {
@Autowired
private OkopfService okopfService;
@Value("${ervu-kafka.org-reply-topic}")
@Value("${ervu.kafka.org.reply.topic}")
private String requestReplyTopic;
@Value("${ervu-kafka.org-request-topic}")
@Value("${ervu.kafka.org.request.topic}")
private String requestTopic;
public String generateAuthCodeUrl() {

6
backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java
View file

@ -31,11 +31,11 @@ public class JournalInMemoryStaticGridLoadService implements
private final ReplyingKafkaService ervuReplyingKafkaService;
private final ObjectMapper objectMapper;
@Value("${ervu-kafka.journal-request-topic}")
@Value("${ervu.kafka.journal.request.topic}")
private String requestTopic;
@Value("${ervu-kafka.journal-reply-topic}")
@Value("${ervu.kafka.journal.reply.topic}")
private String replyTopic;
@Value("${db-journal-excluded-statuses:}")
@Value("${db.journal.excluded.statuses:}")
private String[] excludedStatuses;
public JournalInMemoryStaticGridLoadService(JwtTokenService jwtTokenService,

50
config/micord.env
View file

@ -9,34 +9,34 @@ 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
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
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_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
ERVU_KAFKA_SEND_SECURITY_PROTOCOL=SASL_PLAINTEXT
ERVU_KAFKA_SASL_MECHANISM=SCRAM-SHA-256
ERVU_KAFKA_SEND_USERNAME=user1
ERVU_KAFKA_SEND_PASSWORD=Blfi9d2OFG

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

@ -57,37 +57,37 @@
<property name="file.webdav.upload.url" value="https://ervu-webdav.k8s.micord.ru"/>
<property name="file.webdav.upload.username" value="test"/>
<property name="file.webdav.upload.password" value="test"/>
<property name="av-kafka.download-request-topic" value="ervu.lkrp.download.request"/>
<property name="av-kafka.send.url" value="localhost:9092"/>
<property name="av-kafka.send.security.protocol" value="SASL_PLAINTEXT"/>
<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.download-request-topic" value="ervu.lkrp.download.request"/>
<property name="av.kafka.send.url" value="localhost:9092"/>
<property name="av.kafka.send.security.protocol" value="SASL_PLAINTEXT"/>
<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="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"/>
<property name="esia-scopes" value="fullname, snils, id_doc, birthdate, usr_org, openid"/>
<property name="esia-org-scopes" value="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"/>
<property name="esia-org-scope-url" value="http://esia.gosuslugi.ru/"/>
<property name="esia-uri.base-uri" value="https://esia-portal1.test.gosuslugi.ru/"/>
<property name="esia-client-id" value="MNSV89"/>
<property name="esia-redirect-url" value="https://lkrp.micord.ru"/>
<property name="sign-url" value="https://ervu-sign-dev.k8s.micord.ru/sign"/>
<property name="ervu-kafka.bootstrap-servers" value="localhost:9092"/>
<property name="ervu-kafka.org-reply-topic" value="ervu.organization.response"/>
<property name="ervu-kafka.group-id" value="1"/>
<property name="ervu-kafka.org-request-topic" value="ervu.organization.request"/>
<property name="ervu-kafka.reply-timeout" value="30"/>
<property name="client-cert-hash" value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD"/>
<property name="esia.scopes" value="fullname, snils, id_doc, birthdate, usr_org, openid"/>
<property name="esia.org.scopes" value="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"/>
<property name="esia.org.scope.url" value="http://esia.gosuslugi.ru/"/>
<property name="esia.base.uri" value="https://esia-portal1.test.gosuslugi.ru/"/>
<property name="esia.client.id" value="MNSV89"/>
<property name="esia.redirect.url" value="https://lkrp.micord.ru"/>
<property name="sign.url" value="https://ervu-sign-dev.k8s.micord.ru/sign"/>
<property name="ervu.kafka.bootstrap.servers" value="localhost:9092"/>
<property name="ervu.kafka.org.reply.topic" value="ervu.organization.response"/>
<property name="ervu.kafka.group.id" value="1"/>
<property name="ervu.kafka.org.request.topic" value="ervu.organization.request"/>
<property name="ervu.kafka.reply.timeout" value="30"/>
<property name="client.cert.hash" value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD"/>
<property name="bpmn.enable" value="false"/>
<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="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"/>
<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>
<management>
<audit-log>