From 49b2cc68a52ef4f50a9bdf1a861aab7e1d0b1c2a Mon Sep 17 00:00:00 2001 From: Maksim Skobaro Date: Tue, 24 Jun 2025 01:18:26 +0300 Subject: [PATCH] changes. --- .../java/ru/mskobaro/tdms/system/config/SecurityConfig.java | 5 ++--- web/src/utils/request.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/ru/mskobaro/tdms/system/config/SecurityConfig.java b/server/src/main/java/ru/mskobaro/tdms/system/config/SecurityConfig.java index b6df2ec..5f0d819 100644 --- a/server/src/main/java/ru/mskobaro/tdms/system/config/SecurityConfig.java +++ b/server/src/main/java/ru/mskobaro/tdms/system/config/SecurityConfig.java @@ -62,15 +62,14 @@ public class SecurityConfig { @Bean @Primary public CorsConfigurationSource corsConfiguration( - @Value("${application.domain}") String domain, - @Value("${application.protocol}") String protocol + @Value("${application.domain}") String domain ) { CorsConfiguration corsConfiguration = new CorsConfiguration(); corsConfiguration.setAllowedMethods(List.of(HttpMethod.GET.name(), HttpMethod.POST.name(), HttpMethod.OPTIONS.name())); corsConfiguration.setAllowedHeaders(List.of("Authorization", "Content-Type")); corsConfiguration.setAllowCredentials(true); corsConfiguration.setMaxAge(Duration.ofDays(1)); - corsConfiguration.addAllowedOrigin(StringUtils.join(protocol, "://", domain, ":", 443)); + corsConfiguration.addAllowedOrigin(StringUtils.join("https", "://", domain, ":", 443)); if (environment.matchesProfiles("dev")) { corsConfiguration.addAllowedOrigin("http://localhost:8888"); diff --git a/web/src/utils/request.ts b/web/src/utils/request.ts index 4ba03a7..c05b489 100644 --- a/web/src/utils/request.ts +++ b/web/src/utils/request.ts @@ -2,7 +2,7 @@ import axios, {AxiosError, AxiosRequestConfig} from "axios"; import {NotificationService} from "../services/NotificationService"; import {ErrorResponse} from "../models/errorResponse"; -export const apiUrl = "http://vkr.mskobaro.ru:8080/api/v1/"; +export const apiUrl = "https://vkr.mskobaro.ru:8080/api/v1/"; export const get = async (url: string, data?: any, doReject = true, showError = true) => await request({ url: url,