Merge branch 'dev' into route-processing
Conflict resolution: - build.gradle.kts: dev version (keep nstart.cloud repo + jacoco/asm mavenCentral) - settings.gradle.kts: project name from route-processing (observatio-terrae), rest from dev - config addresses (application-local, pcp-mission-planing-service, pcp-dynamic-plan application.yaml): dev versions - menu.html: merged both branches (TGU planning + bookings items) - CatalogControllerTest.kt: merged both mocks (TguPlanningService + BallisticsService) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -3,19 +3,21 @@
|
||||
pcp:
|
||||
infra:
|
||||
postgres:
|
||||
host: ${PCP_POSTGRES_HOST:192.168.1.8}
|
||||
port: ${PCP_POSTGRES_PORT:5432}
|
||||
# host: ${PCP_POSTGRES_HOST:localhost}
|
||||
# port: ${PCP_POSTGRES_PORT:5432}
|
||||
host: ${PCP_POSTGRES_HOST:192.168.100.160}
|
||||
port: ${PCP_POSTGRES_PORT:35400}
|
||||
kafka:
|
||||
host: ${PCP_KAFKA_HOST:192.168.1.8}
|
||||
host: ${PCP_KAFKA_HOST:localhost}
|
||||
port: ${PCP_KAFKA_PORT:29092}
|
||||
|
||||
|
||||
|
||||
network:
|
||||
host: ${PCP_NETWORK_HOST:192.168.1.8}
|
||||
host: ${PCP_NETWORK_HOST:localhost}
|
||||
|
||||
ports:
|
||||
config: 8888
|
||||
config: 38888
|
||||
admin: 7000
|
||||
route-processing: 7004
|
||||
request: 7005
|
||||
|
||||
@@ -49,9 +49,12 @@ spring:
|
||||
default-topic: pcp.tle
|
||||
datasource:
|
||||
driver-class-name: org.postgresql.Driver
|
||||
url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics
|
||||
username: postgres
|
||||
password: password
|
||||
url: "${SPRING_DATASOURCE_URL}"
|
||||
username: "${SPRING_DATASOURCE_USERNAME}"
|
||||
password: "${SPRING_DATASOURCE_PASSWORD}"
|
||||
# url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_ballistics
|
||||
# username: postgres
|
||||
# password: password
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
|
||||
@@ -96,9 +96,9 @@ spring:
|
||||
on-profile: dev
|
||||
datasource:
|
||||
driver-class-name: org.postgresql.Driver
|
||||
url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_satellites
|
||||
username: postgres
|
||||
password: password
|
||||
url: "${SPRING_DATASOURCE_URL}"
|
||||
username: "${SPRING_DATASOURCE_USERNAME}"
|
||||
password: "${SPRING_DATASOURCE_PASSWORD}"
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
|
||||
@@ -75,7 +75,7 @@ spring:
|
||||
camunda:
|
||||
client:
|
||||
mode: self-managed
|
||||
grpc-address: http://192.168.1.8:26500
|
||||
grpc-address: http://camunda.k8s.265.nstart.cloud:30901
|
||||
auth:
|
||||
method: none
|
||||
prefer-rest-over-grpc: false
|
||||
@@ -115,9 +115,9 @@ spring:
|
||||
missing-topics-fatal: false
|
||||
datasource:
|
||||
driver-class-name: org.postgresql.Driver
|
||||
url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_missions
|
||||
username: postgres
|
||||
password: password
|
||||
url: "${SPRING_DATASOURCE_URL}"
|
||||
username: "${SPRING_DATASOURCE_USERNAME}"
|
||||
password: "${SPRING_DATASOURCE_PASSWORD}"
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
@@ -136,7 +136,7 @@ spring:
|
||||
camunda:
|
||||
client:
|
||||
mode: self-managed
|
||||
grpc-address: http://192.168.1.8:26500
|
||||
grpc-address: http://camunda.k8s.265.nstart.cloud:30901
|
||||
auth:
|
||||
method: none
|
||||
prefer-rest-over-grpc: false
|
||||
|
||||
@@ -17,9 +17,9 @@ spring:
|
||||
management-base-url: ${pcp.services.request}
|
||||
datasource:
|
||||
driver-class-name: org.postgresql.Driver
|
||||
url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_requests
|
||||
username: postgres
|
||||
password: password
|
||||
url: "${SPRING_DATASOURCE_URL}"
|
||||
username: "${SPRING_DATASOURCE_USERNAME}"
|
||||
password: "${SPRING_DATASOURCE_PASSWORD}"
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
|
||||
@@ -68,9 +68,9 @@ spring:
|
||||
on-profile: dev
|
||||
datasource:
|
||||
driver-class-name: org.postgresql.Driver
|
||||
url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_stations
|
||||
username: postgres
|
||||
password: password
|
||||
url: "${SPRING_DATASOURCE_URL}"
|
||||
username: "${SPRING_DATASOURCE_USERNAME}"
|
||||
password: "${SPRING_DATASOURCE_PASSWORD}"
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
|
||||
@@ -40,6 +40,7 @@ settings:
|
||||
tgu-service: ${pcp.services.tgu}
|
||||
satellite-catalog-service: ${pcp.services.satellite-catalog}
|
||||
ballistics-service: ${pcp.services.ballistics}
|
||||
tle-monitoring-service: ${pcp.services.tle-monitoring}
|
||||
stations-service: ${pcp.services.stations}
|
||||
slots-service: ${pcp.services.slots}
|
||||
mission-service: ${pcp.services.mission}
|
||||
|
||||
@@ -108,9 +108,9 @@ spring:
|
||||
default-topic: pcp.tle
|
||||
datasource:
|
||||
driver-class-name: org.postgresql.Driver
|
||||
url: jdbc:postgresql://${pcp.infra.postgres.host}:${pcp.infra.postgres.port}/pcp_slots
|
||||
username: postgres
|
||||
password: password
|
||||
url: "${SPRING_DATASOURCE_URL}"
|
||||
username: "${SPRING_DATASOURCE_USERNAME}"
|
||||
password: "${SPRING_DATASOURCE_PASSWORD}"
|
||||
jpa:
|
||||
hibernate:
|
||||
ddl-auto: validate
|
||||
|
||||
Reference in New Issue
Block a user