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

SUPPORT-8553: fix properties; add micord.env

Browse source
This commit is contained in:
gulnaz 2024-09-19 12:21:28 +03:00
parent 024ac88f23
commit 2382841891
8 changed files with 65 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

35
backend/src/main/java/dto/jivoprofile/JivoProfileDto.java
View file

@ -1,35 +0,0 @@
package dto.jivoprofile;
import ru.cg.webbpm.modules.webkit.annotations.Model;
@Model
public class JivoProfileDto {
public String username;
public String email;
public String phone;
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
}

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

@ -21,16 +21,16 @@ import java.util.Map;
@EnableKafka
public class ReplyingKafkaConfig {
@Value("${ervu-kafka.bootstrap-servers}")
@Value("${ervu.kafka.bootstrap.servers}")
private String bootstrapServers;
@Value("${ervu-kafka.reply-topic}")
@Value("${ervu.kafka.reply.topic}")
private String replyTopic;
@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;
@Bean

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

@ -11,37 +11,37 @@ import org.springframework.stereotype.Component;
@Component
public class EsiaConfig {
@Value("${esia-scopes:#{null}}")
@Value("${esia.scopes}")
private String esiaScopes;
@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/v3/te}")
@Value("${esia.code.url:aas/oauth2/v3/te}")
private String esiaCodeUrl;
@Value("${esia.token-url:aas/oauth2/v3/te}")
@Value("${esia.token.url:aas/oauth2/v3/te}")
private String esiaTokenUrl;
public String getEsiaScopes() {

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

@ -44,7 +44,7 @@ import ru.micord.ervu.security.webbpm.jwt.model.Token;
@Service
public class EsiaAuthService {
@Value("${cookie-path:#{null}}")
@Value("${cookie.path:#{null}}")
private String path;
@Autowired
@ -62,10 +62,10 @@ public class EsiaAuthService {
@Autowired
private PersonalDataService personalDataService;
@Value("${ervu-kafka.reply-topic}")
@Value("${ervu.kafka.reply.topic}")
private String requestReplyTopic;
@Value("${ervu-kafka.request-topic}")
@Value("${ervu.kafka.request.topic}")
private String requestTopic;
public String generateAuthCodeUrl() {

2
backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
View file

@ -25,7 +25,7 @@ public class JwtTokenService {
private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Value("${webbpm.security.token.issuer:#{null}}")
@Value("${webbpm.security.token.issuer}")
private final String tokenIssuerName =
ResourceMetadataUtils.PROJECT_GROUP_ID + "." + ResourceMetadataUtils.PROJECT_ARTIFACT_ID;
private final SecretKey SIGNING_KEY;

23
config/micord.env Normal file
View file

@ -0,0 +1,23 @@
TZ=Europe/Moscow
# App datasource
DB_APP_USERNAME=ervu-lkrp-fl
DB_APP_PASSWORD=ervu-lkrp-fl
DB_APP_HOST=10.10.31.119
DB_APP_PORT=5432
DB_APP_NAME=ervu-lkrp-fl
ESIA_SCOPES=snils, fullname, birthdate, id_doc
ESIA_BASE_URI=https://esia-portal1.test.gosuslugi.ru/
ESIA_CLIENT_ID=MNSV89
ESIA_REDIRECT_URL=https://lkrp-dev.micord.ru/fl/
SIGN_URL=https://ervu-sign-dev.k8s.micord.ru/sign
CLIENT_CERT_HASH=04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD
ERVU_KAFKA_BOOTSTRAP_SERVERS=localhost:9092
ERVU_KAFKA_REPLY_TOPIC=ervu.lkpr.person.search.response
ERVU_KAFKA_GROUP_ID=1
ERVU_KAFKA_REQUEST_TOPIC=ervu.lkpr.person.search.request
ERVU_KAFKA_REPLY_TIMEOUT=30
ERVU_KAFKA_SEND_SECURITY_PROTOCOL=SASL_PLAINTEXT
ERVU_KAFKA_SASL_MECHANISM=SCRAM-SHA-256
ERVU_KAFKA_SEND_USERNAME=user1
ERVU_KAFKA_SEND_PASSWORD=Blfi9d2OFG

22
config/patches/default.cli
View file

@ -28,14 +28,14 @@ xa-data-source add \
/system-property=security.password.regex:add(value="^((?=(.*\\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$")
/system-property=fias.enable:add(value=false)
/system-property=bpmn.enable:add(value=false)
/system-property=esia-scopes:add(value="snils, fullname, birthdate, id_doc")
/system-property=esia-uri.base-uri:add(value="https://esia-portal1.test.gosuslugi.ru/")
/system-property=esia-client-id:add(value="MNSV89")
/system-property=esia-redirect-url:add(value="https://lkrp-dev.micord.ru/fl/")
/system-property=sign-url:add(value="https://ervu-sign-dev.k8s.micord.ru/sign")
/system-property=client-cert-hash:add(value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD")
/system-property=ervu-kafka.bootstrap-servers:add(value="localhost:9092")
/system-property=ervu-kafka.org-reply-topic:add(value="ervu.organization.response")
/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=esia.scopes:add(value="snils, fullname, birthdate, id_doc")
/system-property=esia.base.uri:add(value="https://esia-portal1.test.gosuslugi.ru/")
/system-property=esia.client.id:add(value="MNSV89")
/system-property=esia.redirect.url:add(value="https://lkrp-dev.micord.ru/fl/")
/system-property=sign.url:add(value="https://ervu-sign-dev.k8s.micord.ru/sign")
/system-property=client.cert.hash:add(value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD")
/system-property=ervu.kafka.bootstrap.servers:add(value="localhost:9092")
/system-property=ervu.kafka.reply.topic:add(value="ervu.lkpr.person.search.response")
/system-property=ervu.kafka.group.id:add(value="1")
/system-property=ervu.kafka.request.topic:add(value="ervu.lkpr.person.search.request")
/system-property=ervu.kafka.reply.timeout:add(value="30")

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

@ -54,18 +54,18 @@
<property name="security.password.regex" value="^((?=(.*\d){1,})(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ]).{8,})$"/>
<property name="fias.enable" value="false"/>
<property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
<property name="esia-scopes" value="snils, fullname, birthdate, id_doc"/>
<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="client-cert-hash" value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD"/>
<property name="esia.scopes" value="snils, fullname, birthdate, id_doc"/>
<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="client.cert.hash" value="04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD"/>
<property name="bpmn.enable" value="false"/>
<property name="ervu-kafka.bootstrap-servers" value="localhost:9092"/>
<property name="ervu-kafka.reply-topic" value="ervu.lkpr.person.search.response"/>
<property name="ervu-kafka.group-id" value="1"/>
<property name="ervu-kafka.request-topic" value="ervu.lkpr.person.search.request"/>
<property name="ervu-kafka.reply-timeout" value="30"/>
<property name="ervu.kafka.bootstrap.servers" value="localhost:9092"/>
<property name="ervu.kafka.reply.topic" value="ervu.lkpr.person.search.response"/>
<property name="ervu.kafka.group.id" value="1"/>
<property name="ervu.kafka.request.topic" value="ervu.lkpr.person.search.request"/>
<property name="ervu.kafka.reply.timeout" value="30"/>
</system-properties>
<management>
<audit-log>
@ -569,4 +569,4 @@
<remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
</outbound-socket-binding>
</socket-binding-group>
</server>
</server>