Merge branch 'cherry-pick-b01058a8' into 'release'

Merge branch 'fix/list0922' into 'develop'

See merge request o2oa/o2oa!1670

o2server/x_console/src/main/java/com/x/server/console/NodeAgent.java

@@ -621,11 +621,11 @@ public class NodeAgent extends Thread {
 	private void customJar(String simpleName, byte[] bytes, boolean rebootApp) throws Exception {
 		File jar = new File(Config.dir_custom_jars(true), simpleName + ".jar");
 		FileUtils.writeByteArrayToFile(jar, bytes, false);
-		/*if (rebootApp) {
+		if (rebootApp) {
 			Servers.stopApplicationServer();
 			Thread.sleep(3000);
 			Servers.startApplicationServer();
-		}*/
+		}
 	}
 
 	private void customZip(String simpleName, byte[] bytes, boolean rebootApp) throws Exception {

o2server/x_program_center/src/main/webapp/jest/list.html

@@ -102,7 +102,10 @@ appMap.set("zoneland.unicom.bj.assemble.control.zoneland_unicom_bj_assemble_cont
 	    xhrFields : {
 		'withCredentials' : true
 	    },
-	    crossDomain : true
+	    crossDomain : true,
+		error : function(e){
+			$('#contentTable').hide();
+		}
 	}).done(function(json) {
 	    debugger;
 	    if (json.type == 'success') {
@@ -130,7 +133,7 @@ appMap.set("zoneland.unicom.bj.assemble.control.zoneland_unicom_bj_assemble_cont
 		    str += '</table>';
 		    $('#content').html(str);
 		}
-
+			$('#contentTable').show();
 	    }
 	});
     });
@@ -160,14 +163,14 @@ entityMap.set("x_teamwork_core_entity", "团队");
 $(function() {
 	   $.getJSON('../describe/table/tableList.json?rd=' + Math.random(), function(json) {
 				var str = '<center id="title" style="font-size:32px; font-weight:bold;">O2OA Table structure URL</center>	<table border="1">';
-				
+
 				for(var key in json){
-					str += '<tr>'; 
+					str += '<tr>';
 					if(typeof(entityMap.get(key)) == "undefined"){
 					   str += '<td>' + '</td>';
 					  }else{
 						str += '<td>' + entityMap.get(key) + '</td>';
-					  }			  
+					  }
 					str += '<td>' + key + '</td>';
 					str += '<td>';
 					var url = "./listTableDetail.html?param="+ json[key]