From 467ac757009bc9e4a919572acd4b8b6e198c73fe Mon Sep 17 00:00:00 2001
From: linrf <linrf@qq.com>
Date: Mon, 24 Jul 2023 09:36:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=87=E9=9B=86=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E5=99=A8-=E5=90=8E=E7=AB=AFTCP=20API=E3=80=91=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E8=B0=83=E5=BA=A6=E5=99=A8=E4=B8=8B=E5=8F=91=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=91=BD=E4=BB=A4=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collector-scheduling-management/pom.xml                     | 2 +-
 .../common/{SchedulerTask.java => SchCollectorTask.java}    | 4 ++--
 .../docus/server/controller/SchCollectRecordController.java | 4 ++--
 .../src/main/resources/bootstrap.yml                        | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename collector-scheduling-management/src/main/java/com/docus/server/common/{SchedulerTask.java => SchCollectorTask.java} (99%)

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 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>collector-scheduling-management-linrf</artifactId>
+    <artifactId>collector-scheduling-management</artifactId>
     <name>Archetype - collector-scheduling-management</name>
     <url>http://maven.apache.org</url>
 
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: