diff --git a/collector-scheduling-management/pom.xml b/collector-scheduling-management/pom.xml
index 8f0259a..a35b222 100644
--- a/collector-scheduling-management/pom.xml
+++ b/collector-scheduling-management/pom.xml
@@ -18,7 +18,17 @@
compile
+
+ org.freemarker
+ freemarker
+ 2.3.30
+
+
+ cn.smallbun.screw
+ screw-core
+ 1.0.3
+
diff --git a/collector-scheduling-management/src/main/java/com/docus/server/DeConfig.java b/collector-scheduling-management/src/main/java/com/docus/server/DeConfig.java
new file mode 100644
index 0000000..c645987
--- /dev/null
+++ b/collector-scheduling-management/src/main/java/com/docus/server/DeConfig.java
@@ -0,0 +1,17 @@
+package com.docus.server;
+
+import com.docus.infrastructure.WebConfig;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+
+@Configuration
+public class DeConfig extends WebConfig {
+ @Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ super.addResourceHandlers(registry);
+ registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+ }
+
+
+}
diff --git a/collector-scheduling-management/src/main/java/com/docus/server/SwaggerConfig.java b/collector-scheduling-management/src/main/java/com/docus/server/SwaggerConfig.java
new file mode 100644
index 0000000..8a0b7ed
--- /dev/null
+++ b/collector-scheduling-management/src/main/java/com/docus/server/SwaggerConfig.java
@@ -0,0 +1,13 @@
+package com.docus.server;
+
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@EnableSwagger2
+@Configuration
+public class SwaggerConfig {
+
+
+
+
+}
diff --git a/collector-scheduling-management/src/main/resources/bootstrap.yml b/collector-scheduling-management/src/main/resources/bootstrap.yml
index bebbae1..8628dd8 100644
--- a/collector-scheduling-management/src/main/resources/bootstrap.yml
+++ b/collector-scheduling-management/src/main/resources/bootstrap.yml
@@ -12,7 +12,7 @@ spring:
datasource:
#公司病案的文件服务数据库
master:
- url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+ 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: docus
password: docus702
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
diff --git a/collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java b/collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java
new file mode 100644
index 0000000..09102c4
--- /dev/null
+++ b/collector-scheduling-management/src/test/java/com/docus/server/TsmsAuthApiApplicationTests.java
@@ -0,0 +1,79 @@
+package com.docus.server;
+
+import cn.smallbun.screw.core.Configuration;
+import cn.smallbun.screw.core.engine.EngineConfig;
+import cn.smallbun.screw.core.engine.EngineFileType;
+import cn.smallbun.screw.core.engine.EngineTemplateType;
+import cn.smallbun.screw.core.execute.DocumentationExecute;
+import cn.smallbun.screw.core.process.ProcessConfig;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+
+import javax.sql.DataSource;
+import java.util.ArrayList;
+
+@SpringBootTest
+class ScrewTests {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ @Test
+ void test() {
+
+ HikariConfig hikariConfig = new HikariConfig();
+ hikariConfig.setDriverClassName("com.mysql.cj.jdbc.Driver");
+ hikariConfig.setJdbcUrl("jdbc:mysql://db.docus.cn:3306/docus-collector-scheduling?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai");
+ hikariConfig.setUsername("docus");
+ hikariConfig.setPassword("docus702");
+ //设置可以获取tables remarks信息
+ hikariConfig.addDataSourceProperty("useInformationSchema", "true");
+ hikariConfig.setMinimumIdle(2);
+ hikariConfig.setMaximumPoolSize(5);
+ DataSource dataSource = new HikariDataSource(hikariConfig);
+
+ //生成文件配置
+ EngineConfig engineConfig = EngineConfig
+ .builder()
+ //文件生成路径
+ .fileOutputDir("h:\\file")
+ //打开目录
+ .openOutputDir(false)
+ //文件类型
+ .fileType(EngineFileType.WORD)
+ //生成模板实现
+ .produceType(EngineTemplateType.freemarker)
+ .build();
+ //配置想要生成的表
+ ProcessConfig processConfig = ProcessConfig
+ .builder()
+ //根据名称指定表生成
+ .designatedTableName(new ArrayList<>())
+ //根据表前缀生成
+ .designatedTablePrefix(new ArrayList<>())
+ //根据表后缀生成
+ .designatedTableSuffix(new ArrayList<>())
+ //忽略表名
+ .ignoreTableName(new ArrayList<>())
+ //忽略表前缀
+ .ignoreTablePrefix(new ArrayList<>())
+ //忽略表后缀
+ .ignoreTableSuffix(new ArrayList<>())
+ .build();
+ //生成文档配置
+ Configuration configuration = Configuration.builder()
+ .version("1.0.0")
+ .description("描述")
+ .dataSource(dataSource)
+ .engineConfig(engineConfig)
+ .produceConfig(processConfig)
+ .build();
+
+ //生成
+ new DocumentationExecute(configuration).execute();
+ }
+}
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorApi.java
index 77755ce..4077f86 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集器管理（终端）任务管理接口", tags = "采集器管理（终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorApi")
-@RequestMapping("/taskCollector")
+@RequestMapping("/sch/taskCollector")
public interface TaskCollectorApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionApi.java
index b27f0c3..7817479 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集器版本列表管理（终端）任务管理接口", tags = "采集器版本列表管理（终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorVersionApi")
-@RequestMapping("/taskCollectorVersion")
+@RequestMapping("/sch/taskCollectorVersion")
public interface TaskCollectorVersionApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionFileApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionFileApi.java
index 33d1789..ceadab2 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionFileApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionFileApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集器版本列表更新包管理（终端）任务管理接口", tags = "采集器版本列表更新包管理（终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorVersionFileApi")
-@RequestMapping("/taskCollectorVersionFile")
+@RequestMapping("/sch/taskCollectorVersionFile")
public interface TaskCollectorVersionFileApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionLogApi.java
index a5aaf9a..a8e92a1 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionLogApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskCollectorVersionLogApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集器版本更新日志管理（终端）任务管理接口", tags = "采集器版本更新日志管理（终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskCollectorVersionLogApi")
-@RequestMapping("/taskCollectorVersionLog")
+@RequestMapping("/sch/taskCollectorVersionLog")
public interface TaskCollectorVersionLogApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskOperationLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskOperationLogApi.java
index 89f16b8..6f54820 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskOperationLogApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskOperationLogApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集器版本更新日志管理（终端）任务管理接口", tags = "采集器版本更新日志管理（终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskOperationLogApi")
-@RequestMapping("/taskOperationLog")
+@RequestMapping("/sch/taskOperationLog")
public interface TaskOperationLogApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskSystemParamsApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskSystemParamsApi.java
index 6875f85..f6bceb8 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskSystemParamsApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskSystemParamsApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集器（终端）系统参数表任务管理接口", tags = "采集器（终端）系统参数表任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskSystemParamsApi")
-@RequestMapping("/taskSystemParams")
+@RequestMapping("/sch/taskSystemParams")
public interface TaskSystemParamsApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorApi.java
index c60abc7..2e39d2e 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "执行管理器（采集器终端）任务管理接口", tags = "执行管理器（采集器终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorApi")
-@RequestMapping("/taskTerminator")
+@RequestMapping("/sch/taskTerminator")
public interface TaskTerminatorApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectApi.java
index ca13cc5..5c7aab9 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集记录表（终端）任务管理接口", tags = "采集记录表（终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorCollectApi")
-@RequestMapping("/taskTerminatorCollect")
+@RequestMapping("/sch/taskTerminatorCollect")
public interface TaskTerminatorCollectApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectRetryLogApi.java
index 4badcd7..c2c82e8 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectRetryLogApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorCollectRetryLogApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集记录表重试表（终端）任务管理接口", tags = "采集记录表重试表（终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorCollectRetryLogApi")
-@RequestMapping("/taskTerminatorCollectRetryLog")
+@RequestMapping("/sch/taskTerminatorCollectRetryLog")
public interface TaskTerminatorCollectRetryLogApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java
index f67c885..f5d52c5 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorErrorLogApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "采集器异常日志（采集器终端）任务管理接口", tags = "采集器异常日志（采集器终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorErrorLogApi")
-@RequestMapping("/taskTerminatorErrorLog")
+@RequestMapping("/sch/taskTerminatorErrorLog")
public interface TaskTerminatorErrorLogApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorVirtualLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorVirtualLogApi.java
index d21d0d8..4a143d9 100644
--- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorVirtualLogApi.java
+++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/TaskTerminatorVirtualLogApi.java
@@ -27,7 +27,7 @@ import java.util.List;
*/
@Api(value = "虚拟机使用情况（采集器终端）任务管理接口", tags = "虚拟机使用情况（采集器终端）任务管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.TaskTerminatorVirtualLogApi")
-@RequestMapping("/taskTerminatorVirtualLog")
+@RequestMapping("/sch/taskTerminatorVirtualLog")
public interface TaskTerminatorVirtualLogApi {
/**
diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskOperationLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskOperationLog.java
index dd8cb07..0bf6c1e 100644
--- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskOperationLog.java
+++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/TaskOperationLog.java
@@ -15,7 +15,7 @@ import java.util.Date;
/**
*
- * 采集器版本更新日志管理（终端）
+ * 采集调度器操作日志表
*
*
* @author AutoGenerator