diff --git a/functional-modules/monitoring-sync/pom.xml b/functional-modules/monitoring-sync/pom.xml index 7eddebc..cb2f069 100644 --- a/functional-modules/monitoring-sync/pom.xml +++ b/functional-modules/monitoring-sync/pom.xml @@ -30,14 +30,6 @@ org.springframework.boot spring-boot-starter-validation - - - com.dameng - DmJdbcDriver8 - ${dm.jdbc.version} - system - ${project.basedir}/../../lib/DmJdbcDriver8.jar - org.springframework.boot spring-boot-configuration-processor diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot-base-core/pom.xml index 7d370ce..34c243c 100644 --- a/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base-core/pom.xml @@ -140,13 +140,11 @@ - + com.dameng DmJdbcDriver8 - ${dm.jdbc.version} - system - ${project.basedir}/../lib/DmJdbcDriver8.jar + runtime diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java index 42a72d3..c2167c9 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java @@ -42,7 +42,7 @@ import java.util.Map; * @Date: 2019-01-02 * @Version:V1.0 */ -@RestController +//@RestController @RequestMapping("/sys/quartzJob") @Slf4j @Tag(name = "定时任务接口") diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java index 958eaec..43e257c 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -23,7 +23,7 @@ import java.util.List; * @Version: V1.1 */ @Slf4j -@Service +//@Service public class QuartzJobServiceImpl extends ServiceImpl implements IQuartzJobService { /** * 立即执行的任务分组 diff --git a/jeecg-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java b/jeecg-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java index 1b9426d..cfec52e 100644 --- a/jeecg-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java +++ b/jeecg-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java @@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.oConvertUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cloud.openfeign.EnableFeignClients; @@ -22,7 +23,7 @@ import java.net.UnknownHostException; * @date: 2022/4/21 10:55 */ @Slf4j -@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"}) +@SpringBootApplication(scanBasePackages = {"com.renkang", "org.jeecg"},exclude = QuartzAutoConfiguration.class) @EnableFeignClients(basePackages = {"org.jeecg", "com.renkang"}) @EnableScheduling public class JeecgSystemCloudApplication extends SpringBootServletInitializer { diff --git a/lib/DmJdbcDriver8.jar b/lib/DmJdbcDriver8.jar deleted file mode 100644 index 0b3b4fd..0000000 Binary files a/lib/DmJdbcDriver8.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 4737eb1..a9f455b 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 21.13.0.0 12.6.1.jre8 - 8.1.0 + 8.1.4.181 42.6.2 @@ -643,6 +643,12 @@ knife4j-openapi3-spring-boot-starter ${knife4j-spring-boot-starter.version} + + + com.dameng + DmJdbcDriver8 + ${dm8.version} + @@ -696,7 +702,7 @@ src/main/resources true - .env + rebel.xml