diff --git a/scripter/deploy_all.sh b/scripter/deploy_all.sh index 82f08ca..855c953 100755 --- a/scripter/deploy_all.sh +++ b/scripter/deploy_all.sh @@ -2,7 +2,7 @@ echo "cpy app.out large_space_disinfection" ssh root@192.168.8.10 "systemctl stop zapp" scp out/large_space_disinfection/app.out root@192.168.8.10:/app/ -ssh root@192.168.8.10 "systemctl restart zapp" + echo "" echo "" @@ -10,7 +10,7 @@ echo "" echo "cpy app.out small_space_disinfection" ssh root@192.168.8.11 "systemctl stop zapp" scp out/small_space_disinfection/app.out root@192.168.8.11:/app/ -ssh root@192.168.8.11 "systemctl restart zapp" + echo "" echo "" @@ -18,7 +18,7 @@ echo "" echo "cpy app.out pipe_disinfection" ssh root@192.168.8.12 "systemctl stop zapp" scp out/pipe_disinfection/app.out root@192.168.8.12:/app/ -ssh root@192.168.8.12 "systemctl restart zapp" + echo "" echo "" @@ -26,6 +26,22 @@ echo "" echo "cpy app.out draw_bar_box_disinfection" ssh root@192.168.8.13 "systemctl stop zapp" scp out/draw_bar_box_disinfection/app.out root@192.168.8.13:/app/ -ssh root@192.168.8.13 "systemctl restart zapp" + echo "" echo "" + +ssh root@192.168.8.10 "rm /app/*.db" +ssh root@192.168.8.11 "rm /app/*.db" +ssh root@192.168.8.12 "rm /app/*.db" +ssh root@192.168.8.13 "rm /app/*.db" + +ssh root@192.168.8.10 "rm -rf /app/disinfection_logs" +ssh root@192.168.8.11 "rm -rf /app/disinfection_logs" +ssh root@192.168.8.12 "rm -rf /app/disinfection_logs" +ssh root@192.168.8.13 "rm -rf /app/disinfection_logs" + + +ssh root@192.168.8.10 "systemctl restart zapp" +ssh root@192.168.8.11 "systemctl restart zapp" +ssh root@192.168.8.12 "systemctl restart zapp" +ssh root@192.168.8.13 "systemctl restart zapp" \ No newline at end of file diff --git a/src/service/disfection_ctl/disinfection_service.cpp b/src/service/disfection_ctl/disinfection_service.cpp index f8ea3ba..3338b1d 100644 --- a/src/service/disfection_ctl/disinfection_service.cpp +++ b/src/service/disfection_ctl/disinfection_service.cpp @@ -154,7 +154,7 @@ void DisinfectionService::__dumpDisinfectionLogsToCSV(bool header) { if (header) { content += fmt::format("{},", ZIconv::noChange("时间")); } else { - content += fmt::format("{}", getTime()); + content += fmt::format("{},", getTime()); } #if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) diff --git a/src/version.hpp b/src/version.hpp index 147c293..b938f84 100644 --- a/src/version.hpp +++ b/src/version.hpp @@ -1,2 +1,2 @@ #pragma once -#define VERSION "6.5" \ No newline at end of file +#define VERSION "6.6" \ No newline at end of file