shishengliang/lingniu-vehicle-ingest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: keep active kafka path always on

Browse Source
This commit is contained in:
lingniu
2026-07-01 14:55:56 +08:00
parent 90791d28bd
commit faeee0c2a8
17 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/local/launchctl/com.lingniu.gb32960.plist.template
View File

@@ -22,8 +22,6 @@
<string>false</string> <string>false</string>
<key>GB32960_PLATFORM_IP_HYUNDAI</key> <key>GB32960_PLATFORM_IP_HYUNDAI</key>
<string>115.29.187.205</string> <string>115.29.187.205</string>
<key>KAFKA_ENABLED</key>
<string>true</string>
<key>KAFKA_BROKERS</key> <key>KAFKA_BROKERS</key>
<string>114.55.58.251:9092</string> <string>114.55.58.251:9092</string>
<key>KAFKA_NODE_ID</key> <key>KAFKA_NODE_ID</key>

2
deploy/local/launchctl/com.lingniu.jt808.plist.template
View File

@@ -18,8 +18,6 @@
<string>20400</string> <string>20400</string>
<key>JT808_PORT</key> <key>JT808_PORT</key>
<string>808</string> <string>808</string>
<key>KAFKA_ENABLED</key>
<string>true</string>
<key>KAFKA_BROKERS</key> <key>KAFKA_BROKERS</key>
<string>114.55.58.251:9092</string> <string>114.55.58.251:9092</string>
<key>KAFKA_NODE_ID</key> <key>KAFKA_NODE_ID</key>

2
deploy/local/launchctl/com.lingniu.vehicle-analytics.plist.template
View File

@@ -16,8 +16,6 @@
<dict> <dict>
<key>HTTP_PORT</key> <key>HTTP_PORT</key>
<string>20300</string> <string>20300</string>
<key>KAFKA_ENABLED</key>
<string>true</string>
<key>KAFKA_CONSUMER_ENABLED</key> <key>KAFKA_CONSUMER_ENABLED</key>
<string>true</string> <string>true</string>
<key>KAFKA_CONSUMER_AUTO_OFFSET_RESET</key> <key>KAFKA_CONSUMER_AUTO_OFFSET_RESET</key>

2
deploy/local/launchctl/com.lingniu.vehicle-history.plist.template
View File

@@ -16,8 +16,6 @@
<dict> <dict>
<key>HTTP_PORT</key> <key>HTTP_PORT</key>
<string>20200</string> <string>20200</string>
<key>KAFKA_ENABLED</key>
<string>true</string>
<key>KAFKA_CONSUMER_ENABLED</key> <key>KAFKA_CONSUMER_ENABLED</key>
<string>true</string> <string>true</string>
<key>KAFKA_CONSUMER_AUTO_OFFSET_RESET</key> <key>KAFKA_CONSUMER_AUTO_OFFSET_RESET</key>

2
deploy/local/launchctl/com.lingniu.yutong-mqtt.plist.template
View File

@@ -48,8 +48,6 @@
<string>__YUTONG_MQTT_TLS_CLIENT_KEY__</string> <string>__YUTONG_MQTT_TLS_CLIENT_KEY__</string>
<key>YUTONG_MQTT_TLS_HOSTNAME_VERIFICATION_ENABLED</key> <key>YUTONG_MQTT_TLS_HOSTNAME_VERIFICATION_ENABLED</key>
<string>__YUTONG_MQTT_TLS_HOSTNAME_VERIFICATION_ENABLED__</string> <string>__YUTONG_MQTT_TLS_HOSTNAME_VERIFICATION_ENABLED__</string>
<key>KAFKA_ENABLED</key>
<string>true</string>
<key>KAFKA_BROKERS</key> <key>KAFKA_BROKERS</key>
<string>114.55.58.251:9092</string> <string>114.55.58.251:9092</string>
<key>KAFKA_NODE_ID</key> <key>KAFKA_NODE_ID</key>

1
deploy/portainer/docker-compose.yml
View File

@@ -17,7 +17,6 @@ x-common-env: &common-env
NACOS_USERNAME: ${NACOS_USERNAME:-} NACOS_USERNAME: ${NACOS_USERNAME:-}
NACOS_PASSWORD: ${NACOS_PASSWORD:-} NACOS_PASSWORD: ${NACOS_PASSWORD:-}
KAFKA_BROKERS: ${KAFKA_BROKERS:-172.17.111.56:9092} KAFKA_BROKERS: ${KAFKA_BROKERS:-172.17.111.56:9092}
KAFKA_ENABLED: ${KAFKA_ENABLED:-true}
KAFKA_CONSUMER_ENABLED: ${KAFKA_CONSUMER_ENABLED:-true} KAFKA_CONSUMER_ENABLED: ${KAFKA_CONSUMER_ENABLED:-true}
KAFKA_CONSUMER_MAX_POLL_INTERVAL_MILLIS: ${KAFKA_CONSUMER_MAX_POLL_INTERVAL_MILLIS:-900000} KAFKA_CONSUMER_MAX_POLL_INTERVAL_MILLIS: ${KAFKA_CONSUMER_MAX_POLL_INTERVAL_MILLIS:-900000}
KAFKA_TOPIC_GB32960_EVENT: ${KAFKA_TOPIC_GB32960_EVENT:-vehicle.event.gb32960.v1} KAFKA_TOPIC_GB32960_EVENT: ${KAFKA_TOPIC_GB32960_EVENT:-vehicle.event.gb32960.v1}

2
modules/apps/gb32960-ingest-app/src/main/resources/application.yml
View File

@@ -100,7 +100,7 @@ lingniu:
initialize-schema: ${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true} initialize-schema: ${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true}
sink: sink:
kafka: kafka:
enabled: ${KAFKA_ENABLED:true} enabled: true
bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092} bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092}
compression-type: zstd compression-type: zstd
linger-ms: 20 linger-ms: 20

5
modules/apps/gb32960-ingest-app/src/test/java/com/lingniu/ingest/gb32960app/Gb32960IngestAppDefaultsTest.java
View File

@@ -42,7 +42,7 @@ class Gb32960IngestAppDefaultsTest {
"Hyundai") "Hyundai")
.containsEntry("lingniu.ingest.gb32960.vendor-extensions[0].match.platform-accounts[1]", .containsEntry("lingniu.ingest.gb32960.vendor-extensions[0].match.platform-accounts[1]",
"YueJin") "YueJin")
.containsEntry("lingniu.ingest.sink.kafka.enabled", "${KAFKA_ENABLED:true}") .containsEntry("lingniu.ingest.sink.kafka.enabled", true)
.containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", false) .containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", false)
.containsEntry("lingniu.ingest.sink.archive.enabled", "${SINK_ARCHIVE_ENABLED:true}") .containsEntry("lingniu.ingest.sink.archive.enabled", "${SINK_ARCHIVE_ENABLED:true}")
.containsEntry("lingniu.ingest.sink.archive.path", "${SINK_ARCHIVE_PATH:./archive/}") .containsEntry("lingniu.ingest.sink.archive.path", "${SINK_ARCHIVE_PATH:./archive/}")
@@ -69,7 +69,8 @@ class Gb32960IngestAppDefaultsTest {
.contains("password: ${GB32960_PLATFORM_PWD_HYUNDAI:}") .contains("password: ${GB32960_PLATFORM_PWD_HYUNDAI:}")
.contains("password: ${GB32960_PLATFORM_PWD_YUEJIN:}") .contains("password: ${GB32960_PLATFORM_PWD_YUEJIN:}")
.doesNotContain("SESSION_STORE") .doesNotContain("SESSION_STORE")
.doesNotContain("VEHICLE_IDENTITY_STORE"); .doesNotContain("VEHICLE_IDENTITY_STORE")
.doesNotContain("KAFKA_ENABLED");
} }
private static Properties applicationProperties() { private static Properties applicationProperties() {

2
modules/apps/jt808-ingest-app/src/main/resources/application.yml
View File

@@ -64,7 +64,7 @@ lingniu:
initialize-schema: ${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true} initialize-schema: ${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true}
sink: sink:
kafka: kafka:
enabled: ${KAFKA_ENABLED:true} enabled: true
bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092} bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092}
compression-type: zstd compression-type: zstd
linger-ms: 20 linger-ms: 20

5
modules/apps/jt808-ingest-app/src/test/java/com/lingniu/ingest/jt808app/Jt808IngestAppDefaultsTest.java
View File

@@ -28,7 +28,7 @@ class Jt808IngestAppDefaultsTest {
.containsEntry("server.port", "${HTTP_PORT:20400}") .containsEntry("server.port", "${HTTP_PORT:20400}")
.containsEntry("lingniu.ingest.jt808.enabled", true) .containsEntry("lingniu.ingest.jt808.enabled", true)
.containsEntry("lingniu.ingest.jt808.port", "${JT808_PORT:808}") .containsEntry("lingniu.ingest.jt808.port", "${JT808_PORT:808}")
.containsEntry("lingniu.ingest.sink.kafka.enabled", "${KAFKA_ENABLED:true}") .containsEntry("lingniu.ingest.sink.kafka.enabled", true)
.containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", false) .containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", false)
.containsEntry("lingniu.ingest.sink.kafka.topics.realtime", "${KAFKA_TOPIC_JT808_EVENT:vehicle.event.jt808.v1}") .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.raw-archive", "${KAFKA_TOPIC_JT808_RAW:vehicle.raw.jt808.v1}")
@@ -56,7 +56,8 @@ class Jt808IngestAppDefaultsTest {
.doesNotContain("vehicle-state:") .doesNotContain("vehicle-state:")
.doesNotContain("vehicle-stat:") .doesNotContain("vehicle-stat:")
.doesNotContain("SESSION_STORE") .doesNotContain("SESSION_STORE")
.doesNotContain("VEHICLE_IDENTITY_STORE"); .doesNotContain("VEHICLE_IDENTITY_STORE")
.doesNotContain("KAFKA_ENABLED");
} }
private static Properties applicationProperties() { private static Properties applicationProperties() {

2
modules/apps/vehicle-analytics-app/src/main/resources/application.yml
View File

@@ -36,7 +36,7 @@ lingniu:
ingest: ingest:
sink: sink:
kafka: kafka:
enabled: ${KAFKA_ENABLED:true} enabled: true
bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092} bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092}
topics: topics:
realtime: ${KAFKA_TOPIC_JT808_EVENT:vehicle.event.jt808.v1} realtime: ${KAFKA_TOPIC_JT808_EVENT:vehicle.event.jt808.v1}

4
modules/apps/vehicle-analytics-app/src/test/java/com/lingniu/ingest/analyticsapp/VehicleAnalyticsAppDefaultsTest.java
View File

@@ -26,6 +26,7 @@ class VehicleAnalyticsAppDefaultsTest {
.containsEntry( .containsEntry(
"lingniu.ingest.vehicle-stat.jt808.enabled", "lingniu.ingest.vehicle-stat.jt808.enabled",
"${VEHICLE_STAT_JT808_MILEAGE_ENABLED:true}") "${VEHICLE_STAT_JT808_MILEAGE_ENABLED:true}")
.containsEntry("lingniu.ingest.sink.kafka.enabled", true)
.containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", "${KAFKA_CONSUMER_ENABLED:true}") .containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", "${KAFKA_CONSUMER_ENABLED:true}")
.containsEntry( .containsEntry(
"lingniu.ingest.sink.kafka.consumer.bindings.vehicleStatEnvelopeConsumerProcessor.enabled", "lingniu.ingest.sink.kafka.consumer.bindings.vehicleStatEnvelopeConsumerProcessor.enabled",
@@ -51,7 +52,8 @@ class VehicleAnalyticsAppDefaultsTest {
.doesNotContain("event-file-store:") .doesNotContain("event-file-store:")
.doesNotContain("vehicle-state:") .doesNotContain("vehicle-state:")
.doesNotContain("vehicleStateEnvelopeConsumerProcessor") .doesNotContain("vehicleStateEnvelopeConsumerProcessor")
.doesNotContain("redis:"); .doesNotContain("redis:")
.doesNotContain("KAFKA_ENABLED");
} }
private static Properties applicationProperties() { private static Properties applicationProperties() {

2
modules/apps/vehicle-history-app/src/main/resources/application.yml
View File

@@ -35,7 +35,7 @@ lingniu:
enabled: false enabled: false
sink: sink:
kafka: kafka:
enabled: ${KAFKA_ENABLED:true} enabled: true
bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092} bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092}
topics: topics:
realtime: ${KAFKA_TOPIC_GB32960_EVENT:vehicle.event.gb32960.v1} realtime: ${KAFKA_TOPIC_GB32960_EVENT:vehicle.event.gb32960.v1}

4
modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/PortainerComposeResourceLimitsTest.java
View File

@@ -22,6 +22,7 @@ class PortainerComposeResourceLimitsTest {
assertThat(compose) assertThat(compose)
.contains("Default production stack: GB32960, JT808, Yutong MQTT, history, analytics.") .contains("Default production stack: GB32960, JT808, Yutong MQTT, history, analytics.")
.contains("Legacy and optional services stay outside this compose file.") .contains("Legacy and optional services stay outside this compose file.")
.doesNotContain("KAFKA_ENABLED")
.doesNotContain("\n xinda-push-app:\n") .doesNotContain("\n xinda-push-app:\n")
.doesNotContain("\n command-gateway:\n") .doesNotContain("\n command-gateway:\n")
.doesNotContain("\n vehicle-state-service:\n") .doesNotContain("\n vehicle-state-service:\n")
@@ -632,7 +633,8 @@ class PortainerComposeResourceLimitsTest {
.contains("<key>NACOS_CONFIG_ENABLED</key>\n <string>false</string>") .contains("<key>NACOS_CONFIG_ENABLED</key>\n <string>false</string>")
.contains("<key>MANAGEMENT_HEALTH_REDIS_ENABLED</key>\n <string>false</string>") .contains("<key>MANAGEMENT_HEALTH_REDIS_ENABLED</key>\n <string>false</string>")
.contains("/tmp/lingniu-" + serviceName + "-live/") .contains("/tmp/lingniu-" + serviceName + "-live/")
.doesNotContain("<key>VEHICLE_IDENTITY_STORE</key>"); .doesNotContain("<key>VEHICLE_IDENTITY_STORE</key>")
.doesNotContain("<key>KAFKA_ENABLED</key>");
} }
private static String serviceBlock(String compose, String serviceName) { private static String serviceBlock(String compose, String serviceName) {

4
modules/apps/vehicle-history-app/src/test/java/com/lingniu/ingest/historyapp/VehicleHistoryAppDefaultsTest.java
View File

@@ -40,6 +40,7 @@ class VehicleHistoryAppDefaultsTest {
.containsEntry("lingniu.ingest.tdengine-history.maximum-pool-size", "${TDENGINE_MAX_POOL_SIZE:16}") .containsEntry("lingniu.ingest.tdengine-history.maximum-pool-size", "${TDENGINE_MAX_POOL_SIZE:16}")
.containsEntry("lingniu.ingest.tdengine-history.minimum-idle", "${TDENGINE_MIN_IDLE:0}") .containsEntry("lingniu.ingest.tdengine-history.minimum-idle", "${TDENGINE_MIN_IDLE:0}")
.containsEntry("lingniu.ingest.event-history.enabled", true) .containsEntry("lingniu.ingest.event-history.enabled", true)
.containsEntry("lingniu.ingest.sink.kafka.enabled", true)
.containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", "${KAFKA_CONSUMER_ENABLED:true}") .containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", "${KAFKA_CONSUMER_ENABLED:true}")
.containsEntry("lingniu.ingest.sink.kafka.consumer.max-poll-records", "${KAFKA_CONSUMER_MAX_POLL_RECORDS:2000}") .containsEntry("lingniu.ingest.sink.kafka.consumer.max-poll-records", "${KAFKA_CONSUMER_MAX_POLL_RECORDS:2000}")
.containsEntry("lingniu.ingest.sink.kafka.consumer.concurrency", "${KAFKA_CONSUMER_CONCURRENCY:3}") .containsEntry("lingniu.ingest.sink.kafka.consumer.concurrency", "${KAFKA_CONSUMER_CONCURRENCY:3}")
@@ -111,7 +112,8 @@ class VehicleHistoryAppDefaultsTest {
.noneMatch(name -> name.equals("lingniu.ingest.tdengine-history.telemetry-fields-enabled")); .noneMatch(name -> name.equals("lingniu.ingest.tdengine-history.telemetry-fields-enabled"));
assertThat(applicationYaml()) assertThat(applicationYaml())
.doesNotContain("\n archive:\n") .doesNotContain("\n archive:\n")
.doesNotContain("sink.archive"); .doesNotContain("sink.archive")
.doesNotContain("KAFKA_ENABLED");
} }
@Test @Test

2
modules/apps/yutong-mqtt-app/src/main/resources/application.yml
View File

@@ -70,7 +70,7 @@ lingniu:
initialize-schema: ${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true} initialize-schema: ${VEHICLE_IDENTITY_MYSQL_INITIALIZE_SCHEMA:true}
sink: sink:
kafka: kafka:
enabled: ${KAFKA_ENABLED:true} enabled: true
bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092} bootstrap-servers: ${KAFKA_BROKERS:114.55.58.251:9092}
compression-type: zstd compression-type: zstd
linger-ms: 20 linger-ms: 20

5
modules/apps/yutong-mqtt-app/src/test/java/com/lingniu/ingest/yutongmqttapp/YutongMqttAppDefaultsTest.java
View File

@@ -28,7 +28,7 @@ class YutongMqttAppDefaultsTest {
.containsEntry("lingniu.ingest.mqtt.endpoints[0].uri", "${YUTONG_MQTT_URI:}") .containsEntry("lingniu.ingest.mqtt.endpoints[0].uri", "${YUTONG_MQTT_URI:}")
.containsEntry("lingniu.ingest.mqtt.endpoints[0].topic", "${YUTONG_MQTT_TOPIC:#}") .containsEntry("lingniu.ingest.mqtt.endpoints[0].topic", "${YUTONG_MQTT_TOPIC:#}")
.containsEntry("lingniu.ingest.mqtt.endpoints[0].profile", "yutong") .containsEntry("lingniu.ingest.mqtt.endpoints[0].profile", "yutong")
.containsEntry("lingniu.ingest.sink.kafka.enabled", "${KAFKA_ENABLED:true}") .containsEntry("lingniu.ingest.sink.kafka.enabled", true)
.containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", false) .containsEntry("lingniu.ingest.sink.kafka.consumer.enabled", false)
.containsEntry("lingniu.ingest.sink.kafka.topics.realtime", "${KAFKA_TOPIC_YUTONG_MQTT_EVENT:vehicle.event.mqtt-yutong.v1}") .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.raw-archive", "${KAFKA_TOPIC_YUTONG_MQTT_RAW:vehicle.raw.mqtt-yutong.v1}")
@@ -49,7 +49,8 @@ class YutongMqttAppDefaultsTest {
.doesNotContain("event-file-store:") .doesNotContain("event-file-store:")
.doesNotContain("vehicle-state:") .doesNotContain("vehicle-state:")
.doesNotContain("vehicle-stat:") .doesNotContain("vehicle-stat:")
.doesNotContain("VEHICLE_IDENTITY_STORE"); .doesNotContain("VEHICLE_IDENTITY_STORE")
.doesNotContain("KAFKA_ENABLED");
} }
private static Properties applicationProperties() { private static Properties applicationProperties() {