diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 1f94597c..b2dee039 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -22,7 +22,6 @@ public interface IoOrderService { IoOrderEntity findByBillNo(String billNO); - List findByStatus(String action, Integer status); int insertOrder(IoOrderEntity orderEntity); diff --git a/src/main/java/com/glxp/api/task/CleanLogTask.java b/src/main/java/com/glxp/api/task/CleanLogTask.java index 68d5eb57..e547b6e9 100644 --- a/src/main/java/com/glxp/api/task/CleanLogTask.java +++ b/src/main/java/com/glxp/api/task/CleanLogTask.java @@ -64,6 +64,9 @@ public class CleanLogTask implements SchedulingConfigurer { ScheduledRequest scheduledRequest = new ScheduledRequest(); scheduledRequest.setCronName("clean_log_task"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); + if (scheduledEntity == null) { + return null; + } String cron = scheduledEntity.getCron(); if (StrUtil.isBlank(cron)) { log.error("清理日志定时任务参数未配置"); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4da96933..eb401e13 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 20