Merge branch 'refs/heads/dev_zc' into dev_io_zc

# Conflicts:
#	example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/entity/CarPassGather.java
#	example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/listener/CarMessageListener.java
#	example/mqtt-car/src/main/resources/application-dev.yml
#	example/mqtt-car/src/main/resources/application-prod.yml

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/config/SchedulerConfig.java

@@ -0,0 +1,35 @@
+package org.dromara.mica.mqtt.server.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+/**
+ * 定时任务线程池配置
+ * 解决默认定时任务线程池(大小为1)被阻塞导致所有定时任务无法执行的问题
+ */
+@Slf4j
+@Configuration
+@EnableScheduling
+public class SchedulerConfig {
+
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        // 增加线程池大小，避免单线程阻塞影响所有定时任务
+        scheduler.setPoolSize(5);
+        scheduler.setThreadNamePrefix("mqtt-scheduler-");
+        // 等待所有任务完成后再关闭
+        scheduler.setWaitForTasksToCompleteOnShutdown(true);
+        // 等待时间
+        scheduler.setAwaitTerminationSeconds(60);
+        // 设置异常处理器，确保异常被记录但不中断定时任务
+        scheduler.setErrorHandler(throwable -> {
+            log.error("定时任务执行异常", throwable);
+        });
+        return scheduler;
+    }
+}

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/redis/RedisService.java

@@ -80,7 +80,11 @@ public class RedisService {
 	 */
 	public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit)
 	{
+		try {
 			redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+		} catch (Exception e) {
+			log.error("Redis setCacheObject error: key={}", key, e);
+		}
 	}
 
 	/**
@@ -127,7 +131,12 @@ public class RedisService {
 	 */
 	public Boolean hasKey(String key)
 	{
+		try {
 			return redisTemplate.hasKey(key);
+		} catch (Exception e) {
+			log.error("Redis hasKey error: key={}", key, e);
+			return false;
+		}
 	}
 
 	/**
@@ -138,8 +147,13 @@ public class RedisService {
 	 */
 	public <T> T getCacheObject(final String key)
 	{
+		try {
 			ValueOperations<String, T> operation = redisTemplate.opsForValue();
 			return operation.get(key);
+		} catch (Exception e) {
+			log.error("Redis getCacheObject error: key={}", key, e);
+			return null;
+		}
 	}
 
 	/**

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/task/HeartbeatOnLineTask.java

@@ -30,6 +30,8 @@ public class HeartbeatOnLineTask {
 
 	@Scheduled(fixedRate = 15 * 1000)
 	public void run() {
+		// 添加异常捕获，防止单个任务异常导致定时任务线程阻塞
+		try {
 			log.info("===========心跳检测=============");
 			//查询车辆摄像头的编码和在线状态
 			List<Equipment> equipment = equipmentService.selectAllSnFlag();
@@ -50,8 +52,10 @@ public class HeartbeatOnLineTask {
 						equipmentService.updateFlag(equip.getSequence(), FlagEnums.OFFLINE.getCode());
 					}
 				}
-
 			}
-
+		} catch (Exception e) {
+			// 捕获所有异常并记录日志，确保定时任务能继续执行
+			log.error("HeartbeatOnLineTask 定时任务执行异常", e);
+		}
 	}
 }

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/task/PlatePublishTask.java

@@ -50,6 +50,8 @@ public class PlatePublishTask {
 	 */
 	@Scheduled(fixedDelay = 8 * 1000)
 	public void run() {
+		// 添加异常捕获，防止单个任务异常导致定时任务线程阻塞
+		try {
 			String whiteUrl = "device/%s/message/down/white_list_operator";
 
 			//新增&编辑车牌
@@ -136,7 +138,10 @@ public class PlatePublishTask {
 
 				}
 			}
-
+		} catch (Exception e) {
+			// 捕获所有异常并记录日志，确保定时任务能继续执行
+			log.error("PlatePublishTask 定时任务执行异常", e);
+		}
 	}
 
 

example/mqtt-car/src/main/resources/application-dev.yml

@@ -1,12 +1,33 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/td_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:3306/td_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
     username: root
     password: root
+    # Druid 连接池配置
+    druid:
+      max-active: 20
+      max-wait: 60000
+      min-idle: 5
+      initial-size: 5
+      validation-query: SELECT 1
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
   data:
     redis:
+#      host: 127.0.0.1
       host: 192.168.2.30
       password: redis2025
       database: 5
       port: 6379
+      # Redis 超时配置，防止连接阻塞
+      timeout: 5000ms
+      lettuce:
+        pool:
+          max-active: 8
+          max-idle: 8
+          min-idle: 2
+          max-wait: 5000ms

example/mqtt-car/src/main/resources/application-prod.yml

@@ -2,25 +2,37 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #xa
-#    url: jdbc:mysql://127.0.0.1:3306/xa_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://127.0.0.1:3306/xa_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
 #    username: root
 #    password: Xahg2024.
     #jl
-#    url: jdbc:mysql://127.0.0.1:3306/jl_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://127.0.0.1:3306/jl_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
 #    username: root
 #    password: JL202509jj
     #td
-    url: jdbc:mysql://127.0.0.1:3306/td_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-    username: root
-    password: td@JJ2024
+#    url: jdbc:mysql://127.0.0.1:3306/td_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
+#    username: root
+#    password: td@JJ2024
     #zr
-#    url: jdbc:mysql://192.168.155.42:3306/zr_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://192.168.155.42:3306/zr_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
 #    username: root
 #    password: zr202407.J
     #xj
-#    url: jdbc:mysql://127.0.0.1:3306/xj_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#    username: root
-#    password: XjJN2024!
+    url: jdbc:mysql://127.0.0.1:3306/xj_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
+    username: root
+    password: XjJN2024!
+    # Druid 连接池配置
+    druid:
+      max-active: 20
+      max-wait: 60000
+      min-idle: 5
+      initial-size: 5
+      validation-query: SELECT 1
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
   data:
     redis:
       #zr
@@ -30,3 +42,11 @@ spring:
       port: 6379
       password:
       database: 1
+      # Redis 超时配置，防止连接阻塞
+      timeout: 5000ms
+      lettuce:
+        pool:
+          max-active: 8
+          max-idle: 8
+          min-idle: 2
+          max-wait: 5000ms

example/mqtt-car/src/main/resources/application.yml

@@ -6,8 +6,8 @@ spring:
     name: mica-mqtt-server
   # 环境 dev|test|prod
   profiles:
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
   messages:
     encoding: UTF-8
     basename: i18n/messages
@@ -127,3 +127,8 @@ logging:
     server: info # t-io 服务端默认日志
     org.tio: info # t-io 服务端默认日志
     org.dromara.mica.mqtt: info # mica-mqtt 日志
+    org.dromara.mica.mqtt.server.task: debug # 定时任务日志级别
+
+# 定时任务线程池配置
+scheduler:
+  pool-size: 5