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 b823c666..ea6c320c 100644 --- a/modules/apps/gb32960-ingest-app/src/main/resources/application.yml +++ b/modules/apps/gb32960-ingest-app/src/main/resources/application.yml @@ -82,10 +82,8 @@ lingniu: rate-limit: per-vin-qps: 50 session: - store: redis ttl: ${SESSION_TTL:30m} identity: - store: mysql mysql: jdbc-url: ${VEHICLE_IDENTITY_MYSQL_JDBC_URL:jdbc:mysql://127.0.0.1:3306/lingniu_vehicle?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai} username: ${VEHICLE_IDENTITY_MYSQL_USERNAME:root} diff --git a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java index 4a3f10cd..c863bda9 100644 --- a/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java +++ b/modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppCompositionTest.java @@ -41,7 +41,6 @@ class Gb32960IngestAppCompositionTest { "lingniu.ingest.gb32960.enabled=true", "lingniu.ingest.gb32960.server.enabled=true", "lingniu.ingest.gb32960.port=0", - "lingniu.ingest.identity.store=mysql", "lingniu.ingest.identity.mysql.initialize-schema=false", "lingniu.ingest.sink.kafka.enabled=true", "lingniu.ingest.sink.kafka.bootstrap-servers=localhost:9092", 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 e27673c7..30f285dc 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,8 +46,6 @@ 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", "redis") - .containsEntry("lingniu.ingest.identity.store", "mysql") .containsEntry("lingniu.ingest.identity.mysql.table-name", "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}") .containsEntry("management.endpoints.web.exposure.include", @@ -59,7 +57,9 @@ class Gb32960IngestAppDefaultsTest { .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-state.")) .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat.")) .noneMatch(name -> name.startsWith(legacyKafkaPrefix)) - .noneMatch(name -> name.equals(kafkaTypeProperty)); + .noneMatch(name -> name.equals(kafkaTypeProperty)) + .noneMatch(name -> name.equals("lingniu.ingest.session.store")) + .noneMatch(name -> name.equals("lingniu.ingest.identity.store")); assertThat(applicationYaml()) .doesNotContain("event-history:") .doesNotContain("event-file-store:") 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 0e45d132..546e2bf6 100644 --- a/modules/apps/jt808-ingest-app/src/main/resources/application.yml +++ b/modules/apps/jt808-ingest-app/src/main/resources/application.yml @@ -46,10 +46,8 @@ lingniu: rate-limit: per-vin-qps: 50 session: - store: redis ttl: ${SESSION_TTL:30m} identity: - store: mysql mysql: jdbc-url: ${VEHICLE_IDENTITY_MYSQL_JDBC_URL:jdbc:mysql://127.0.0.1:3306/lingniu_vehicle?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai} username: ${VEHICLE_IDENTITY_MYSQL_USERNAME:root} diff --git a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java index e47438b8..0fd1a278 100644 --- a/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java +++ b/modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppCompositionTest.java @@ -40,7 +40,6 @@ class Jt808IngestAppCompositionTest { .withPropertyValues( "lingniu.ingest.jt808.enabled=true", "lingniu.ingest.jt808.port=0", - "lingniu.ingest.identity.store=mysql", "lingniu.ingest.identity.mysql.initialize-schema=false", "lingniu.ingest.sink.kafka.enabled=true", "lingniu.ingest.sink.kafka.bootstrap-servers=localhost:9092", 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 d4fdc471..a896cefb 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,8 +33,6 @@ 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", "redis") - .containsEntry("lingniu.ingest.identity.store", "mysql") .containsEntry("lingniu.ingest.identity.mysql.table-name", "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}") .containsEntry("lingniu.ingest.identity.mysql.jdbc-url", @@ -49,7 +47,9 @@ class Jt808IngestAppDefaultsTest { .noneMatch(name -> name.startsWith("lingniu.ingest.event-history.")) .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store.")) .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-state.")) - .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat.")); + .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat.")) + .noneMatch(name -> name.equals("lingniu.ingest.session.store")) + .noneMatch(name -> name.equals("lingniu.ingest.identity.store")); assertThat(applicationYaml()) .doesNotContain("event-history:") .doesNotContain("event-file-store:") diff --git a/modules/apps/yutong-mqtt-app/src/main/resources/application.yml b/modules/apps/yutong-mqtt-app/src/main/resources/application.yml index 86301eb5..172326e0 100644 --- a/modules/apps/yutong-mqtt-app/src/main/resources/application.yml +++ b/modules/apps/yutong-mqtt-app/src/main/resources/application.yml @@ -55,7 +55,6 @@ lingniu: rate-limit: per-vin-qps: 50 identity: - store: mysql mysql: jdbc-url: ${VEHICLE_IDENTITY_MYSQL_JDBC_URL:jdbc:mysql://127.0.0.1:3306/lingniu_vehicle?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai} username: ${VEHICLE_IDENTITY_MYSQL_USERNAME:root} diff --git a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java index 73ae6312..c6da8a66 100644 --- a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java +++ b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppCompositionTest.java @@ -43,7 +43,6 @@ class YutongMqttAppCompositionTest { "lingniu.ingest.mqtt.endpoints[0].uri=tcp://127.0.0.1:1883", "lingniu.ingest.mqtt.endpoints[0].topic=/yutong/#", "lingniu.ingest.mqtt.endpoints[0].profile=yutong", - "lingniu.ingest.identity.store=mysql", "lingniu.ingest.identity.mysql.initialize-schema=false", "lingniu.ingest.sink.kafka.enabled=true", "lingniu.ingest.sink.kafka.bootstrap-servers=localhost:9092", diff --git a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java index 5e99c230..08d02d65 100644 --- a/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java +++ b/modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java @@ -33,7 +33,6 @@ class YutongMqttAppDefaultsTest { .containsEntry("lingniu.ingest.sink.kafka.topics.realtime", "${KAFKA_TOPIC_YUTONG_MQTT_EVENT:vehicle.event.mqtt-yutong.v1}") .containsEntry("lingniu.ingest.sink.kafka.topics.raw-archive", "${KAFKA_TOPIC_YUTONG_MQTT_RAW:vehicle.raw.mqtt-yutong.v1}") .containsEntry("lingniu.ingest.sink.kafka.topics.dlq", "${KAFKA_TOPIC_YUTONG_MQTT_DLQ:vehicle.dlq.mqtt-yutong.v1}") - .containsEntry("lingniu.ingest.identity.store", "mysql") .containsEntry("lingniu.ingest.identity.mysql.table-name", "${VEHICLE_IDENTITY_MYSQL_TABLE:vehicle_identity_bindings}") .containsEntry("lingniu.ingest.sink.archive.enabled", "${SINK_ARCHIVE_ENABLED:true}") @@ -43,7 +42,8 @@ class YutongMqttAppDefaultsTest { .noneMatch(name -> name.startsWith("lingniu.ingest.event-history.")) .noneMatch(name -> name.startsWith("lingniu.ingest.event-file-store.")) .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-state.")) - .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat.")); + .noneMatch(name -> name.startsWith("lingniu.ingest.vehicle-stat.")) + .noneMatch(name -> name.equals("lingniu.ingest.identity.store")); assertThat(applicationYaml()) .doesNotContain("event-history:") .doesNotContain("event-file-store:")