diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index 28d40a91e1..ae554f6fa7 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -122,8 +122,7 @@ public final class DruidStatService implements DruidStatServiceMBean { } if (url.startsWith("/wall.json")) { - Object result = statManagerFacade.getWallStatMap(null); - return returnJSONResult(RESULT_CODE_SUCCESS, result); + return returnJSONResult(RESULT_CODE_SUCCESS, getWallStatMap(parameters)); } if (url.startsWith("/wall-") && url.indexOf(".json") > 0) { @@ -276,7 +275,14 @@ public final class DruidStatService implements DruidStatServiceMBean { dataSourceId = Integer.parseInt(dataSourceIdParam); } - return statManagerFacade.getWallStatMap(dataSourceId); + Map result = statManagerFacade.getWallStatMap(dataSourceId); + List> sortedArray = comparatorOrderBy((List>)result.get("tables"), parameters); + result.put("tables", sortedArray); + + sortedArray = comparatorOrderBy((List>)result.get("functions"), parameters); + result.put("functions", sortedArray); + + return result; } private String getSqlStat(Integer id) { diff --git a/src/main/resources/support/http/resources/img/logo.jpg b/src/main/resources/support/http/resources/img/logo.jpg deleted file mode 100644 index fe2d4e9dbc..0000000000 Binary files a/src/main/resources/support/http/resources/img/logo.jpg and /dev/null differ diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js index adf3f56473..08e69d098e 100644 --- a/src/main/resources/support/http/resources/js/common.js +++ b/src/main/resources/support/http/resources/js/common.js @@ -42,8 +42,7 @@ druid.common = function () { buildFooter : function() { var html = ''; $(document.body).append(html); diff --git a/src/main/resources/support/http/resources/wall.html b/src/main/resources/support/http/resources/wall.html index 557f0acdcf..39a7d4ac4d 100644 --- a/src/main/resources/support/http/resources/wall.html +++ b/src/main/resources/support/http/resources/wall.html @@ -59,23 +59,23 @@ - +
- - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -83,8 +83,8 @@
Table NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountDeleteDataCountUpdateDataCountFetchRowCountTable NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountDeleteDataCountUpdateDataCountFetchRowCount
- - + + @@ -94,69 +94,72 @@
Function NameInvokeCountFunction NameInvokeCount