diff --git a/shkj-admin/src/main/resources/application-yun.yml b/shkj-admin/src/main/resources/application-yun.yml index 901ba0d..0ce7b83 100644 --- a/shkj-admin/src/main/resources/application-yun.yml +++ b/shkj-admin/src/main/resources/application-yun.yml @@ -71,7 +71,7 @@ spring: # 数据库索引 database: 3 # 密码 - password: + password: rvGUoUFAIg4nESp9 # 连接超时时间 timeout: 10s lettuce: diff --git a/shkj-admin/src/main/resources/application.yml b/shkj-admin/src/main/resources/application.yml index 95449e3..39c840e 100644 --- a/shkj-admin/src/main/resources/application.yml +++ b/shkj-admin/src/main/resources/application.yml @@ -45,7 +45,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: test + active: yun # 文件上传 servlet: multipart: diff --git a/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java b/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java index d657f99..615a13d 100644 --- a/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java +++ b/shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java @@ -210,6 +210,7 @@ public class PlcEventTask { String address = property.getAddress(); businPlcException = new BusinPlcException(); if (pointType.equals("99")) { + log.info("地址:"+address+" 报警内容:"+devpName); if (pointMap.containsKey(address) && Boolean.valueOf((pointMap.get(address).toString()))) { businPlcException.setPlcPoint(address); businPlcException.setExecMsg(MessageUtils.message(devpName));