diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/monitor/ThreadPoolController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/monitor/ThreadPoolController.java index 2a4155193..da433cdc3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/monitor/ThreadPoolController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/monitor/ThreadPoolController.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor; @@ -35,7 +36,7 @@ public class ThreadPoolController { @Autowired @Qualifier("scheduledExecutorService") - private ScheduledThreadPoolExecutor scheduledExecutorService; + private ScheduledExecutorService scheduledExecutorService; /** * 获取所有线程池运行状态 @@ -52,7 +53,10 @@ public class ThreadPoolController { poolInfoList.add(buildTaskExecutorInfo("thirdpartyTaskExecutor", "第三方推送线程池", thirdpartyTaskExecutor)); // 定时任务线程池 - poolInfoList.add(buildScheduledExecutorInfo("scheduledExecutorService", "定时任务线程池", scheduledExecutorService)); + if (scheduledExecutorService instanceof ScheduledThreadPoolExecutor) { + poolInfoList.add(buildScheduledExecutorInfo("scheduledExecutorService", "定时任务线程池", + (ScheduledThreadPoolExecutor) scheduledExecutorService)); + } return AjaxResult.success(poolInfoList); } diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index ef3e2cd10..8a61eb3a9 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -9,13 +9,13 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.0.32 + host: 106.14.94.149 # 端口,默认为6379 port: 6379 # 数据库索引 database: 0 # 密码 - password: 123456 + password: js160829 # 连接超时时间 timeout: 10s lettuce: @@ -36,11 +36,11 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_dev + url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_pre # url: jdbc:mysql://192.168.2.46:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: jsowell_prd_copy - password: 123456 + password: Js@160829 # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -90,7 +90,7 @@ spring: # rabbitmq配置 dev rabbitmq: - host: 192.168.0.32 + host: 106.14.94.149 port: 5672 username: admin password: admin @@ -121,7 +121,7 @@ logging: # 基础URL前缀 baseurl: - prefix: http://192.168.2.3:8080 + prefix: http://106.14.94.149:8080 # Minio配置 minio: @@ -270,11 +270,11 @@ dubbo: name: wcc-server qosEnable: false registry: - address: nacos://192.168.0.32:8848 + address: nacos://106.14.94.149:8848 parameters: - namespace: e328faaf-8516-42d0-817a-7406232b3581 + namespace: 200784c9-7e8f-4b2b-a44f-1eb52e675491 username: nacos - password: 79HMu!6nlOiLm^Q[ + password: 3rtJPEb0KaUs5NAm protocol: name: dubbo port: -1