Merge branch 'dev' of git@192.168.10.125:nms/nmsserver.git into dev

src/com/nms/server/thread/change/ChangePluginScriptFile.java

@@ -138,11 +138,9 @@ public class ChangePluginScriptFile implements Runnable {
 					}
 				}
 			}
-			
 			for (String ip : ncNodesIpStrSet) {
 				Common.runChangeRunnable(new SendPluginScriptFile(ip, sendRecordList.get(ip)));
 			}
-			
 			// 延时清理脚本
 			new Thread(new DeletePluginScriptDirAfterSending()).start();
 
@@ -408,7 +406,7 @@ public class ChangePluginScriptFile implements Runnable {
 					String ips = Common.getIpSeqIdMap().get(recvIpSet.iterator().next())+"";
 					changeService.saveEventRecordLibrary(SEND_PLUGIN_SCRIPT_FILE, ips,
 							"S2C", JSONObject.fromObject(recordContent).toString());
-
+					task.new DeletePluginScriptDirAfterSending().run();
 				} catch (SQLException e) {
 					logger.error(e.getMessage(), e);
 				} finally {
@@ -519,6 +517,7 @@ public class ChangePluginScriptFile implements Runnable {
 					e.printStackTrace();
 				}
 			}
+			logger.debug("删除临时目录" + pluginScriptDir.getAbsolutePath());
 			FileUtils.deleteAllFiles(pluginScriptDir, true);
 		}
 	}
@@ -533,6 +532,7 @@ public class ChangePluginScriptFile implements Runnable {
 		File tempPluginDir = new File(Constants.PLUGIN_SCRIPT_FILE_DIR, System.currentTimeMillis()+"");
 		if (!tempPluginDir.exists()) {
 			tempPluginDir.mkdirs();
+			logger.debug("创建临时目录" + tempPluginDir.getAbsolutePath());
 		}
 		return tempPluginDir;
 	}