修改了thrift生成的远程通信代码和org.cronhub.managesystem.commons.thrift.process.RemoteExecutCmdProcessor类,加入了如下逻辑:

防止远程执行了一半的时候网络闪断,将UUID生成的唯一标识码放入远端，再通过http post汇报给这里的Params.REPORT_UNDO_IDENTIFIER_ID的Map，最后出异常时从这个Map取出undo_report_id，删去

Author: machanic

.classpath

@@ -89,10 +89,10 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cron4j-2.2.4.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mybatis-3.1.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mybatis-spring-1.0.3-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/libthrift-0.7.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-1.5.8.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-log4j12-1.5.8.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ant.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/DispatchSystemDaemon.jar" sourcepath="/DispatchSystemExecutor"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/DispatchSystemDaemon.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/libthrift-0.8.0.jar"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

WebRoot/WEB-INF/classes/192.168.101.9.properties

@@ -1,7 +1,7 @@
 #db config
-db.jdbcurl=jdbc:mysql://localhost/cronhub_manage_system?useUnicode=true&characterEncoding=UTF-8
-db.username=root
-db.password=root
+db.jdbcurl=jdbc:mysql://192.168.101.9/cronhub_manage_system?useUnicode=true&characterEncoding=UTF-8
+db.username=admin
+db.password=123456
 #undo report url,modify this to your daemon can access's server ip
 undoReportHttpUrl=http\://192.168.101.54\:8080/record_undo/report.action
 updateShellName=update_start.sh

WebRoot/WEB-INF/classes/192.168.50.185.properties

@@ -13,7 +13,7 @@
 	<!-- properties filename -->
 	<property name="configDir" value="../config"/>
 	<property name="warDir" value="../war"/>
-	<property name="version" value="DispatchManageSystem_101.9"/>
+	<property name="version" value="CronhubManageSystem_101.9"/>
 	<property name="tempRootPath" value="${warDir}/new"/>
 	<property name="warFilePath" value="${warDir}/${version}.war"/>
 	<property name="webRootDir" value="../WebRoot"/>

WebRoot/WEB-INF/classes/60.28.110.228.properties

@@ -1,45 +1,45 @@
 log4j.rootLogger=info, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] %p\t| %m%n
+log4j.appender.stdout.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %p	| %m%n
 
 log4j.logger.Validate=info, validate
 log4j.appender.validate=org.apache.log4j.DailyRollingFileAppender  
-log4j.appender.validate.File=D:/WorkSpace/Dispatch WorkSpace/DispatchManageSystem/logs/service.log
+log4j.appender.validate.File=/opt/modules/dispatch_system_tomcat/logs/dispatch_sys/service.log
 log4j.appender.validate.DatePattern='.'yyyy-MM-dd'.bak'
 log4j.appender.validate.layout=org.apache.log4j.PatternLayout
-log4j.appender.validate.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] %p\t| %m%n
+log4j.appender.validate.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %p	| %m%n
 
 log4j.logger.Error=error, err
 log4j.appender.err=org.apache.log4j.DailyRollingFileAppender  
-log4j.appender.err.File=D:/WorkSpace/Dispatch WorkSpace/DispatchManageSystem/logs/error.log
+log4j.appender.err.File=/opt/modules/dispatch_system_tomcat/logs/dispatch_sys/error.log
 log4j.appender.err.DatePattern='.'yyyy-MM-dd'.bak'
 log4j.appender.err.layout=org.apache.log4j.PatternLayout
-log4j.appender.err.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] %p\t| %m%n
+log4j.appender.err.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %p	| %m%n
 
 log4j.logger.DaemonError=error, daemonError
 log4j.appender.daemonError=org.apache.log4j.DailyRollingFileAppender  
-log4j.appender.daemonError.File=D:/WorkSpace/Dispatch WorkSpace/DispatchManageSystem/logs/daemonError.log
+log4j.appender.daemonError.File=/opt/modules/dispatch_system_tomcat/logs/dispatch_sys/daemonError.log
 log4j.appender.daemonError.DatePattern='.'yyyy-MM-dd'.bak'
 log4j.appender.daemonError.layout=org.apache.log4j.PatternLayout
-log4j.appender.daemonError.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] %p\t| %m%n
+log4j.appender.daemonError.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %p	| %m%n
 
 log4j.logger.RecordUndoLogger=info, recordUndoLogger
 log4j.appender.recordUndoLogger=org.apache.log4j.DailyRollingFileAppender  
-log4j.appender.recordUndoLogger.File=D:/WorkSpace/Dispatch WorkSpace/DispatchManageSystem/logs/recordUndoLogger.log
+log4j.appender.recordUndoLogger.File=/opt/modules/dispatch_system_tomcat/logs/dispatch_sys/recordUndoLogger.log
 log4j.appender.recordUndoLogger.DatePattern='.'yyyy-MM-dd'.bak'
 log4j.appender.recordUndoLogger.layout=org.apache.log4j.PatternLayout
-log4j.appender.recordUndoLogger.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] %p\t| %m%n
+log4j.appender.recordUndoLogger.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %p	| %m%n
 
 log4j.logger.RecordDoneLogger=info, recordDoneLogger
 log4j.appender.recordDoneLogger=org.apache.log4j.DailyRollingFileAppender  
-log4j.appender.recordDoneLogger.File=D:/WorkSpace/Dispatch WorkSpace/DispatchManageSystem/logs/recordDoneLogger.log
+log4j.appender.recordDoneLogger.File=/opt/modules/dispatch_system_tomcat/logs/dispatch_sys/recordDoneLogger.log
 log4j.appender.recordDoneLogger.DatePattern='.'yyyy-MM-dd'.bak'
 log4j.appender.recordDoneLogger.layout=org.apache.log4j.PatternLayout
-log4j.appender.recordDoneLogger.layout.ConversionPattern=[%d{yyyy-MM-dd HH\:mm\:ss}] %p\t| %m%n
+log4j.appender.recordDoneLogger.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %p	| %m%n
 
 log4j.logger.RecordDoneError=info, recordDoneError
 log4j.appender.recordDoneError=org.apache.log4j.DailyRollingFileAppender  
-log4j.appender.recordDoneError.File=D:/WorkSpace/Dispatch WorkSpace/DispatchManageSystem/logs/recordDoneError.log
+log4j.appender.recordDoneError.File=/opt/modules/dispatch_system_tomcat/logs/dispatch_sys/recordDoneError.log
 log4j.appender.recordDoneError.DatePattern='.'yyyy-MM-dd'.bak'
 log4j.appender.recordDoneError.layout=org.apache.log4j.PatternLayout

WebRoot/WEB-INF/classes/60.28.230.91.properties

@@ -13,7 +13,7 @@
 	<!-- properties filename -->
 	<property name="configDir" value="../config"/>
 	<property name="warDir" value="../war"/>
-	<property name="version" value="DispatchManageSystem_101.9"/>
+	<property name="version" value="CronhubManageSystem_101.9"/>
 	<property name="tempRootPath" value="${warDir}/new"/>
 	<property name="warFilePath" value="${warDir}/${version}.war"/>
 	<property name="webRootDir" value="../WebRoot"/>

WebRoot/WEB-INF/classes/application.properties

@@ -1,7 +1,7 @@
 #db config
-db.jdbcurl=jdbc:mysql://localhost/cronhub_manage_system?useUnicode=true&characterEncoding=UTF-8
-db.username=root
-db.password=root
+db.jdbcurl=jdbc:mysql://192.168.101.9/cronhub_manage_system?useUnicode=true&characterEncoding=UTF-8
+db.username=admin
+db.password=123456
 #undo report url,modify this to your daemon can access's server ip
 undoReportHttpUrl=http\://192.168.101.54\:8080/record_undo/report.action
 updateShellName=update_start.sh

WebRoot/WEB-INF/classes/build.xml

@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class Params {
 	public static final String TABLE_DAEMON = "daemon";
@@ -45,6 +46,6 @@ public class Params {
 		EXECTYPE_REPRESENT.put(EXECTYPE_BTNREDO, "button_redo");
 		EXECTYPE_REPRESENT.put(EXECTYPE_AUTOREDO, "auto_redo");
 		EXECTYPE_REPRESENT.put(EXECTYPE_SPOT, "on_spot_execute");
-		
 	}
+	public static final ConcurrentHashMap<String, Long> REPORT_UNDO_IDENTIFIER_ID = new ConcurrentHashMap<String, Long>();
 }