Merge branch 'fix/cluster' into 'develop'

修复集群应用掉线判断.

See merge request o2oa/o2oa!754

o2server/x_base_core_project/src/main/java/com/x/base/core/project/Application.java

@@ -30,7 +30,7 @@ public class Application extends GsonPropertyObject {
 	private List<ScheduleLocalRequest> scheduleLocalRequestList = new ArrayList<>();
 
 	public Application() {
-
+		// nothing
 	}
 
 	public List<ScheduleRequest> getScheduleRequestList() {

o2server/x_console/src/main/java/com/x/server/console/node/VoteCenterEvent.java

@@ -36,16 +36,15 @@ public class VoteCenterEvent implements Event {
 							|| (!Objects.equals(Config.resource_node_centersPirmaryPort(), entry.getValue().getPort()))
 							|| (!Objects.equals(Config.resource_node_centersPirmarySslEnable(),
 									entry.getValue().getSslEnable()))) {
-						logger.print("pirmary center set as:{}, in {}.", entry.getKey(), this.nodes(list));
+						logger.warn("pirmary center set as: {}, in {}.", entry.getKey(), this.nodes(list));
 						Config.resource_node_centersPirmaryNode(entry.getKey());
 						Config.resource_node_centersPirmaryPort(entry.getValue().getPort());
 						Config.resource_node_centersPirmarySslEnable(entry.getValue().getSslEnable());
 					}
 					return;
 				}
-
 			} catch (Exception e) {
-				logger.print("failed to connect pirmary center:{} port:{} sslEnable:{}.", entry.getKey(),
+				logger.warn("failed to connect center: {}, port: {}, sslEnable: {}.", entry.getKey(),
 						entry.getValue().getPort(), entry.getValue().getSslEnable());
 			}
 		}

o2server/x_program_center/src/main/java/com/x/program/center/CenterQueue.java

@@ -63,11 +63,13 @@ public class CenterQueue extends AbstractQueue<CenterQueueBody> {
 		for (Entry<String, CopyOnWriteArrayList<Application>> en : applications.entrySet()) {
 			List<Application> removeApplications = new ArrayList<>();
 			for (Application application : en.getValue()) {
-				if ((now.getTime() - application.getReportDate().getTime()) > REFRESHAPPLICATIONSINTERVAL * 3 * 1000) {
+				if ((now.getTime() - application.getReportDate().getTime()) > REFRESHAPPLICATIONSINTERVAL * 1000
+						+ 10000) {
 					removeApplications.add(application);
+					logger.warn("application dropped, node: {}, application: {}.", application.getNode(), en.getKey());
 				}
 			}
-			modify = modify || en.getValue().removeAll(removeApplications);
+			modify = en.getValue().removeAll(removeApplications) || modify;
 			if (en.getValue().isEmpty()) {
 				removeEntries.add(en.getKey());
 			}