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

fix: align portainer archive and jt808 port

Browse Source
This commit is contained in:
lingniu
2026-06-29 16:09:02 +08:00
parent 98b37e71e9
commit d2bc4a0d0a
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ x-common-env: &common-env
services: services:
gb32960-ingest-app: gb32960-ingest-app:
image: crpi-85r4m0ackrm3qpje-vpc.cn-shanghai.personal.cr.aliyuncs.com/oneos/gb32960-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/gb32960-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
container_name: gb32960-ingest-app container_name: gb32960-ingest-app
restart: unless-stopped restart: unless-stopped
environment: environment:
@@ -39,36 +39,40 @@ services:
GB32960_PLATFORM_PWD_HYUNDAI: ${GB32960_PLATFORM_PWD_HYUNDAI:-} GB32960_PLATFORM_PWD_HYUNDAI: ${GB32960_PLATFORM_PWD_HYUNDAI:-}
GB32960_PLATFORM_IP_HYUNDAI: ${GB32960_PLATFORM_IP_HYUNDAI:-} GB32960_PLATFORM_IP_HYUNDAI: ${GB32960_PLATFORM_IP_HYUNDAI:-}
GB32960_TLS_ENABLED: ${GB32960_TLS_ENABLED:-false} GB32960_TLS_ENABLED: ${GB32960_TLS_ENABLED:-false}
SINK_ARCHIVE_PATH: /archive/
VEHICLE_IDENTITY_FILE: /data/vehicle-identity.jsonl VEHICLE_IDENTITY_FILE: /data/vehicle-identity.jsonl
ports: ports:
- "${GB32960_HTTP_PORT:-20100}:20100" - "${GB32960_HTTP_PORT:-20100}:20100"
- "${GB32960_TCP_PORT:-32960}:32960" - "${GB32960_TCP_PORT:-32960}:32960"
volumes: volumes:
- vehicle-history-archive:/archive
- gb32960-ingest-data:/data - gb32960-ingest-data:/data
networks: networks:
- vehicle-ingest - vehicle-ingest
jt808-ingest-app: jt808-ingest-app:
image: crpi-85r4m0ackrm3qpje-vpc.cn-shanghai.personal.cr.aliyuncs.com/oneos/jt808-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/jt808-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
container_name: jt808-ingest-app container_name: jt808-ingest-app
restart: unless-stopped restart: unless-stopped
environment: environment:
<<: *common-env <<: *common-env
HTTP_PORT: 20400 HTTP_PORT: 20400
JT808_PORT: 10808 JT808_PORT: 808
KAFKA_CONSUMER_ENABLED: "false" KAFKA_CONSUMER_ENABLED: "false"
KAFKA_NODE_ID: ${KAFKA_NODE_ID_JT808:-jt808-ingest-portainer} KAFKA_NODE_ID: ${KAFKA_NODE_ID_JT808:-jt808-ingest-portainer}
SINK_ARCHIVE_PATH: /archive/
VEHICLE_IDENTITY_FILE: /data/vehicle-identity.jsonl VEHICLE_IDENTITY_FILE: /data/vehicle-identity.jsonl
ports: ports:
- "${JT808_HTTP_PORT:-20400}:20400" - "${JT808_HTTP_PORT:-20400}:20400"
- "${JT808_TCP_PORT:-10808}:10808" - "${JT808_TCP_PORT:-808}:808"
volumes: volumes:
- vehicle-history-archive:/archive
- jt808-ingest-data:/data - jt808-ingest-data:/data
networks: networks:
- vehicle-ingest - vehicle-ingest
vehicle-history-app: vehicle-history-app:
image: crpi-85r4m0ackrm3qpje-vpc.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-history-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-history-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
container_name: vehicle-history-app container_name: vehicle-history-app
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
@@ -102,7 +106,7 @@ services:
- vehicle-ingest - vehicle-ingest
vehicle-analytics-app: vehicle-analytics-app:
image: crpi-85r4m0ackrm3qpje-vpc.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-analytics-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-analytics-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION}
container_name: vehicle-analytics-app container_name: vehicle-analytics-app
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:

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

@@ -31,7 +31,7 @@ lingniu:
ingest: ingest:
jt808: jt808:
enabled: true enabled: true
port: ${JT808_PORT:10808} port: ${JT808_PORT:808}
worker-threads: ${JT808_WORKER_THREADS:0} worker-threads: ${JT808_WORKER_THREADS:0}
pipeline: pipeline:
disruptor: disruptor:

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

@@ -22,7 +22,7 @@ class Jt808IngestAppDefaultsTest {
.containsEntry("spring.cloud.nacos.config.server-addr", "${NACOS_SERVER_ADDR:127.0.0.1:8848}") .containsEntry("spring.cloud.nacos.config.server-addr", "${NACOS_SERVER_ADDR:127.0.0.1:8848}")
.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:10808}") .containsEntry("lingniu.ingest.jt808.port", "${JT808_PORT:808}")
.containsEntry("lingniu.ingest.sink.mq.enabled", "${KAFKA_ENABLED:true}") .containsEntry("lingniu.ingest.sink.mq.enabled", "${KAFKA_ENABLED:true}")
.containsEntry("lingniu.ingest.sink.mq.consumer.enabled", false) .containsEntry("lingniu.ingest.sink.mq.consumer.enabled", false)
.containsEntry("lingniu.ingest.sink.mq.topics.realtime", "${KAFKA_TOPIC_JT808_EVENT:vehicle.event.jt808.v1}") .containsEntry("lingniu.ingest.sink.mq.topics.realtime", "${KAFKA_TOPIC_JT808_EVENT:vehicle.event.jt808.v1}")