diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java index 9317cb1..951c0a7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java @@ -167,14 +167,12 @@ while (true) { boolean register = registerAndStartSerial(); if (register) { - System.out.println("0000000"); restartMap.remove(deviceIp); break; } else { try { //若没连上,一小时内,每隔3分钟通过控制门禁板,让设备重启 if (null == restartMap.get(deviceIp)) { - logger.info("1111111111111"); restartMap.put(deviceIp, System.currentTimeMillis()); } else { Long startTime = restartMap.get(deviceIp); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java index 9317cb1..951c0a7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java @@ -167,14 +167,12 @@ while (true) { boolean register = registerAndStartSerial(); if (register) { - System.out.println("0000000"); restartMap.remove(deviceIp); break; } else { try { //若没连上,一小时内,每隔3分钟通过控制门禁板,让设备重启 if (null == restartMap.get(deviceIp)) { - logger.info("1111111111111"); restartMap.put(deviceIp, System.currentTimeMillis()); } else { Long startTime = restartMap.get(deviceIp); diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 04b186a..3ce6523 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -56,4 +56,8 @@ level.root: info level.com.casic: info path: d:\logs/ - file: missiles.log \ No newline at end of file + file: missiles.log + logging: + config: + classpath: logback-spring.xml + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java index 9317cb1..951c0a7 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java @@ -167,14 +167,12 @@ while (true) { boolean register = registerAndStartSerial(); if (register) { - System.out.println("0000000"); restartMap.remove(deviceIp); break; } else { try { //若没连上,一小时内,每隔3分钟通过控制门禁板,让设备重启 if (null == restartMap.get(deviceIp)) { - logger.info("1111111111111"); restartMap.put(deviceIp, System.currentTimeMillis()); } else { Long startTime = restartMap.get(deviceIp); diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 04b186a..3ce6523 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -56,4 +56,8 @@ level.root: info level.com.casic: info path: d:\logs/ - file: missiles.log \ No newline at end of file + file: missiles.log + logging: + config: + classpath: logback-spring.xml + diff --git a/casic-web/src/main/resources/logback-spring.xml b/casic-web/src/main/resources/logback-spring.xml index cf30f38..437701d 100644 --- a/casic-web/src/main/resources/logback-spring.xml +++ b/casic-web/src/main/resources/logback-spring.xml @@ -36,12 +36,12 @@ - /casic/logs/missiles.log + /casic/logs/pan.log - /casic/logs/missiles.%d{yyyy-MM-dd}.log.gz - + /casic/logs/pan.%d{yyyy-MM-dd}.log.gz + 60