1、适配部署环境变量自动注入

2、适配南网达梦数据库安全版SQL语句Group by 不支持自定义函数
3、达梦数据库驱动改为达梦提供的指定版本
4、修改syslog-consumer模块yaml 文件kafka 变量名称
5、修改访问日志告警表新增4个字段，完善异常行为详情页面显示字段

haobang-security-dm/syslog-consumer-rule/docker-compose/docker-compose-consumer-nw.yaml

@@ -21,83 +21,83 @@ services:
       - SPRING_PROFILES_ACTIVE=dev
       - TZ=Asia/Shanghai
       # 数据库配置
-      - spring.datasource.url=jdbc:postgresql://117.72.68.72:54329/ecosys
-      - spring.datasource.username=postgres
-      - spring.datasource.password=TnLanWaidYSwTSG5
-      - spring.datasource.driver-class-name=org.postgresql.Driver
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://117.72.68.72:54329/ecosys
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=TnLanWaidYSwTSG5
+      - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
       # HikariCP 连接池配置
-      - spring.datasource.hikari.maximum-pool-size=50
-      - spring.datasource.hikari.minimum-idle=5
-      - spring.datasource.hikari.connection-timeout=30000
-      - spring.datasource.hikari.idle-timeout=600000
-      - spring.datasource.hikari.max-lifetime=900000
-      - spring.datasource.hikari.pool-name=HikariPool-SyslogConsumer
-      - spring.datasource.hikari.auto-commit=false
-      - spring.datasource.hikari.schema=public
+      - SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE=50
+      - SPRING_DATASOURCE_HIKARI_MINIMUM_IDLE=5
+      - SPRING_DATASOURCE_HIKARI_CONNECTION_TIMEOUT=30000
+      - SPRING_DATASOURCE_HIKARI_IDLE_TIMEOUT=600000
+      - SPRING_DATASOURCE_HIKARI_MAX_LIFETIME=900000
+      - SPRING_DATASOURCE_HIKARI_POOL_NAME=HikariPool-SyslogConsumer
+      - SPRING_DATASOURCE_HIKARI_AUTO_COMMIT=false
+      - SPRING_DATASOURCE_HIKARI_SCHEMA=public
       # Redis配置
-      - spring.redis.host=192.168.222.131
-      - spring.redis.port=6379
-      - spring.redis.password=
-      - spring.redis.database=0
-      - spring.redis.timeout=2000
-      - spring.cache.redis.time-to-live=600000
+      - SPRING_REDIS_HOST=192.168.222.131
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_PASSWORD=
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_REDIS_TIMEOUT=2000
+      - SPRING_CACHE_REDIS_TIME_TO_LIVE=600000
       # Kafka配置
-      - spring.kafka.consumer.bootstrap-servers=192.168.222.130:9092
-      - spring.kafka.consumer.group-id=test-group-app
-      - spring.kafka.consumer.auto-offset-reset=latest
-      - spring.kafka.consumer.enable-auto-commit=false
-      - spring.kafka.consumer.topic=test-topic
-      - spring.kafka.consumer.max-poll-records=1000
-      - spring.kafka.listener.ack-mode=manual
-      - spring.kafka.listener.concurrency=2
-      - spring.kafka.listener.type=batch
+      - SPRING_KAFKA_CONSUMER_BOOTSTRAP_SERVERS=192.168.222.130:9092
+      - SPRING_KAFKA_CONSUMER_GROUP_ID=test-group-app
+      - SPRING_KAFKA_CONSUMER_AUTO_OFFSET_RESET=latest
+      - SPRING_KAFKA_CONSUMER_ENABLE_AUTO_COMMIT=false
+      - SPRING_KAFKA_CONSUMER_TOPIC=test-topic
+      - SPRING_KAFKA_CONSUMER_MAX_POLL_RECORDS=1000
+      - SPRING_KAFKA_LISTENER_ACK_MODE=manual
+      - SPRING_KAFKA_LISTENER_CONCURRENCY=2
+      - SPRING_KAFKA_LISTENER_TYPE=batch
       # InfluxDB配置
-      - influxdb.url=http://192.168.222.131:8086
-      - influxdb.token=3Tvu-IZWtaY03UDkbUDlufD0kxn85keo9LhYQcv2Cxk0LJmXqqHkNVrO664DbaJAYwoGI7UIg904KqZC7Q_ZFA==
-      - influxdb.org=yelang
-      - influxdb.bucket=yelangbucket
-      - influxdb.batch.size=1000
-      - influxdb.flush.interval=1000
-      - influxdb.connection.timeout=30s
-      - influxdb.connection.read-timeout=30s
-      - influxdb.connection.write-timeout=60s
+      - INFLUXDB_URL=http://192.168.222.131:8086
+      - INFLUXDB_TOKEN=3Tvu-IZWtaY03UDkbUDlufD0kxn85keo9LhYQcv2Cxk0LJmXqqHkNVrO664DbaJAYwoGI7UIg904KqZC7Q_ZFA==
+      - INFLUXDB_ORG=yelang
+      - INFLUXDB_BUCKET=yelangbucket
+      - INFLUXDB_BATCH_SIZE=1000
+      - INFLUXDB_FLUSH_INTERVAL=1000
+      - INFLUXDB_CONNECTION_TIMEOUT=30s
+      - INFLUXDB_CONNECTION_READ_TIMEOUT=30s
+      - INFLUXDB_CONNECTION_WRITE_TIMEOUT=60s
       # Elasticsearch配置
-      - spring.elasticsearch.uris=http://192.168.1.174:9200
-      - spring.elasticsearch.username=CONTAINER_NAME
-      - spring.elasticsearch.password=t2NZCiajmdazxBrF
-      - spring.elasticsearch.connection-timeout=10s
-      - spring.elasticsearch.socket-timeout=30s
+      - SPRING_ELASTICSEARCH_URIS=http://192.168.1.174:9200
+      - SPRING_ELASTICSEARCH_USERNAME=CONTAINER_NAME
+      - SPRING_ELASTICSEARCH_PASSWORD=t2NZCiajmdazxBrF
+      - SPRING_ELASTICSEARCH_CONNECTION_TIMEOUT=10s
+      - SPRING_ELASTICSEARCH_SOCKET_TIMEOUT=30s
       # API配置
-      - interlocking.api-key=a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6
-      - interlocking.api.base-url=http://192.168.222.131:8089/xdrservice/interlocking
+      - INTERLOCKING_API_KEY=a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6
+      - INTERLOCKING_API_BASE_URL=http://192.168.222.131:8089/xdrservice/interlocking
       # 探针心跳配置
-      - probe.heartbeat.enabled=true
-      - probe.heartbeat.offline-threshold-minutes=10
-      - probe.status.check.cron=0 */10 * * * ?
-      - probe.heartbeat.tenant-id=000000
-      - probe.heartbeat.history.keep-days=10
-      - probe.heartbeat.history.cleanup-enabled=true
-      - probe.history.cleanup.cron=0 0 1 * * ?
+      - PROBE_HEARTBEAT_ENABLED=true
+      - PROBE_HEARTBEAT_OFFLINE_THRESHOLD_MINUTES=10
+      - PROBE_STATUS_CHECK_CRON=0 */10 * * * ?
+      - PROBE_HEARTBEAT_TENANT_ID=000000
+      - PROBE_HEARTBEAT_HISTORY_KEEP_DAYS=10
+      - PROBE_HEARTBEAT_HISTORY_CLEANUP_ENABLED=true
+      - PROBE_HISTORY_CLEANUP_CRON=0 0 1 * * ?
       # 告警健康检查配置
-      - alarm.health-check.alarm-hours=4
-      - alarm.health-check.alarm-visit-hours=2
-      - alarm.health-check.enabled=true
+      - ALARM_HEALTH_CHECK_ALARM_HOURS=4
+      - ALARM_HEALTH_CHECK_ALARM_VISIT_HOURS=2
+      - ALARM_HEALTH_CHECK_ENABLED=true
       # 关联分析规则配置
-      - analysis.realtime.enabled=true
-      - analysis.realtime.check-interval-seconds=10
+      - ANALYSIS_REALTIME_ENABLED=true
+      - ANALYSIS_REALTIME_CHECK_INTERVAL_SECONDS=10
       # 分区表检查配置
-      - partition.check.tomorrow.enabled=true
-      - partition.check.future.days=7
-      - partition.auto.create=true
+      - PARTITION_CHECK_TOMORROW_ENABLED=true
+      - PARTITION_CHECK_FUTURE_DAYS=7
+      - PARTITION_AUTO_CREATE=true
       # 定时任务配置
-      - spring.task.scheduling.pool.size=10
+      - SPRING_TASK_SCHEDULING_POOL_SIZE=10
       # 日志配置
-      - logging.level.com.common.schedule=INFO
-      - logging.level.com.common.service=INFO
+      - LOGGING_LEVEL_COM_COMMON_SCHEDULE=INFO
+      - LOGGING_LEVEL_COM_COMMON_SERVICE=INFO
       # ETL配置
-      - etl.batch.page-size=1000
-      - etl.batch.insert-batch-size=500
-      - etl.schedule.cron=0 0 2 * * ?
+      - ETL_BATCH_PAGE_SIZE=1000
+      - ETL_BATCH_INSERT_BATCH_SIZE=500
+      - ETL_SCHEDULE_CRON=0 0 2 * * ?
       # JVM配置
       - JAVA_OPTS=-Xms512m -Xmx1024m -XX:+UseG1GC -XX:MaxGCPauseMillis=200
     ports: