feat: Mail-Service-Ports aktualisiert, Consul- und Zipkin-Konfiguration hinzugefügt, neue Felder in BewerbService eingefügt

Signed-off-by: StefanMoCoAt <stefan.mo.co@gmail.com>

dc-backend.yaml

@@ -61,7 +61,7 @@ services:
       PING_SERVICE_URL: "http://ping-service:8082"
       MASTERDATA_SERVICE_URL: "http://masterdata-service:8086"
       EVENTS_SERVICE_URL: "http://events-service:8085"
-      MAIL_SERVICE_URL: "http://mail-service:8085"
+      MAIL_SERVICE_URL: "http://mail-service:8083"
       ZNS_IMPORT_SERVICE_URL: "http://zns-import-service:8095"
       RESULTS_SERVICE_URL: "http://results-service:8088"
       BILLING_SERVICE_URL: "http://billing-service:8087"
@@ -559,12 +559,12 @@ services:
     container_name: "${PROJECT_NAME:-meldestelle}-mail-service"
     restart: unless-stopped
     ports:
-      - "${MAIL_PORT:-8083:8085}"
+      - "${MAIL_PORT:-8083:8083}"
       - "${MAIL_DEBUG_PORT:-5014:5014}"
     environment:
       SPRING_PROFILES_ACTIVE: "${MAIL_SPRING_PROFILES_ACTIVE:-docker}"
       DEBUG: "${MAIL_DEBUG:-true}"
-      SERVER_PORT: "${MAIL_SERVER_PORT:-8085}"
+      SERVER_PORT: "${MAIL_SERVER_PORT:-8083}"
 
       # --- KEYCLOAK ---
       SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "${KC_ISSUER_URI:-http://keycloak:8080/realms/meldestelle}"
@@ -601,7 +601,7 @@ services:
         condition: "service_healthy"
 
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8085/actuator/health/readiness" ]
+      test: [ "CMD", "wget", "--spider", "-q", "http://localhost:8083/actuator/health/readiness" ]
       interval: 15s
       timeout: 5s
       retries: 5
@@ -724,7 +724,13 @@ services:
 
       # --- CONSUL ---
       SPRING_CLOUD_CONSUL_HOST: "${CONSUL_HOST:-consul}"
-      SPRING_CLOUD_CONSUL_PORT: "${CONSUL_PORT:-8500}"
+      SPRING_CLOUD_CONSUL_PORT: "${CONSUL_HTTP_PORT:-8500}"
+      SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME: "${SERIES_SERVICE_NAME:-series-service}"
+      SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS: "${SERIES_CONSUL_PREFER_IP:-true}"
+
+      # --- ZIPKIN ---
+      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "${ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}"
+      MANAGEMENT_TRACING_SAMPLING_PROBABILITY: "${ZIPKIN_SAMPLING_PROBABILITY:-1.0}"
 
     depends_on:
       postgres: