diff --git a/modules/apps/gb32960-ingest-app/src/main/resources/application.yml b/modules/apps/gb32960-ingest-app/src/main/resources/application.yml index 7a826911..bdd9ec9e 100644 --- a/modules/apps/gb32960-ingest-app/src/main/resources/application.yml +++ b/modules/apps/gb32960-ingest-app/src/main/resources/application.yml @@ -88,7 +88,7 @@ lingniu: rate-limit: per-vin-qps: 50 session: - store: ${SESSION_STORE:redis} + store: redis ttl: ${SESSION_TTL:30m} identity: store: ${VEHICLE_IDENTITY_STORE:mysql} diff --git a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java index 90ed1e80..f51e0a26 100644 --- a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java +++ b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java @@ -46,7 +46,7 @@ class Gb32960IngestAppDefaultsTest { .containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", false) .containsEntry("lingniu.ingest.sink.archive.enabled", "${SINK_ARCHIVE_ENABLED:true}") .containsEntry("lingniu.ingest.sink.archive.path", "${SINK_ARCHIVE_PATH:./archive/}") - .containsEntry("lingniu.ingest.session.store", "${SESSION_STORE:redis}") + .containsEntry("lingniu.ingest.session.store", "redis") .containsEntry("lingniu.ingest.identity.store", "${VEHICLE_IDENTITY_STORE:mysql}") .containsEntry("lingniu.ingest.identity.mysql.table-name", "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}") @@ -67,7 +67,8 @@ class Gb32960IngestAppDefaultsTest { .doesNotContain("vehicle-stat:"); assertThat(applicationYaml()) .contains("password: ${GB32960_PLATFORM_PWD_HYUNDAI:}") - .contains("password: ${GB32960_PLATFORM_PWD_YUEJIN:}"); + .contains("password: ${GB32960_PLATFORM_PWD_YUEJIN:}") + .doesNotContain("SESSION_STORE"); } private static Properties applicationProperties() { diff --git a/modules/apps/jt808-ingest-app/src/main/resources/application.yml b/modules/apps/jt808-ingest-app/src/main/resources/application.yml index ff6af0a9..26942867 100644 --- a/modules/apps/jt808-ingest-app/src/main/resources/application.yml +++ b/modules/apps/jt808-ingest-app/src/main/resources/application.yml @@ -52,7 +52,7 @@ lingniu: rate-limit: per-vin-qps: 50 session: - store: ${SESSION_STORE:redis} + store: redis ttl: ${SESSION_TTL:30m} identity: store: ${VEHICLE_IDENTITY_STORE:mysql} diff --git a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java index ff143ba4..a26e48a5 100644 --- a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java +++ b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java @@ -33,7 +33,7 @@ class Jt808IngestAppDefaultsTest { .containsEntry("lingniu.ingest.sink.kafka.topics.realtime", "${KAFKA_TOPIC_JT808_EVENT:vehicle.event.jt808.v1}") .containsEntry("lingniu.ingest.sink.kafka.topics.raw-archive", "${KAFKA_TOPIC_JT808_RAW:vehicle.raw.jt808.v1}") .containsEntry("lingniu.ingest.sink.kafka.topics.dlq", "${KAFKA_TOPIC_JT808_DLQ:vehicle.dlq.jt808.v1}") - .containsEntry("lingniu.ingest.session.store", "${SESSION_STORE:redis}") + .containsEntry("lingniu.ingest.session.store", "redis") .containsEntry("lingniu.ingest.identity.store", "${VEHICLE_IDENTITY_STORE:mysql}") .containsEntry("lingniu.ingest.identity.mysql.table-name", "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}") @@ -54,7 +54,8 @@ class Jt808IngestAppDefaultsTest { .doesNotContain("event-history:") .doesNotContain("event-file-store:") .doesNotContain("vehicle-state:") - .doesNotContain("vehicle-stat:"); + .doesNotContain("vehicle-stat:") + .doesNotContain("SESSION_STORE"); } private static Properties applicationProperties() {