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()+" "); + /* orderBy[1] = orderBy[1]&&orderBy[1].toUpperCase()=="DESC"?"down":"up"; + $(this).html($(this).html()+" "); */ + $(this).html($(this).html()+" "); }else { $(this).html($(this).html()+" "); } 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 @@ +
@@ -479,7 +480,6 @@ -
${cfg.creatorName } ${cfg.editorName } 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 @@ @@ -104,12 +127,7 @@ - - - - - ${requestStatistics['request']} - + ${requestStatistics['request']} ${requestStatistics[serviceDict.serviceName]} 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(){

- + <%-- --%>