modify the jsp

cat-core/src/main/resources/META-INF/plexus/components.xml

@@ -111,6 +111,18 @@
 				</requirement>
 			</requirements>
 		</component>
+		<component>
+			<role>com.dianping.cat.config.black.BlackListManager</role>
+			<implementation>com.dianping.cat.config.black.BlackListManager</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.core.config.ConfigDao</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.config.content.ContentFetcher</role>
+				</requirement>
+			</requirements>
+		</component>
 		<component>
 			<role>com.dianping.cat.config.app.AppComparisonConfigManager</role>
 			<implementation>com.dianping.cat.config.app.AppComparisonConfigManager</implementation>

cat-home/src/main/resources/META-INF/plexus/components.xml

@@ -3267,12 +3267,36 @@
 				<requirement>
 					<role>com.dianping.cat.statistic.ServerStatisticManager</role>
 				</requirement>
+				<requirement>
+					<role>com.dianping.cat.config.black.BlackListManager</role>
+				</requirement>
 			</requirements>
 		</component>
 		<component>
 			<role>com.dianping.cat.statistic.ServerStatisticManager</role>
 			<implementation>com.dianping.cat.statistic.ServerStatisticManager</implementation>
 		</component>
+		<component>
+			<role>com.dianping.cat.config.black.BlackListManager</role>
+			<implementation>com.dianping.cat.config.black.BlackListManager</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.core.config.ConfigDao</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.config.content.ContentFetcher</role>
+				</requirement>
+			</requirements>
+		</component>
+		<component>
+			<role>com.dianping.cat.core.config.ConfigDao</role>
+			<implementation>com.dianping.cat.core.config.ConfigDao</implementation>
+			<requirements>
+				<requirement>
+					<role>org.unidal.dal.jdbc.QueryEngine</role>
+				</requirement>
+			</requirements>
+		</component>
 		<component>
 			<role>com.dianping.cat.report.page.problem.Handler</role>
 			<implementation>com.dianping.cat.report.page.problem.Handler</implementation>
@@ -3360,15 +3384,6 @@
 				</requirement>
 			</requirements>
 		</component>
-		<component>
-			<role>com.dianping.cat.core.config.ConfigDao</role>
-			<implementation>com.dianping.cat.core.config.ConfigDao</implementation>
-			<requirements>
-				<requirement>
-					<role>org.unidal.dal.jdbc.QueryEngine</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>com.dianping.cat.report.page.PayloadNormalizer</role>
 			<implementation>com.dianping.cat.report.page.PayloadNormalizer</implementation>
@@ -5303,18 +5318,6 @@
 				</requirement>
 			</requirements>
 		</component>
-		<component>
-			<role>com.dianping.cat.config.black.BlackListManager</role>
-			<implementation>com.dianping.cat.config.black.BlackListManager</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.core.config.ConfigDao</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.config.content.ContentFetcher</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>com.dianping.cat.system.page.config.processor.ThirdPartyConfigProcessor</role>
 			<implementation>com.dianping.cat.system.page.config.processor.ThirdPartyConfigProcessor</implementation>

cat-home/src/main/webapp/jsp/system/black/blackConfigUpdate.jsp

@@ -12,7 +12,7 @@
 	<res:useJs value="${res.js.local['alarm_js']}" target="head-js" />
 	<res:useCss value="${res.css.local['select2.css']}" target="head-css" />
 	<res:useJs value="${res.js.local['select2.min.js']}" target="head-js" />
-
+			<h4 class="text-center text-danger">设定客户端黑名单，符合domain和ip的消息会直接被丢弃</h4>
 			<form name="blackConfigUpdate" id="form" method="post"
 				action="${model.pageUri}?op=blackConfigUpdate">
 				<table class="table table-striped table-condensed   table-hover">