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

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

haobang-security-dm/syslog-consumer-rule/src/main/resources/application-dev.properties

@@ -15,10 +15,11 @@ syslog.udp.port=514
 syslog.max.frame.length=65536
 syslog.buffer.size=1000
 syslog.sm4.generateKey=f79548ab6fa8a304fc0115e17230358a
+
 # InfluxDB 2.7 Configuration
-influxdb.url=http://192.168.222.131:8086
-influxdb.token=3Tvu-IZWtaY03UDkbUDlufD0kxn85keo9LhYQcv2Cxk0LJmXqqHkNVrO664DbaJAYwoGI7UIg904KqZC7Q_ZFA==
-influxdb.org=yelang
+influxdb.url=http://192.168.4.99:8087
+influxdb.token=JsUyvU8vhQEFlMM_el4Drm87fyh707IhwJNsPBucPghSdbVmdQ-UvmPcyP5NTzWxsRfEz0T51Rw4ebZUuUrmZg==
+influxdb.org=influxdb
 influxdb.bucket=yelangbucket
 influxdb.batch.size=1000
 influxdb.flush.interval=1000
@@ -33,17 +34,15 @@ app.worker.threads=8
 app.max.queue.size=10000
 app.metrics.enabled=true
 
-
 #database Configuration
-spring.datasource.url=jdbc:dm://192.163.4.99:5237/DM_ecosys
+spring.datasource.url=jdbc:dm://192.168.4.99:5237
 spring.datasource.username=SYSDBA
 spring.datasource.password=caZ2TcmXNSW8L2Ap
 spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver
-spring.datasource.hikari.schema=\"PUBLIC\"
+spring.datasource.hikari.schema=ECOSYS
 # mybatis Configuration
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.common.entity
-
 #mybatis handler 类
 mybatis.configuration.default-statement-timeout=30
 mybatis.configuration.default-fetch-size=1000
@@ -51,23 +50,23 @@ mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.type-handlers-package=com.Modules.etl.handler
 mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.type-handlers-package=com.Modules.etl.handler
+
 # kafka Configuration
-spring.kafka.consumer.bootstrap-servers=192.168.222.130:9092
-spring.kafka.consumer.group-id=agent-syslog-group
+spring.kafka.consumer.bootstrap-servers=192.168.4.99:9092
+spring.kafka.consumer.group-id=test-group-1
 spring.kafka.consumer.auto-offset-reset=latest
 spring.kafka.consumer.enable-auto-commit=false 
 spring.kafka.consumer.auto-commit-interval=1000
-spring.kafka.consumer.topic=agent-syslog-topic
+spring.kafka.consumer.topic=test-topic
+
 
 spring.kafka.consumer.max-poll-records=1000
 spring.kafka.consumer.properties.max.poll.interval.ms=300000
 spring.kafka.consumer.properties.session.timeout.ms=45000
 
-#spring.kafka.consumer.key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-#spring.kafka.consumer.value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
 spring.kafka.consumer.fetch-min-size= 1048576
 spring.kafka.listener.ack-mode= manual
-spring.kafka.listener.concurrency= 2  
+spring.kafka.listener.concurrency= 2
 spring.kafka.listener.type=batch
 
 
@@ -83,21 +82,23 @@ partition.check.tomorrow.enabled=true
 partition.check.future.days=7
 partition.auto.create=true
 
-# 开发环境缓存配置
+
+# 生产环境缓存配置
 spring.redis.host=localhost
 spring.redis.port=6379
 # 密码（如果没有设置密码，可以省略）
 spring.redis.password=
 spring.redis.database=0
-spring.redis.timeout=2000
+spring.redis.timeout=5000
+#spring.redis.password=${REDIS_PASSWORD:default_prod_password}
 
-spring.redis.lettuce.pool.max-active=8
-spring.redis.lettuce.pool.max-wait=-1
-spring.redis.lettuce.pool.max-idle=8
-spring.redis.lettuce.pool.min-idle=0
-# 开发环境缓存时间较短，方便调试
-spring.cache.redis.time-to-live=600000
+spring.redis.lettuce.pool.max-active=20
+spring.redis.lettuce.pool.max-wait=5000
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=5
 
+# 生产环境缓存时间较长
+spring.cache.redis.time-to-live=3600000
 
 # 应用处理器配置
 app.processor.thread-pool.core-pool-size=10
@@ -124,5 +125,4 @@ spring.datasource.hikari.connection-test-query=SELECT 1 FROM DUAL
 spring.datasource.hikari.validation-timeout=5000
 spring.datasource.hikari.leak-detection-threshold=30000          
 spring.datasource.hikari.pool-name=HikariPool-SyslogConsumer-rule
-spring.datasource.hikari.auto-commit=false
-
+spring.datasource.hikari.auto-commit=false

haobang-security-dm/syslog-consumer-rule/src/main/resources/application-prod.properties

@@ -52,8 +52,8 @@ mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.type-handlers-package=com.Modules.etl.handler
 
 # kafka Configuration
-spring.kafka.consumer.bootstrap-servers=192.168.4.26:9092
-spring.kafka.consumer.group-id=agent-01-syslog-group-dm
+spring.kafka.consumer.bootstrap-servers=192.168.4.99:9092
+spring.kafka.consumer.group-id=agent-01-syslog-group
 spring.kafka.consumer.auto-offset-reset=latest
 spring.kafka.consumer.enable-auto-commit=false 
 spring.kafka.consumer.auto-commit-interval=1000
@@ -63,7 +63,7 @@ spring.kafka.consumer.topic=agent-01-syslog-topic
 spring.kafka.consumer.max-poll-records=1000
 spring.kafka.consumer.properties.max.poll.interval.ms=300000
 spring.kafka.consumer.properties.session.timeout.ms=45000
-
+spring.kafka.consumer.properties.partition.assignment.strategy=org.apache.kafka.clients.consumer.RoundRobinAssignor
 spring.kafka.consumer.fetch-min-size= 1048576
 spring.kafka.listener.ack-mode= manual
 spring.kafka.listener.concurrency= 2  

haobang-security-dm/syslog-consumer-rule/src/main/resources/application.properties

@@ -7,7 +7,7 @@ server.error.include-message=always
 server.error.include-binding-errors=always
 
 #run.environment:  dev|test|pro
-server.run.environment=pro
+server.run.environment=dev
 
 # Syslog Server Configuration
 syslog.tcp.port=514
@@ -39,7 +39,7 @@ spring.datasource.url=jdbc:dm://192.168.4.99:5237
 spring.datasource.username=SYSDBA
 spring.datasource.password=caZ2TcmXNSW8L2Ap
 spring.datasource.driver-class-name=dm.jdbc.driver.DmDriver
-spring.datasource.hikari.schema=\"PUBLIC\"
+spring.datasource.hikari.schema=ECOSYS
 # mybatis Configuration
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.common.entity
@@ -52,12 +52,12 @@ mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.type-handlers-package=com.Modules.etl.handler
 
 # kafka Configuration
-spring.kafka.consumer.bootstrap-servers=192.168.4.26:9092
-spring.kafka.consumer.group-id=agent-01-syslog-group-dm
+spring.kafka.consumer.bootstrap-servers=192.168.4.99:9092
+spring.kafka.consumer.group-id=test-group-1
 spring.kafka.consumer.auto-offset-reset=latest
 spring.kafka.consumer.enable-auto-commit=false 
 spring.kafka.consumer.auto-commit-interval=1000
-spring.kafka.consumer.topic=agent-01-syslog-topic
+spring.kafka.consumer.topic=test-topic
 
 
 spring.kafka.consumer.max-poll-records=1000
@@ -66,7 +66,7 @@ spring.kafka.consumer.properties.session.timeout.ms=45000
 
 spring.kafka.consumer.fetch-min-size= 1048576
 spring.kafka.listener.ack-mode= manual
-spring.kafka.listener.concurrency= 2  
+spring.kafka.listener.concurrency= 2
 spring.kafka.listener.type=batch
 
 
@@ -84,10 +84,10 @@ partition.auto.create=true
 
 
 # 生产环境缓存配置
-spring.redis.host=192.168.4.99
+spring.redis.host=localhost
 spring.redis.port=6379
 # 密码（如果没有设置密码，可以省略）
-spring.redis.password=redis_GdGWte
+spring.redis.password=
 spring.redis.database=0
 spring.redis.timeout=5000
 #spring.redis.password=${REDIS_PASSWORD:default_prod_password}

haobang-security-dm/syslog-consumer-rule/src/main/resources/mapper/DeviceCollectTaskMapper.xml

@@ -22,12 +22,17 @@
         <result column="task_count" property="taskCount" />
         <result column="recent_discover_time" property="recentDiscoverTime" />
         <result column="epm_upper_limit" property="epmUpperLimit" />
+        <result column="expire_time" property="expireTime" />
+        <result column="remark" property="remark" />
+        <result column="device_ip" property="deviceIp" />
+        <result column="organization_id" property="organizationId" />
     </resultMap>
 
     <sql id="Base_Column_List">
         id, created_at, updated_at, deleted_at, device_id, method, task_name,
         first_time, last_success_time, last_failed_time, detail_id, epm, epm_peak,
-        process_architecture, task_count, recent_discover_time, epm_upper_limit
+        process_architecture, task_count, recent_discover_time, epm_upper_limit,
+        expire_time, remark, device_ip, organization_id
     </sql>
 
     <!-- 多条件组合查询 -->
@@ -60,6 +65,16 @@
             <if test="lastSuccessTime != null">
                 AND last_success_time >= #{lastSuccessTime}
             </if>
+            <!-- 新增字段查询 -->
+            <if test="deviceIp != null and deviceIp != ''">
+                AND device_ip = #{deviceIp}
+            </if>
+            <if test="organizationId != null">
+                AND organization_id = #{organizationId}
+            </if>
+            <if test="remark != null and remark != ''">
+                AND remark LIKE CONCAT('%', #{remark}, '%')
+            </if>
         </where>
         ORDER BY updated_at DESC
     </select>