mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-07-12 01:58:00 +08:00
update 修复启动失败
This commit is contained in:
@@ -13,6 +13,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||||
import java.util.concurrent.ThreadPoolExecutor;
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
|
|
||||||
@@ -35,7 +36,7 @@ public class ThreadPoolController {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@Qualifier("scheduledExecutorService")
|
@Qualifier("scheduledExecutorService")
|
||||||
private ScheduledThreadPoolExecutor scheduledExecutorService;
|
private ScheduledExecutorService scheduledExecutorService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取所有线程池运行状态
|
* 获取所有线程池运行状态
|
||||||
@@ -52,7 +53,10 @@ public class ThreadPoolController {
|
|||||||
poolInfoList.add(buildTaskExecutorInfo("thirdpartyTaskExecutor", "第三方推送线程池", thirdpartyTaskExecutor));
|
poolInfoList.add(buildTaskExecutorInfo("thirdpartyTaskExecutor", "第三方推送线程池", thirdpartyTaskExecutor));
|
||||||
|
|
||||||
// 定时任务线程池
|
// 定时任务线程池
|
||||||
poolInfoList.add(buildScheduledExecutorInfo("scheduledExecutorService", "定时任务线程池", scheduledExecutorService));
|
if (scheduledExecutorService instanceof ScheduledThreadPoolExecutor) {
|
||||||
|
poolInfoList.add(buildScheduledExecutorInfo("scheduledExecutorService", "定时任务线程池",
|
||||||
|
(ScheduledThreadPoolExecutor) scheduledExecutorService));
|
||||||
|
}
|
||||||
|
|
||||||
return AjaxResult.success(poolInfoList);
|
return AjaxResult.success(poolInfoList);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,13 +9,13 @@ spring:
|
|||||||
# redis 配置
|
# redis 配置
|
||||||
redis:
|
redis:
|
||||||
# 地址
|
# 地址
|
||||||
host: 192.168.0.32
|
host: 106.14.94.149
|
||||||
# 端口,默认为6379
|
# 端口,默认为6379
|
||||||
port: 6379
|
port: 6379
|
||||||
# 数据库索引
|
# 数据库索引
|
||||||
database: 0
|
database: 0
|
||||||
# 密码
|
# 密码
|
||||||
password: 123456
|
password: js160829
|
||||||
# 连接超时时间
|
# 连接超时时间
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
lettuce:
|
lettuce:
|
||||||
@@ -36,11 +36,11 @@ spring:
|
|||||||
druid:
|
druid:
|
||||||
# 主库数据源
|
# 主库数据源
|
||||||
master:
|
master:
|
||||||
url: jdbc:mysql://192.168.0.32:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||||
username: jsowell_dev
|
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
|
# 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
|
# username: jsowell_prd_copy
|
||||||
password: 123456
|
password: Js@160829
|
||||||
# 从库数据源
|
# 从库数据源
|
||||||
slave:
|
slave:
|
||||||
# 从数据源开关/默认关闭
|
# 从数据源开关/默认关闭
|
||||||
@@ -90,7 +90,7 @@ spring:
|
|||||||
|
|
||||||
# rabbitmq配置 dev
|
# rabbitmq配置 dev
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
host: 192.168.0.32
|
host: 106.14.94.149
|
||||||
port: 5672
|
port: 5672
|
||||||
username: admin
|
username: admin
|
||||||
password: admin
|
password: admin
|
||||||
@@ -121,7 +121,7 @@ logging:
|
|||||||
|
|
||||||
# 基础URL前缀
|
# 基础URL前缀
|
||||||
baseurl:
|
baseurl:
|
||||||
prefix: http://192.168.2.3:8080
|
prefix: http://106.14.94.149:8080
|
||||||
|
|
||||||
# Minio配置
|
# Minio配置
|
||||||
minio:
|
minio:
|
||||||
@@ -270,11 +270,11 @@ dubbo:
|
|||||||
name: wcc-server
|
name: wcc-server
|
||||||
qosEnable: false
|
qosEnable: false
|
||||||
registry:
|
registry:
|
||||||
address: nacos://192.168.0.32:8848
|
address: nacos://106.14.94.149:8848
|
||||||
parameters:
|
parameters:
|
||||||
namespace: e328faaf-8516-42d0-817a-7406232b3581
|
namespace: 200784c9-7e8f-4b2b-a44f-1eb52e675491
|
||||||
username: nacos
|
username: nacos
|
||||||
password: 79HMu!6nlOiLm^Q[
|
password: 3rtJPEb0KaUs5NAm
|
||||||
protocol:
|
protocol:
|
||||||
name: dubbo
|
name: dubbo
|
||||||
port: -1
|
port: -1
|
||||||
|
|||||||
Reference in New Issue
Block a user