Просмотр исходного кода

Merge branch 'feature/denialOfService' into 'release'

Feature/denial of service

See merge request o2oa/o2oa!1664
o2null 5 лет назад
Родитель
Сommit
c7f8e0b09f

+ 1 - 3
o2server/x_console/src/main/java/com/x/server/console/server/application/ApplicationServerTools.java

@@ -186,9 +186,7 @@ public class ApplicationServerTools extends JettySeverTools {
 					}
 					if (BooleanUtils.isFalse(applicationServer.getExposeJest())) {
 						FilterHolder denialOfServiceFilterHolder = new FilterHolder(new DenialOfServiceFilter());
-						webApp.addFilter(denialOfServiceFilterHolder, "/jest/index.html",
-								EnumSet.of(DispatcherType.REQUEST));
-						webApp.addFilter(denialOfServiceFilterHolder, "/jest/list.html",
+						webApp.addFilter(denialOfServiceFilterHolder, "/jest/*",
 								EnumSet.of(DispatcherType.REQUEST));
 					}
 					handlers.addHandler(webApp);

+ 1 - 2
o2server/x_console/src/main/java/com/x/server/console/server/center/CenterServerTools.java

@@ -75,8 +75,7 @@ public class CenterServerTools extends JettySeverTools {
 			}
 			if (BooleanUtils.isFalse(centerServer.getExposeJest())) {
 				FilterHolder denialOfServiceFilterHolder = new FilterHolder(new DenialOfServiceFilter());
-				webApp.addFilter(denialOfServiceFilterHolder, "/jest/index.html", EnumSet.of(DispatcherType.REQUEST));
-				webApp.addFilter(denialOfServiceFilterHolder, "/jest/list.html", EnumSet.of(DispatcherType.REQUEST));
+				webApp.addFilter(denialOfServiceFilterHolder, "/jest/*", EnumSet.of(DispatcherType.REQUEST));
 			}
 			handlers.addHandler(webApp);
 		} else {

+ 2 - 184
o2server/x_program_center/src/main/webapp/index.html

@@ -3,189 +3,7 @@
 <head>
 <meta charset="UTF-8" />
 <meta http-equiv="pragma" content="no-cache" />
-<script src="./jest/jquery.min.js"></script>
-<script src="./jest/common.js"></script>
-<style type="text/css">
-	<!--
-	body {
-		font-family: Arial, Helvetica, sans-serif;
-		font-size:12px;
-		color:#666666;
-		background:#fff;
-		text-align:left;
-	}
-	a {
-		color:#1E7ACE;
-		text-decoration:none; 
-	}
-	a:hover {
-		color:#000;
-		text-decoration:underline;
-	}
-	h3 {
-		font-size:14px;
-		font-weight:bold;
-	}
-	
-	pre,p {
-		color:#1E7ACE;
-		margin:4px;
-	}
-	
-	table { 
-		border-collapse: collapse;
-		margin: 0 auto;
-		text-align: left;
-	}
-	 
-	table td, table th {
-		border: 1px solid #cad9ea;
-		color: #666;
-		height: 30px;
-		padding-left:20px;
-		padding-right:60px;
-	}
-	 
-	table thead th {
-		background-color: #CCE8EB;
-		width: 100px;
-	}
-	 
-	table tr:nth-child(odd) {
-		background: #fff;
-	}
-	 
-	table tr:nth-child(even) {
-		background: #F5FAFA;
-	}
-	
-	-->
-</style>
-<script>
-var appMap = new Map();
-appMap.set("com.x.base.core.project.x_program_center", "中心服务");
-appMap.set("com.x.base.core.project.x_attendance_assemble_control", "考勤相关服务");
-appMap.set("com.x.base.core.project.x_bbs_assemble_control", "论坛相关服务");
-appMap.set("com.x.base.core.project.x_calendar_assemble_control", "日程管理相关服务");
-appMap.set("com.x.base.core.project.x_cms_assemble_control", "内容管理平台相关服务");
-appMap.set("com.x.base.core.project.x_component_assemble_control","组件管理");
-appMap.set("com.x.base.core.project.x_file_assemble_control", "云文件相关服务");
-appMap.set("com.x.base.core.project.x_general_assemble_control", "常用功能");
-appMap.set("com.x.base.core.project.x_hotpic_assemble_control", "热点信息相关服务");
-appMap.set("com.x.base.core.project.x_meeting_assemble_control", "会议管理相关服务");
-appMap.set("com.x.base.core.project.x_message_assemble_communicate", "消息通信相关服务");
-appMap.set("com.x.base.core.project.x_mind_assemble_control", "脑图模块相关服务");
-appMap.set("com.x.base.core.project.x_okr_assemble_control", "执行力相关服务");
-appMap.set("com.x.base.core.project.x_organization_assemble_authentication", "组织认证服务");
-appMap.set("com.x.base.core.project.x_organization_assemble_control", "组织管理接口");
-appMap.set("com.x.base.core.project.x_organization_assemble_express", "组织查询接口");
-appMap.set("com.x.base.core.project.x_organization_assemble_personal", "个人设置相关服务");
-appMap.set("com.x.base.core.project.x_portal_assemble_designer", "门户使用接口");
-appMap.set("com.x.base.core.project.x_portal_assemble_surface", "门户手机服务");
-appMap.set("com.x.base.core.project.x_processplatform_assemble_bam", "流程平台统计服务");
-appMap.set("com.x.base.core.project.x_processplatform_assemble_designer", "流程元素设计");
-appMap.set("com.x.base.core.project.x_processplatform_assemble_surface", "流程数据操作");
-appMap.set("com.x.base.core.project.x_processplatform_service_processing", "流程过程服务");
-appMap.set("com.x.base.core.project.x_query_assemble_designer", "数据平台元素设计");
-appMap.set("com.x.base.core.project.x_query_assemble_surface", "数据平台查询");
-appMap.set("com.x.base.core.project.x_query_service_processing", "数据平台全文检索");
-appMap.set("com.x.base.core.project.x_teamwork_assemble_control", "团队");
-appMap.set("com.x.wcrm.assemble.control.x_wcrm_assemble_control", "WCRM管理");
-appMap.set("com.x.base.core.project.x_jpush_assemble_control", "极光推送");
-appMap.set("zoneland.unicom.bj.assemble.control.zoneland_unicom_bj_assemble_control", "北京联通单点");
-    $(function() {
-	$.ajax({
-	    type : 'get',
-	    dataType : 'json',
-	    contentType : 'application/json; charset=utf-8',
-	    url : './jaxrs/jest/list',
-	    xhrFields : {
-		'withCredentials' : true
-	    },
-	    crossDomain : true
-	}).done(function(json) {
-	    debugger;
-	    if (json.type == 'success') {
-		if (json.data) {
-		    var str = '<table border="1">';
-		    $.each(json.data, function(index, o) {
-			str += '<tr>';  
-			debugger;
-             if(typeof(appMap.get(o.name)) == "undefined"){
-			   str += '<td>' + '</td>';
-              }else{
-				str += '<td>' + appMap.get(o.name) + '</td>';
-              }			  
-			str += '<td>' + o.name + '</td>';
-			str += '<td>';
-			$.each(o.urlList, function(i, url) {
-			    url = url.replace(/(127.0.0.1)/g, window.location.hostname);
-			    str += '<a href="'+url+'" target="_blank">' + url + '</a><br/>';
-			});
-			str += '</td>';
-			str += '</tr>';
-		    });
-			
-			str += '<tr><td>中心服务</td><td>com.x.base.core.project.x_program_center</td><td><a href="http://'+window.location.hostname+':20030/x_program_center/jest/index.html" target="_blank">http://'+window.location.hostname+':20030/x_program_center/jest/index.html</a><br></td></tr>';
-		    str += '</table>';
-		    $('#content').html(str);
-		}
-
-	    }
-	});
-    });
-</script>
-
-<script>
-var entityMap = new Map();
-entityMap.set("x_attendance_core_entity", "考勤相关");
-entityMap.set("x_bbs_core_entity", "论坛相关");
-entityMap.set("x_calendar_core_entity", "日程管理相关");
-entityMap.set("x_cms_core_entity", "内容管理相关");
-entityMap.set("x_component_core_entity", "组件管理相关");
-entityMap.set("x_file_core_entity", "云文件相关");
-entityMap.set("x_general_core_entity","常用功能相关");
-entityMap.set("x_hotpic_core_entity", "热点信息相关");
-entityMap.set("x_jpush_core_entity", "极光推送");
-entityMap.set("x_meeting_core_entity", "会议管理相关");
-entityMap.set("x_message_core_entity", "消息通信相关");
-entityMap.set("x_mind_core_entity", "脑图模块相关");
-entityMap.set("x_okr_core_entity", "执行力相关");
-entityMap.set("x_organization_core_entity", "组织管理相关");
-entityMap.set("x_portal_core_entity", "门户");
-entityMap.set("x_processplatform_core_entity", "流程平台");
-entityMap.set("x_program_center_core_entity", "中心服务");
-entityMap.set("x_query_core_entity", "数据平台全文检索");
-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>'; 
-					if(typeof(entityMap.get(key)) == "undefined"){
-					   str += '<td>' + '</td>';
-					  }else{
-						str += '<td>' + entityMap.get(key) + '</td>';
-					  }			  
-					str += '<td>' + key + '</td>';
-					str += '<td>';
-					var url = "./jest/listTableDetail.html?param="+ json[key]
-				    str += '<a href="'+url+'" target="_blank">' + json[key] + '</a><br/>'; ;
-					str += '</td>';
-					str += '</tr>';
-                }
-
-				str += '</table>';
-				$('#contentTable').html(str);
-			});
-  });
-</script>
+<meta http-equiv="refresh" content="0;URL='/x_program_center/jest/list.html'" /> 
 </head>
-
-<body style="font-size: 12px; font-family: Microsoft Yahei; margin: 0px">
-	<center id="title" style="font-size:32px; font-weight:bold;">O2OA Service API URL</center>	
-	<div id="content" style="margin-top:10px;margin-left: 50px;float: left;">&nbsp;</div>
-	<div id="contentTable" style="margin-top:20px;margin-left: 50px;float: left;">&nbsp;</div>
-</body>
+<body></body>
 </html>

+ 49 - 3
o2server/x_program_center/src/main/webapp/jest/list.html

@@ -93,7 +93,6 @@ appMap.set("com.x.base.core.project.x_teamwork_assemble_control", "团队");
 appMap.set("com.x.wcrm.assemble.control.x_wcrm_assemble_control", "WCRM管理");
 appMap.set("com.x.base.core.project.x_jpush_assemble_control", "极光推送");
 appMap.set("zoneland.unicom.bj.assemble.control.zoneland_unicom_bj_assemble_control", "北京联通单点");
-
     $(function() {
 	$.ajax({
 	    type : 'get',
@@ -136,10 +135,57 @@ appMap.set("zoneland.unicom.bj.assemble.control.zoneland_unicom_bj_assemble_cont
 	});
     });
 </script>
+
+<script>
+var entityMap = new Map();
+entityMap.set("x_attendance_core_entity", "考勤相关");
+entityMap.set("x_bbs_core_entity", "论坛相关");
+entityMap.set("x_calendar_core_entity", "日程管理相关");
+entityMap.set("x_cms_core_entity", "内容管理相关");
+entityMap.set("x_component_core_entity", "组件管理相关");
+entityMap.set("x_file_core_entity", "云文件相关");
+entityMap.set("x_general_core_entity","常用功能相关");
+entityMap.set("x_hotpic_core_entity", "热点信息相关");
+entityMap.set("x_jpush_core_entity", "极光推送");
+entityMap.set("x_meeting_core_entity", "会议管理相关");
+entityMap.set("x_message_core_entity", "消息通信相关");
+entityMap.set("x_mind_core_entity", "脑图模块相关");
+entityMap.set("x_okr_core_entity", "执行力相关");
+entityMap.set("x_organization_core_entity", "组织管理相关");
+entityMap.set("x_portal_core_entity", "门户");
+entityMap.set("x_processplatform_core_entity", "流程平台");
+entityMap.set("x_program_center_core_entity", "中心服务");
+entityMap.set("x_query_core_entity", "数据平台全文检索");
+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>'; 
+					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]
+				    str += '<a href="'+url+'" target="_blank">' + json[key] + '</a><br/>'; ;
+					str += '</td>';
+					str += '</tr>';
+                }
+
+				str += '</table>';
+				$('#contentTable').html(str);
+			});
+  });
+</script>
 </head>
 
 <body style="font-size: 12px; font-family: Microsoft Yahei; margin: 0px">
-	<center id="title" style="font-size:32px; font-weight:bold">O2OA Service API URL</center>	
-	<div id="content" style="margin-top:10px">&nbsp;</div>
+	<center id="title" style="font-size:32px; font-weight:bold;">O2OA Service API URL</center>	
+	<div id="content" style="margin-top:10px;margin-left: 50px;float: left;">&nbsp;</div>
+	<div id="contentTable" style="margin-top:20px;margin-left: 50px;float: left;">&nbsp;</div>
 </body>
 </html>