diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index aed2e0f..58808a9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -112,6 +112,14 @@ public abstract class AbstractTask { this.setTask(task.getConfig_code(), taskDto); list.add(taskDto); JSONObject result = AcsUtil.notifyAcs("api/wms/task", list); + try { + Integer.parseInt(result.getString("status")); + } catch (Exception e) { + // 消息通知 + noticeService.createNotice("失败原因:" + result.getString("message"), "任务下发失败", + NoticeTypeEnum.EXCEPTION.getCode()); + continue; + } if (HttpStatus.OK.value() == result.getInteger("status")) { for (SchBaseTask schBaseTask : taskList) { schBaseTask.setTask_status(TaskStatus.ISSUED.getCode()); diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 0cdd6e6..7d8ac25 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -19,7 +19,7 @@ spring: enabledBanner: false # 是否启用 控制台banner,默认true enabledCollect: true # 是否开启监控指标采集,默认true collectorTypes: logging # 监控数据采集器类型(logging | micrometer | internal_logging),默认micrometer - logPath: d:\log\lms # 监控日志数据路径,默认 ${user.home}/logs,采集类型非logging不用配置 + logPath: c:\log\wms # 监控日志数据路径,默认 ${user.home}/logs,采集类型非logging不用配置 monitorInterval: 8 tomcatTp: # tomcat webserver 线程池配置 threadPoolAliasName: tomcat 线程池 # 线程池别名,可选 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml b/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml deleted file mode 100644 index c805802..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - ${LOG_HOME}/XgAgvDeviceDriver/${DEVICECODE}/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 2GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - ${log.charset} - - - - - - - - - - - diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 7d7d41c..23db562 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -38,7 +38,7 @@ https://juejin.cn/post/6844903775631572999 15 - 100MB + 150MB 50GB @@ -57,88 +57,101 @@ https://juejin.cn/post/6844903775631572999 - + + + + + + + + + + + + + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/lms/nladmin-ui/src/views/system/notice/index.vue b/lms/nladmin-ui/src/views/system/notice/index.vue index 5090a96..53174c7 100644 --- a/lms/nladmin-ui/src/views/system/notice/index.vue +++ b/lms/nladmin-ui/src/views/system/notice/index.vue @@ -20,6 +20,15 @@ @keyup.enter.native="crud.toQuery" /> + + +