Merge remote-tracking branch 'origin/master' into develop
# Conflicts: # backend/pom.xml # backend/src/main/java/ru/micord/ervu/controller/ErvuDataController.java # backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java # backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java # backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaTokensStore.java # backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java # config/nginx.conf # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml
This commit is contained in:
commit
90ec38852f
22 changed files with 275 additions and 204 deletions
|
|
@ -13,6 +13,7 @@ ESIA_BASE_URI=https://esia-portal1.test.gosuslugi.ru/
|
|||
ESIA_CLIENT_ID=MNSV89
|
||||
ESIA_CLIENT_CERT_HASH=04508B4B0B58776A954A0E15F574B4E58799D74C61EE020B3330716C203E3BDD
|
||||
ESIA_REDIRECT_URL=https://lkrp-dev.micord.ru/fl/
|
||||
ESIA_LOGOUT_REDIRECT_URL=https://lkrp-dev.micord.ru/fl/home.html
|
||||
|
||||
SIGN_URL=https://ervu-sign-dev.k8s.micord.ru/sign
|
||||
SIGN_VERIFY_URL=https://ervu-sign-dev.k8s.micord.ru/verify
|
||||
|
|
|
|||
|
|
@ -78,7 +78,12 @@ http {
|
|||
root /frontend;
|
||||
index index.html;
|
||||
try_files $uri @index;
|
||||
|
||||
|
||||
#Application config
|
||||
location = /src/resources/app-config.json {
|
||||
add_header Cache-Control "no-cache";
|
||||
expires 0;
|
||||
}
|
||||
# Media: images, icons, video, audio, HTC
|
||||
location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|mp3|ogg|ogv|webm|htc|woff2|woff|ttf)$ {
|
||||
expires 1M;
|
||||
|
|
@ -96,7 +101,7 @@ http {
|
|||
|
||||
location @index {
|
||||
root /frontend;
|
||||
add_header Cache-Control no-cache;
|
||||
add_header Cache-Control "no-cache";
|
||||
expires 0;
|
||||
try_files /index.html =404;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue