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

SUPPORT-8942: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2025-02-26 12:43:59 +03:00
parent 3a7e507861
commit be04288309
8 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,7 @@ import ru.micord.ervu.exception.JsonParsingException;
import ru.micord.ervu.security.esia.model.EmployeeModel; import ru.micord.ervu.security.esia.model.EmployeeModel;
import ru.micord.ervu.security.esia.model.PersonModel; import ru.micord.ervu.security.esia.model.PersonModel;
import ru.micord.ervu.security.esia.service.UlDataService; import ru.micord.ervu.security.esia.service.UlDataService;
import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
import ru.micord.ervu.security.webbpm.jwt.UserIdsPair; import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
import ru.micord.ervu.service.InteractionService; import ru.micord.ervu.service.InteractionService;

4
backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoStore.java → backend/src/main/java/ru/micord/ervu/security/esia/EsiaAuthInfoStore.java
View file

@ -1,4 +1,4 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.util.Map; import java.util.Map;
@ -6,6 +6,8 @@ import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ru.micord.ervu.security.esia.model.ExpiringState;
import ru.micord.ervu.security.esia.model.ExpiringToken;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov

2
backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringState.java → backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringState.java
View file

@ -1,4 +1,4 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia.model;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov

2
backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringToken.java → backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringToken.java
View file

@ -1,4 +1,4 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia.model;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov

7
backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoClearShedulerService.java → backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthInfoClearShedulerService.java
View file

@ -1,17 +1,18 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia.service;
import net.javacrumbs.shedlock.core.SchedulerLock; import net.javacrumbs.shedlock.core.SchedulerLock;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov
*/ */
@Service @Service
public class EsiaAuthInfoClearShedulerService { public class EsiaAuthInfoClearShedulerService {
@Scheduled(cron = "${esia.token.clear.cron:0 0 */1 * * *}") @Scheduled(cron = "${esia.auth.info.clear.cron:0 0 */1 * * *}")
@SchedulerLock(name = "clearToken") @SchedulerLock(name = "clearAuthInfo")
@Transactional @Transactional
public void run() { public void run() {
EsiaAuthInfoStore.removeExpiredRefreshToken(); EsiaAuthInfoStore.removeExpiredRefreshToken();

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

@ -37,7 +37,7 @@ import ru.micord.ervu.security.esia.model.EsiaHeader;
import ru.micord.ervu.security.esia.model.EsiaTokenResponse; import ru.micord.ervu.security.esia.model.EsiaTokenResponse;
import ru.micord.ervu.security.esia.model.FormUrlencoded; import ru.micord.ervu.security.esia.model.FormUrlencoded;
import ru.micord.ervu.security.esia.model.OrganizationModel; import ru.micord.ervu.security.esia.model.OrganizationModel;
import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContext;

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

@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
import ru.micord.ervu.security.webbpm.jwt.model.Token; import ru.micord.ervu.security.webbpm.jwt.model.Token;
import ru.cg.webbpm.modules.resources.api.ResourceMetadataUtils; import ru.cg.webbpm.modules.resources.api.ResourceMetadataUtils;

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

@ -93,7 +93,7 @@
<property name="ervu.kafka.excerpt.request.topic" value="ervu.lkrp.excerpt.request"/> <property name="ervu.kafka.excerpt.request.topic" value="ervu.lkrp.excerpt.request"/>
<property name="av.kafka.group.id" value="1"/> <property name="av.kafka.group.id" value="1"/>
<property name="av.kafka.download.response" value="ervu.lkrp.av-fileupload-status"/> <property name="av.kafka.download.response" value="ervu.lkrp.av-fileupload-status"/>
<property name="esia.token.clear.cron" value="0 0 */1 * * *"/> <property name="esia.auth.info.clear.cron" value="0 0 */1 * * *"/>
<property name="esia.upload.data.role" value="MNSV89_UPLOAD_DATA"/> <property name="esia.upload.data.role" value="MNSV89_UPLOAD_DATA"/>
<property name="webdav.cleanup.cron" value="0 0 0 * * *"/> <property name="webdav.cleanup.cron" value="0 0 0 * * *"/>
<property name="webdav.retry.delay" value="500"/> <property name="webdav.retry.delay" value="500"/>