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

Merge branch 'release/1.0.0' of 10.10.31.70:/ervu-lkrp-ul into release/1.0.0

Browse source
This commit is contained in:
gulnaz 2024-09-16 12:00:33 +03:00
commit 73456d5913
2 changed files with 1 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public class EsiaConfig {
@Value("${esia.logout-url:idp/ext/Logout}")
private String esiaLogoutUrl;
@Value("${esia.code-url:aas/oauth2/v3/te}")
@Value("${esia.code-url:aas/oauth2/v2/ac}")
private String esiaCodeUrl;
@Value("${esia.token-url:aas/oauth2/v3/te}")

74
backend/src/main/java/ru/micord/ervu/security/esia/model/PassportModel.java
View file

@ -1,74 +0,0 @@
package ru.micord.ervu.security.esia.model;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
import org.springframework.data.elasticsearch.annotations.DateFormat;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
/**
* @author Eduard Tihomirov
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class PassportModel implements Serializable {
private static final long serialVersionUID = 1L;
private String series;
private String number;
@Field(type = FieldType.Date, store = true, format = DateFormat.basic_date)
@JsonSerialize(using = LocalDateSerializer.class)
@JsonFormat(pattern = "dd.MM.yyyy")
private Date issueDate;
private String issueId;
private String issuedBy;
public String getSeries() {
return series;
}
public void setSeries(String series) {
this.series = series;
}
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public Date getIssueDate() {
return issueDate;
}
public void setIssueDate(Date issueDate) {
this.issueDate = issueDate;
}
public String getIssueId() {
return issueId;
}
public void setIssueId(String issueId) {
this.issueId = issueId;
}
public String getIssuedBy() {
return issuedBy;
}
public void setIssuedBy(String issuedBy) {
this.issuedBy = issuedBy;
}
}