From 30ea5dfeaf7f382e664775f0c977f39c1e8158fc Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Wed, 14 Nov 2018 13:18:19 +0800
Subject: [PATCH] =?UTF-8?q?ddos=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F=E5=88=97=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=20ddos=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9title=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=20=E6=9D=A5=E5=87=BD=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E6=9D=A5=E5=87=BD=E7=9A=84=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=20=E6=8E=92=E5=BA=8F=E5=8E=BB=E6=8E=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=B1=9E=E6=80=A7=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=20=E9=99=90=E9=80=9F=E7=94=B10.001-0.009=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA0.1-0.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20181113/update_rate_limit_dict_data.sql  | 10 +++++++
 .../webapp/WEB-INF/tags/sys/tableSort.tag     |  5 ++--
 .../WEB-INF/views/cfg/ddosIpCfgList.jsp       |  2 +-
 src/main/webapp/WEB-INF/views/index.jsp       | 30 +++++++++++++++----
 .../webapp/WEB-INF/views/log/ntc/ddosList.jsp |  2 +-
 5 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 src/main/resources/sql/20181113/update_rate_limit_dict_data.sql

diff --git a/src/main/resources/sql/20181113/update_rate_limit_dict_data.sql b/src/main/resources/sql/20181113/update_rate_limit_dict_data.sql
new file mode 100644
index 000000000..38d096c5a
--- /dev/null
+++ b/src/main/resources/sql/20181113/update_rate_limit_dict_data.sql
@@ -0,0 +1,10 @@
+delete from sys_data_dictionary_ITEM  where dictionary_id=117;
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2731, '0.1', '0.1', '', 1, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2732, '0.2', '0.2', '', 2, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2733, '0.3', '0.3', '', 3, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2734, '0.4', '0.4', '', 4, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2735, '0.5', '0.5', '', 5, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2736, '0.6', '0.6', '', 6, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2737, '0.7', '0.7', '', 7, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2738, '0.8', '0.8', '', 8, 1, 1, 117);
+INSERT INTO `sys_data_dictionary_ITEM`(`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES (2739, '0.9', '0.9', '', 9, 1, 1, 117);
diff --git a/src/main/webapp/WEB-INF/tags/sys/tableSort.tag b/src/main/webapp/WEB-INF/tags/sys/tableSort.tag
index e3245d1a2..908300897 100644
--- a/src/main/webapp/WEB-INF/tags/sys/tableSort.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/tableSort.tag
@@ -12,8 +12,9 @@
 		$(".sort-column").each(function(){
 
 			if ($(this).hasClass(orderBy[0])){
-				orderBy[1] = orderBy[1]&&orderBy[1].toUpperCase()=="DESC"?"down":"up";
-				$(this).html($(this).html()+" <i class=\"sort-icon-"+orderBy[1]+"\"></i>");
+				/* orderBy[1] = orderBy[1]&&orderBy[1].toUpperCase()=="DESC"?"down":"up";
+				$(this).html($(this).html()+" <i class=\"sort-icon-"+orderBy[1]+"\"></i>"); */
+				$(this).html($(this).html()+" <i class=\"sort-icon\"></i>");
 			}else {
 				$(this).html($(this).html()+" <i class=\"sort-icon\"></i>");
 			}
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index c9cff494f..e6bd842ee 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -406,6 +406,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
@@ -479,7 +480,6 @@
 										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
 										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index 4fd787036..a677ffd31 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -72,6 +72,29 @@
 	</style>
 	<script type="text/javascript">
 		$(function(){
+			var hideTd=new Array();
+			//如果来函统计数为0，去掉此列
+			$(".statisticsRequest").find("table th").each(function(i){
+				//第二列开始计算
+				if(i > 0){
+					var sum=0;
+					$(".statisticsRequest").find("table tr").each(function(j){
+						if(j>0){
+							sum=sum+parseInt($(this).find("td").eq(i).text());
+						}
+					});
+					if(sum < 1){
+						hideTd.push(i);
+					}
+				}
+			});
+			
+			for(var k = 0 ; k < hideTd.length; k++){
+				$(".statisticsRequest").find("table tr").each(function(h){
+					$(this).find("th").eq(hideTd[k]).hide();
+					$(this).find("td").eq(hideTd[k]).hide();
+				});
+			}
 			closeTip();
 		});
 	</script>
@@ -104,12 +127,7 @@
 							<c:forEach items="${page.list  }" var="requestStatistics" varStatus="statusRequest" step="1">
 								<tr>
 									<td>
-										<c:if test="${requestStatistics['request'] eq '0'}">
-											<spring:message code="default_request"/>
-										</c:if>
-										<c:if test="${requestStatistics['request'] ne '0'}">
-											${requestStatistics['request']}
-										</c:if>
+										${requestStatistics['request']}
 									</td>
 									<c:forEach items="${serviceList }" var="serviceDict" varStatus="status" step="1">
 										<td>${requestStatistics[serviceDict.serviceName]}</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 9c60730a7..5b56e3479 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -31,7 +31,7 @@ $(document).ready(function(){
 	<div class="theme-panel hidden-xs hidden-sm">
 	</div>
 	<h3 class="page-title">
-		<spring:message code="protected_ddos"/>
+		<spring:message code="target_ip_protect"/>
 <%-- 		<c:if test="${log.isBlock eq 0 }"><spring:message code="usual_ddos"/></c:if> --%>
 	</h3>