diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java b/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java index c53b12a..d8761c9 100644 --- a/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java +++ b/cloud-etl-common/src/main/java/com/muyu/domain/EngineVersion.java @@ -43,7 +43,7 @@ public class EngineVersion extends BaseEntity { * 版本类名 */ @Excel(name = "版本类名") - private String versionClass; + private String versionClass; /** * 版本名称 diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java index 2ca8c43..8fc3be4 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java @@ -112,26 +112,26 @@ public class EngIneController extends BaseController { engineMaintenanceExcelUtil.exportExcel(httpServletResponse, list, "规则引擎版本"); } - /** - * 通过引擎维护编号禁用引擎 - */ - @PostMapping("/forbiddenEngine/{id}") - public Result forbiddenEngine(@PathVariable Integer id) { - //使用mybatis-plus的禁用方法 -// engIneService.forbiddenEngine(id); - return engIneService.forbiddenEngine(id); - } - - /** - * 通过引擎维护编号开启引擎 - */ - @PostMapping("/onEngine/{id}") - public Result onEngine(@PathVariable Integer id) { - //使用mybatis-plus的开启方法 +// /** +// * 通过引擎维护编号禁用引擎 +// */ +// @PostMapping("/forbiddenEngine/{id}") +// public Result forbiddenEngine(@PathVariable Integer id) { +// //使用mybatis-plus的禁用方法 +//// engIneService.forbiddenEngine(id); +// return engIneService.forbiddenEngine(id); +// } +// +// /** +// * 通过引擎维护编号开启引擎 +// */ +// @PostMapping("/onEngine/{id}") +// public Result onEngine(@PathVariable Integer id) { +// //使用mybatis-plus的开启方法 +//// engIneService.onEngine(id); // engIneService.onEngine(id); - engIneService.onEngine(id); - return Result.success(); - } +// return Result.success(); +// } /** * 通过引擎维护编号关闭引擎 diff --git a/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml b/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml index ff27f13..0b4d09b 100644 --- a/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml +++ b/cloud-etl-server/src/main/resources/mapper/EngineMapper.xml @@ -20,12 +20,12 @@ update engine_maintenance - set status = 3 + set status = 2 where id = #{id} update engine_maintenance - set status = 4 + set status = 1 where id = #{id} diff --git a/logs/cloud-etl-engine/info.log b/logs/cloud-etl-engine/info.log index f1ea4fe..aa190e3 100644 --- a/logs/cloud-etl-engine/info.log +++ b/logs/cloud-etl-engine/info.log @@ -1634,3 +1634,11 @@ java.net.SocketException: Connection reset 16:29:39.734 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed 16:29:39.735 [SpringApplicationShutdownHook] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success, 16:29:39.735 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye +18:51:41.197 [main] INFO c.m.EngineApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev" +18:51:44.340 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] +18:51:44.341 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24] +18:51:44.440 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext +18:51:45.958 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited +18:51:45.959 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success +18:51:45.959 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master] +18:51:47.466 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].