diff --git a/config-repo/pcp-tgu-service.yaml b/config-repo/pcp-tgu-service.yaml index 5dd0848..c462796 100644 --- a/config-repo/pcp-tgu-service.yaml +++ b/config-repo/pcp-tgu-service.yaml @@ -14,7 +14,7 @@ spring: camunda: client: mode: self-managed - grpc-address: http://192.168.1.8:26500 + grpc-address: http://camunda.k8s.265.nstart.local:30901 auth: method: none prefer-rest-over-grpc: false @@ -92,6 +92,10 @@ external-api: server: port: ${pcp.ports.tgu:7011} +camunda: + client: + grpc-address: ${CAMUNDA_GRPC_ADDRESS:http://192.168.60.201:26500} + --- spring: config: diff --git a/services/pcp-ballistics-service/src/test/resources/application.yaml b/services/pcp-ballistics-service/src/test/resources/application.yaml index d83702c..d78417c 100644 --- a/services/pcp-ballistics-service/src/test/resources/application.yaml +++ b/services/pcp-ballistics-service/src/test/resources/application.yaml @@ -8,7 +8,7 @@ spring: jackson: default-property-inclusion: non_null kafka: - bootstrap-servers: 192.168.1.8:29092 + bootstrap-servers: 192.168.60.68:29092 consumer: group-id: pcp-ballistics-service auto-offset-reset: earliest @@ -16,7 +16,7 @@ spring: default-topic: pcp.tle datasource: driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://192.168.1.8:5432/pcp_ballistics + url: jdbc:postgresql://192.168.60.68:5432/pcp_ballistics username: postgres password: password jpa: @@ -63,7 +63,7 @@ management: settings: calculation-interval: 28 - ic-service: http://192.168.1.8:9080 + ic-service: http://192.168.60.68:9080 server: port: 7003 diff --git a/services/pcp-complex-mission-service/src/main/resources/application.yaml b/services/pcp-complex-mission-service/src/main/resources/application.yaml index 2fd9826..7043a07 100644 --- a/services/pcp-complex-mission-service/src/main/resources/application.yaml +++ b/services/pcp-complex-mission-service/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: import: "configserver:" cloud: config: - uri: ${CONFIG_SERVER_URI:http://192.168.1.8:8888} + uri: ${CONFIG_SERVER_URI:http://192.168.60.201:8888} fail-fast: ${CONFIG_SERVER_FAIL_FAST:true} profile: ${SPRING_CLOUD_CONFIG_PROFILE:${SPRING_PROFILES_ACTIVE:${spring.profiles.default}}} label: ${SPRING_CLOUD_CONFIG_LABEL:dev} @@ -20,7 +20,7 @@ spring: on-profile: local datasource: driver-class-name: org.postgresql.Driver - url: ${PCP_COMPLEX_MISSION_DATASOURCE_URL:jdbc:postgresql://${PCP_POSTGRES_HOST:192.168.1.8}:${PCP_POSTGRES_PORT:5432}/pcp_satellites} + url: ${PCP_COMPLEX_MISSION_DATASOURCE_URL:jdbc:postgresql://${PCP_POSTGRES_HOST:localhost}:${PCP_POSTGRES_PORT:5432}/pcp_satellites} username: ${PCP_COMPLEX_MISSION_DATASOURCE_USERNAME:postgres} password: ${PCP_COMPLEX_MISSION_DATASOURCE_PASSWORD:password} jpa: @@ -46,7 +46,7 @@ spring: on-profile: dev datasource: driver-class-name: org.postgresql.Driver - url: ${PCP_COMPLEX_MISSION_DATASOURCE_URL:jdbc:postgresql://192.168.1.8:35400/pcp_satellites} + url: ${PCP_COMPLEX_MISSION_DATASOURCE_URL:jdbc:postgresql://192.168.100.160:35400/pcp_satellites} username: ${PCP_COMPLEX_MISSION_DATASOURCE_USERNAME:postgres} password: ${PCP_COMPLEX_MISSION_DATASOURCE_PASSWORD:password} jpa: diff --git a/services/pcp-complex-mission-service/src/test/resources/application.yaml b/services/pcp-complex-mission-service/src/test/resources/application.yaml index 535a77a..2254ca5 100644 --- a/services/pcp-complex-mission-service/src/test/resources/application.yaml +++ b/services/pcp-complex-mission-service/src/test/resources/application.yaml @@ -18,9 +18,9 @@ spring: settings: calculation-interval: 3 - ballistics-service: http://192.168.1.8:7003 - earth-grid-service: http://192.168.1.8:7005 - complex-mission-service: http://192.168.1.8:7002 - stations-service: http://192.168.1.8:7009 - slots-service: http://192.168.1.8:7006 - coverage-scheme-service: http://192.168.1.8:7011 + ballistics-service: http://localhost:7003 + earth-grid-service: http://localhost:7005 + complex-mission-service: http://localhost:7002 + stations-service: http://localhost:7009 + slots-service: http://localhost:7006 + coverage-scheme-service: http://localhost:7011 diff --git a/services/pcp-coverage-scheme-service/src/main/kotlin/space/nstart/pcp/pcp_coverage_scheme_service/configuration/CoverageSchemeProperties.kt b/services/pcp-coverage-scheme-service/src/main/kotlin/space/nstart/pcp/pcp_coverage_scheme_service/configuration/CoverageSchemeProperties.kt index 45ffc00..1d6380c 100644 --- a/services/pcp-coverage-scheme-service/src/main/kotlin/space/nstart/pcp/pcp_coverage_scheme_service/configuration/CoverageSchemeProperties.kt +++ b/services/pcp-coverage-scheme-service/src/main/kotlin/space/nstart/pcp/pcp_coverage_scheme_service/configuration/CoverageSchemeProperties.kt @@ -4,8 +4,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties @ConfigurationProperties("coverage-scheme") data class CoverageSchemeProperties( - val ballisticsServiceUrl: String = "http://192.168.1.8:7003", - val complexMissionServiceUrl: String = "http://192.168.1.8:7002", + val ballisticsServiceUrl: String = "http://localhost:7003", + val complexMissionServiceUrl: String = "http://localhost:7002", val satelliteCatalogServiceUrl: String = complexMissionServiceUrl, val defaultRollStepDegrees: Double = 5.0, val defaultMinimumTechnologyOverlap: Double = 0.05, diff --git a/services/pcp-mission-planing-service/src/test/resources/application.yaml b/services/pcp-mission-planing-service/src/test/resources/application.yaml index 21dae27..b2ba0b7 100644 --- a/services/pcp-mission-planing-service/src/test/resources/application.yaml +++ b/services/pcp-mission-planing-service/src/test/resources/application.yaml @@ -23,7 +23,7 @@ camunda: enabled: false settings: - ballistics-service: http://192.168.1.8:7003 - complex-mission-service: http://192.168.1.8:7002 - satellite-catalog-service: http://192.168.1.8:7013 - stations-service: http://192.168.1.8:7009 + ballistics-service: http://localhost:7003 + complex-mission-service: http://localhost:7002 + satellite-catalog-service: http://localhost:7013 + stations-service: http://localhost:7009 diff --git a/services/pcp-request-service/src/main/kotlin/org/nstart/dep265/requestservice/config/KafkaProducerConfig.kt b/services/pcp-request-service/src/main/kotlin/org/nstart/dep265/requestservice/config/KafkaProducerConfig.kt index 338ae21..78f6747 100644 --- a/services/pcp-request-service/src/main/kotlin/org/nstart/dep265/requestservice/config/KafkaProducerConfig.kt +++ b/services/pcp-request-service/src/main/kotlin/org/nstart/dep265/requestservice/config/KafkaProducerConfig.kt @@ -15,7 +15,7 @@ class KafkaProducerConfig { @Bean @ConditionalOnMissingBean fun requestProducerFactory( - @Value("\${spring.kafka.bootstrap-servers:192.168.1.8:19092}") bootstrapServers: String, + @Value("\${spring.kafka.bootstrap-servers:192.168.100.160:19092}") bootstrapServers: String, ): ProducerFactory { return DefaultKafkaProducerFactory( mapOf( diff --git a/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/configuration/CorsFilterComponent.kt b/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/configuration/CorsFilterComponent.kt index 76a3560..49da575 100644 --- a/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/configuration/CorsFilterComponent.kt +++ b/services/pcp-ui-service/src/main/kotlin/space/nstart/pcp/slots_service/configuration/CorsFilterComponent.kt @@ -48,8 +48,8 @@ class WebConfig : WebMvcConfigurer { .allowedOrigins( "http://localhost:3000", "http://localhost:8080", - "http://192.168.1.8:7008", - "http://192.168.1.8:8080" + "http://192.168.60.68:7008", + "http://192.168.60.68:8080" ) .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH") .allowedHeaders("*") @@ -66,7 +66,7 @@ class WebConfig : WebMvcConfigurer { // Разрешенные origin'ы allowedOriginPatterns = listOf( "http://localhost:*", - "http://192.168.1.8:*" + "http://192.168.60.68:*" ) // Разрешенные заголовки allowedHeaders = listOf( diff --git a/services/slots-service/src/test/resources/application.yaml b/services/slots-service/src/test/resources/application.yaml index 3663c5d..9e63c51 100644 --- a/services/slots-service/src/test/resources/application.yaml +++ b/services/slots-service/src/test/resources/application.yaml @@ -9,7 +9,7 @@ spring: default-property-inclusion: non_null datasource: driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://192.168.1.8:35400/pcp_slots + url: jdbc:postgresql://192.168.100.160:35400/pcp_slots username: postgres password: password hikari: @@ -59,7 +59,7 @@ management: enabled: true settings: - earth-grid-service: http://192.168.1.8:7005 + earth-grid-service: http://192.168.60.68:7005 server: port: 7006 diff --git a/services/tle-monitoring-service/src/test/resources/application.yaml b/services/tle-monitoring-service/src/test/resources/application.yaml index 84d1ae2..0ad1c2e 100644 --- a/services/tle-monitoring-service/src/test/resources/application.yaml +++ b/services/tle-monitoring-service/src/test/resources/application.yaml @@ -5,7 +5,7 @@ spring: config: enabled: false kafka: - bootstrap-servers: 192.168.1.8:29092 + bootstrap-servers: 192.168.60.68:29092 consumer: group-id: pcp auto-offset-reset: earliest @@ -13,7 +13,7 @@ spring: default-topic: pcp.tle datasource: driver-class-name: org.postgresql.Driver - url: jdbc:postgresql://192.168.1.8:5432/pcp_tle + url: jdbc:postgresql://192.168.60.68:5432/pcp_tle username: postgres password: password jpa: @@ -62,7 +62,7 @@ management: enabled: true settings: - complex-mission-service: http://192.168.1.8:7002 + complex-mission-service: http://192.168.60.68:7002 tle: polling: