diff --git a/o2server/x_console/src/main/java/com/x/server/console/NodeAgent.java b/o2server/x_console/src/main/java/com/x/server/console/NodeAgent.java index aa69332c42daeae5cd3172d3229887207f23411b..ba2e37466177c0163dda831098dce36c74a409ce 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/NodeAgent.java +++ b/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 { diff --git a/o2server/x_program_center/src/main/webapp/jest/list.html b/o2server/x_program_center/src/main/webapp/jest/list.html index 2dd3e880ce83435ce8e84e91461016d94da9e16b..b7302adc76ce388f7e6ad1e4d3890c1f0d030647 100644 --- a/o2server/x_program_center/src/main/webapp/jest/list.html +++ b/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 += ''; $('#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 = '
O2OA Table structure URL
'; - + for(var key in json){ - str += ''; + str += ''; if(typeof(entityMap.get(key)) == "undefined"){ str += ''; }else{ str += ''; - } + } str += ''; str += '
' + '' + entityMap.get(key) + '' + key + ''; var url = "./listTableDetail.html?param="+ json[key]