diff --git a/collector-scheduling-management/pom.xml b/collector-scheduling-management/pom.xml
index c1e79e0..a35b222 100644
--- a/collector-scheduling-management/pom.xml
+++ b/collector-scheduling-management/pom.xml
@@ -6,7 +6,7 @@
1.0-SNAPSHOT
4.0.0
- collector-scheduling-management-linrf
+ collector-scheduling-management
Archetype - collector-scheduling-management
http://maven.apache.org
diff --git a/collector-scheduling-management/src/main/java/com/docus/server/common/SchedulerTask.java b/collector-scheduling-management/src/main/java/com/docus/server/common/SchCollectorTask.java
similarity index 99%
rename from collector-scheduling-management/src/main/java/com/docus/server/common/SchedulerTask.java
rename to collector-scheduling-management/src/main/java/com/docus/server/common/SchCollectorTask.java
index 1502927..287085c 100644
--- a/collector-scheduling-management/src/main/java/com/docus/server/common/SchedulerTask.java
+++ b/collector-scheduling-management/src/main/java/com/docus/server/common/SchCollectorTask.java
@@ -39,7 +39,7 @@ import java.util.concurrent.LinkedBlockingQueue;
@Component
@Slf4j
-public class SchedulerTask {
+public class SchCollectorTask {
@Resource
private ChannelRepository channelRepository;
@Resource
@@ -60,7 +60,7 @@ public class SchedulerTask {
//定时任务
// 5 * * * * ? 在每分钟的5秒执行
@Scheduled(cron = "0/1 * * * * ?")
- public void collectorTask() {
+ public void runTask() {
try {
log.info("定时任务: 开始执行");
diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java
index e7cc54c..f39a5a1 100644
--- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java
+++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java
@@ -6,7 +6,7 @@ import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.log.annotation.TrackGroup;
import com.docus.server.api.scheduling.management.SchCollectRecordApi;
-import com.docus.server.common.SchedulerTask;
+import com.docus.server.common.SchCollectorTask;
import com.docus.server.common.process.ChannelProcessor;
import com.docus.server.dto.scheduling.management.schcollector.task.ReportDownTwoDTO;
import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO;
@@ -32,7 +32,7 @@ public class SchCollectRecordController implements SchCollectRecordApi {
@Resource
private ISchCollectRecordService iSchCollectRecordService;
@Resource
- private SchedulerTask schedulerTask;
+ private SchCollectorTask schedulerTask;
/**
* 按主键查询
diff --git a/collector-scheduling-management/src/main/resources/bootstrap.yml b/collector-scheduling-management/src/main/resources/bootstrap.yml
index de372a2..3eb661d 100644
--- a/collector-scheduling-management/src/main/resources/bootstrap.yml
+++ b/collector-scheduling-management/src/main/resources/bootstrap.yml
@@ -13,8 +13,8 @@ spring:
#公司病案的文件服务数据库
master:
url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus-collector-scheduling?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
- username: root
- password: root
+ username: docus
+ password: docus702
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
servlet:
@@ -23,7 +23,7 @@ spring:
max-request-size: 200MB
redis:
host: redis.docus.cn
-# password: JSdocus@702
+ password: JSdocus@702
cloud:
nacos:
discovery: