From b324154a51f75138655a165e7817e65e0fc001ba Mon Sep 17 00:00:00 2001 From: melin Date: Sat, 6 Apr 2013 15:32:20 +0800 Subject: [PATCH 1/6] delete logo.jpg --- .../support/http/resources/img/logo.jpg | Bin 6123 -> 0 bytes .../support/http/resources/js/common.js | 355 +++++++++--------- 2 files changed, 177 insertions(+), 178 deletions(-) delete mode 100644 src/main/resources/support/http/resources/img/logo.jpg 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 fe2d4e9dbc38de8803d70b7c22b1d0c64d124d95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6123 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 diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js index adf3f56473..b2b1567c9b 100644 --- a/src/main/resources/support/http/resources/js/common.js +++ b/src/main/resources/support/http/resources/js/common.js @@ -1,178 +1,177 @@ -$.namespace("druid.common"); -druid.common = function () { - var statViewOrderBy = ''; - var statViewOrderBy_old = ''; - var statViewOrderType = 'asc'; - - // only one page for now - var sqlViewPage = 1; - var sqlViewPerPageCount = 1000000; - - return { - init : function() { - this.buildFooter(); - }, - - buildHead : function(index) { - var html = ''; - $(document.body).prepend(html); - $(".navbar .nav li").eq(index).addClass("active"); - }, - - buildFooter : function() { - var html = ''; - $(document.body).append(html); - }, - - ajaxRequestForReset : function() { - if(!confirm("Are you sure to reset all stat? It'll clear all stat data !")){ - return; - } - - $.ajax({ - type: 'POST', - url: "reset-all.json", - success: function(data) { - if (data.ResultCode == 1) { - alert("already reset all stat"); - } - }, - dataType: "json" - }); - }, - - getAjaxUrl : function(uri) { - var result = uri; - - if (statViewOrderBy != undefined) - result += 'orderBy=' + statViewOrderBy + '&'; - - if (statViewOrderType != undefined) - result += 'orderType=' + statViewOrderType + '&'; - - if (sqlViewPage != undefined) - result += 'page=' + sqlViewPage + '&'; - - if (sqlViewPerPageCount != undefined) - result += 'perPageCount=' + sqlViewPerPageCount + '&'; - - return result; - }, - - resetSortMark : function() { - var divObj = document.getElementById('th-' + statViewOrderBy); - var old_divObj = document.getElementById('th-' + statViewOrderBy_old); - var replaceToStr = ''; - if (old_divObj) { - var html = old_divObj.innerHTML; - if (statViewOrderBy_old.indexOf('[') > 0) - replaceToStr = '-'; - html = html.replace('▲', replaceToStr); - html = html.replace('▼', replaceToStr); - old_divObj.innerHTML = html - } - if (divObj) { - var html = divObj.innerHTML; - if (statViewOrderBy.indexOf('[') > 0) - html = ''; - - if (statViewOrderType == 'asc') { - html += '▲'; - } else if (statViewOrderType == 'desc') { - html += '▼'; - } - divObj.innerHTML = html; - } - - this.ajaxRequestForBasicInfo(); - }, - - setOrderBy : function(orderBy) { - if (statViewOrderBy != orderBy) { - statViewOrderBy_old = statViewOrderBy; - statViewOrderBy = orderBy; - statViewOrderType = 'desc'; - druid.common.resetSortMark(); - return; - } - - statViewOrderBy_old = statViewOrderBy; - - if (statViewOrderType == 'asc') - statViewOrderType = 'desc' - else - statViewOrderType = 'asc'; - - druid.common.resetSortMark(); - }, - - ajaxuri : "", - handleAjaxResult : null, - ajaxRequestForBasicInfo : function() { - $.ajax({ - type: 'POST', - url: druid.common.getAjaxUrl(druid.common.ajaxuri), - success: function(data) { - druid.common.handleAjaxResult(data); - }, - dataType: "json" - }); - }, - - subSqlString : function(sql, len) { - if (sql == undefined || sql == null) { - return ''; - } - - if (sql.length <= len) - return sql; - return sql.substr(0, len) + '...'; - }, - - stripes : function() { - $("#dataTable tbody tr").each(function () { - $(this).removeClass("striped"); - }); - $("#dataTable tbody tr:even").each(function () { - $(this).addClass("striped"); - }); - }, - - getUrlVar : function(name) { - var vars = {}; - var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { - vars[key] = value; - }); - return vars[name]; - } - } -}(); - -$(document).ready(function() { - druid.common.init(); -}); +$.namespace("druid.common"); +druid.common = function () { + var statViewOrderBy = ''; + var statViewOrderBy_old = ''; + var statViewOrderType = 'asc'; + + // only one page for now + var sqlViewPage = 1; + var sqlViewPerPageCount = 1000000; + + return { + init : function() { + this.buildFooter(); + }, + + buildHead : function(index) { + var html = ''; + $(document.body).prepend(html); + $(".navbar .nav li").eq(index).addClass("active"); + }, + + buildFooter : function() { + var html = ''; + $(document.body).append(html); + }, + + ajaxRequestForReset : function() { + if(!confirm("Are you sure to reset all stat? It'll clear all stat data !")){ + return; + } + + $.ajax({ + type: 'POST', + url: "reset-all.json", + success: function(data) { + if (data.ResultCode == 1) { + alert("already reset all stat"); + } + }, + dataType: "json" + }); + }, + + getAjaxUrl : function(uri) { + var result = uri; + + if (statViewOrderBy != undefined) + result += 'orderBy=' + statViewOrderBy + '&'; + + if (statViewOrderType != undefined) + result += 'orderType=' + statViewOrderType + '&'; + + if (sqlViewPage != undefined) + result += 'page=' + sqlViewPage + '&'; + + if (sqlViewPerPageCount != undefined) + result += 'perPageCount=' + sqlViewPerPageCount + '&'; + + return result; + }, + + resetSortMark : function() { + var divObj = document.getElementById('th-' + statViewOrderBy); + var old_divObj = document.getElementById('th-' + statViewOrderBy_old); + var replaceToStr = ''; + if (old_divObj) { + var html = old_divObj.innerHTML; + if (statViewOrderBy_old.indexOf('[') > 0) + replaceToStr = '-'; + html = html.replace('▲', replaceToStr); + html = html.replace('▼', replaceToStr); + old_divObj.innerHTML = html + } + if (divObj) { + var html = divObj.innerHTML; + if (statViewOrderBy.indexOf('[') > 0) + html = ''; + + if (statViewOrderType == 'asc') { + html += '▲'; + } else if (statViewOrderType == 'desc') { + html += '▼'; + } + divObj.innerHTML = html; + } + + this.ajaxRequestForBasicInfo(); + }, + + setOrderBy : function(orderBy) { + if (statViewOrderBy != orderBy) { + statViewOrderBy_old = statViewOrderBy; + statViewOrderBy = orderBy; + statViewOrderType = 'desc'; + druid.common.resetSortMark(); + return; + } + + statViewOrderBy_old = statViewOrderBy; + + if (statViewOrderType == 'asc') + statViewOrderType = 'desc' + else + statViewOrderType = 'asc'; + + druid.common.resetSortMark(); + }, + + ajaxuri : "", + handleAjaxResult : null, + ajaxRequestForBasicInfo : function() { + $.ajax({ + type: 'POST', + url: druid.common.getAjaxUrl(druid.common.ajaxuri), + success: function(data) { + druid.common.handleAjaxResult(data); + }, + dataType: "json" + }); + }, + + subSqlString : function(sql, len) { + if (sql == undefined || sql == null) { + return ''; + } + + if (sql.length <= len) + return sql; + return sql.substr(0, len) + '...'; + }, + + stripes : function() { + $("#dataTable tbody tr").each(function () { + $(this).removeClass("striped"); + }); + $("#dataTable tbody tr:even").each(function () { + $(this).addClass("striped"); + }); + }, + + getUrlVar : function(name) { + var vars = {}; + var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { + vars[key] = value; + }); + return vars[name]; + } + } +}(); + +$(document).ready(function() { + druid.common.init(); +}); From eb78871f0bb47c5dadd4975877806a19bc881048 Mon Sep 17 00:00:00 2001 From: melin Date: Sat, 6 Apr 2013 15:36:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?wall.html=E5=A2=9E=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/druid/stat/DruidStatService.java | 764 +++++++++--------- .../support/http/resources/wall.html | 131 +-- 2 files changed, 452 insertions(+), 443 deletions(-) diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index 28d40a91e1..e8ac57e4fd 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -1,379 +1,385 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.stat; - -import java.lang.management.ManagementFactory; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.support.http.stat.WebAppStatManager; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.support.spring.stat.SpringStatManager; -import com.alibaba.druid.util.MapComparator; -import com.alibaba.druid.util.StringUtils; - -/** - * 注意:避免直接调用Druid相关对象例如DruidDataSource等,相关调用要到DruidStatManagerFacade里用反射实现 - * - * @author sandzhang - */ -public final class DruidStatService implements DruidStatServiceMBean { - - private final static Log LOG = LogFactory.getLog(DruidStatService.class); - - public final static String MBEAN_NAME = "com.alibaba.druid:type=DruidStatService"; - - private final static DruidStatService instance = new DruidStatService(); - - private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); - - public final static int RESULT_CODE_SUCCESS = 1; - public final static int RESULT_CODE_ERROR = -1; - - private final static int DEFAULT_PAGE = 1; - private final static int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; - private static final String DEFAULT_ORDER_TYPE = "asc"; - private static final String DEFAULT_ORDERBY = "SQL"; - - private DruidStatService(){ - } - - public static DruidStatService getInstance() { - return instance; - } - - public boolean isResetEnable() { - return statManagerFacade.isResetEnable(); - } - - public void setResetEnable(boolean value) { - statManagerFacade.setResetEnable(value); - } - - public String service(String url) { - - Map parameters = getParameters(url); - - if (url.equals("/basic.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.returnJSONBasicStat()); - } - - if (url.equals("/reset-all.json")) { - statManagerFacade.resetAll(); - - return returnJSONResult(RESULT_CODE_SUCCESS, null); - } - - if (url.equals("/datasource.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getDataSourceStatDataList()); - } - - if (url.equals("/activeConnectionStackTrace.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getActiveConnStackTraceList()); - } - - if (url.startsWith("/datasource-")) { - Integer id = StringUtils.subStringToInteger(url, "datasource-", "."); - Object result = statManagerFacade.getDataSourceStatData(id); - return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); - } - - if (url.startsWith("/connectionInfo-") && url.endsWith(".json")) { - Integer id = StringUtils.subStringToInteger(url, "connectionInfo-", "."); - List connectionInfoList = statManagerFacade.getPoolingConnectionInfoByDataSourceId(id); - return returnJSONResult(connectionInfoList == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, - connectionInfoList); - } - - if (url.startsWith("/activeConnectionStackTrace-") && url.endsWith(".json")) { - Integer id = StringUtils.subStringToInteger(url, "activeConnectionStackTrace-", "."); - return returnJSONActiveConnectionStackTrace(id); - } - - if (url.startsWith("/sql.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getSqlStatDataList(parameters)); - } - - if (url.startsWith("/wall.json")) { - Object result = statManagerFacade.getWallStatMap(null); - return returnJSONResult(RESULT_CODE_SUCCESS, result); - } - - if (url.startsWith("/wall-") && url.indexOf(".json") > 0) { - Integer dataSourceId = StringUtils.subStringToInteger(url, "wall-", ".json"); - Object result = statManagerFacade.getWallStatMap(dataSourceId); - return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); - } - - if (url.startsWith("/sql-") && url.indexOf(".json") > 0) { - Integer id = StringUtils.subStringToInteger(url, "sql-", ".json"); - return getSqlStat(id); - } - - if (url.startsWith("/weburi.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatDataList(parameters)); - } - - if (url.startsWith("/weburi-") && url.indexOf(".json") > 0) { - String uri = StringUtils.subString(url, "weburi-", ".json"); - return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatData(uri)); - } - - if (url.startsWith("/webapp.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getWebAppStatDataList(parameters)); - } - - if (url.startsWith("/websession.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatDataList(parameters)); - } - - if (url.startsWith("/websession-") && url.indexOf(".json") > 0) { - String id = StringUtils.subString(url, "websession-", ".json"); - return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatData(id)); - } - - if (url.startsWith("/spring.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getSpringStatDataList(parameters)); - } - - if (url.startsWith("/spring-detail.json")) { - String clazz = parameters.get("class"); - String method = parameters.get("method"); - return returnJSONResult(RESULT_CODE_SUCCESS, getSpringMethodStatData(clazz, method)); - } - - return returnJSONResult(RESULT_CODE_ERROR, "Do not support this request, please contact with administrator."); - } - - private List> getSpringStatDataList(Map parameters) { - List> array = SpringStatManager.getInstance().getMethodStatData(); - return comparatorOrderBy(array, parameters); - } - - private List> getWebURIStatDataList(Map parameters) { - List> array = WebAppStatManager.getInstance().getURIStatData(); - return comparatorOrderBy(array, parameters); - } - - private Map getWebURIStatData(String uri) { - return WebAppStatManager.getInstance().getURIStatData(uri); - } - - private Map getWebSessionStatData(String sessionId) { - return WebAppStatManager.getInstance().getSessionStat(sessionId); - } - - private Map getSpringMethodStatData(String clazz, String method) { - return SpringStatManager.getInstance().getMethodStatData(clazz, method); - } - - private List> getWebSessionStatDataList(Map parameters) { - List> array = WebAppStatManager.getInstance().getSessionStatData(); - return comparatorOrderBy(array, parameters); - } - - private List> getWebAppStatDataList(Map parameters) { - List> array = WebAppStatManager.getInstance().getWebAppStatData(); - return comparatorOrderBy(array, parameters); - } - - private List> comparatorOrderBy(List> array, Map parameters) { - // when open the stat page before executing some sql - if (array == null || array.isEmpty()) { - return null; - } - - // when parameters is null - String orderBy, orderType = null; - Integer page = DEFAULT_PAGE; - Integer perPageCount = DEFAULT_PER_PAGE_COUNT; - if (parameters == null) { - orderBy = DEFAULT_ORDER_TYPE; - orderType = DEFAULT_ORDER_TYPE; - page = DEFAULT_PAGE; - perPageCount = DEFAULT_PER_PAGE_COUNT; - } else { - orderBy = parameters.get("orderBy"); - orderType = parameters.get("orderType"); - String pageParam = parameters.get("page"); - if (pageParam != null && pageParam.length() != 0) { - page = Integer.parseInt(pageParam); - } - String pageCountParam = parameters.get("perPageCount"); - if (pageCountParam != null && pageCountParam.length() > 0) { - perPageCount = Integer.parseInt(pageCountParam); - } - } - - // others,such as order - orderBy = orderBy == null ? DEFAULT_ORDERBY : orderBy; - orderType = orderType == null ? DEFAULT_ORDER_TYPE : orderType; - - if (!"desc".equals(orderType)) { - orderType = DEFAULT_ORDER_TYPE; - } - - // orderby the statData array - if (orderBy != null && orderBy.trim().length() != 0) { - Collections.sort(array, new MapComparator(orderBy, DEFAULT_ORDER_TYPE.equals(orderType))); - } - - // page - int fromIndex = (page - 1) * perPageCount; - int toIndex = page * perPageCount; - if (toIndex > array.size()) { - toIndex = array.size(); - } - - return array.subList(fromIndex, toIndex); - } - - private List> getSqlStatDataList(Map parameters) { - Integer dataSourceId = null; - - String dataSourceIdParam = parameters.get("dataSourceId"); - if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { - dataSourceId = Integer.parseInt(dataSourceIdParam); - } - - List> array = statManagerFacade.getSqlStatDataList(dataSourceId); - List> sortedArray = comparatorOrderBy(array, parameters); - return sortedArray; - } - - public Map getWallStatMap(Map parameters) { - Integer dataSourceId = null; - - String dataSourceIdParam = parameters.get("dataSourceId"); - if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { - dataSourceId = Integer.parseInt(dataSourceIdParam); - } - - return statManagerFacade.getWallStatMap(dataSourceId); - } - - private String getSqlStat(Integer id) { - Map map = statManagerFacade.getSqlStatData(id); - - if (map == null) { - return returnJSONResult(RESULT_CODE_ERROR, null); - } - - String dbType = (String) map.get("DbType"); - String sql = (String) map.get("SQL"); - - map.put("formattedSql", SQLUtils.format(sql, dbType)); - List statementList = SQLUtils.parseStatements(sql, dbType); - - if (!statementList.isEmpty()) { - SQLStatement statemen = statementList.get(0); - SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(statementList, dbType); - statemen.accept(visitor); - map.put("parsedTable", visitor.getTables().toString()); - map.put("parsedFields", visitor.getColumns().toString()); - map.put("parsedConditions", visitor.getConditions().toString()); - map.put("parsedRelationships", visitor.getRelationships().toString()); - map.put("parsedOrderbycolumns", visitor.getOrderByColumns().toString()); - } - - DateFormat format = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS"); - Date maxTimespanOccurTime = (Date) map.get("MaxTimespanOccurTime"); - if (maxTimespanOccurTime != null) { - map.put("MaxTimespanOccurTime", format.format(maxTimespanOccurTime)); - } - - return returnJSONResult(map == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, map); - } - - private String returnJSONActiveConnectionStackTrace(Integer id) { - List result = statManagerFacade.getActiveConnectionStackTraceByDataSourceId(id); - - if (result == null) { - return returnJSONResult(RESULT_CODE_ERROR, "require set removeAbandoned=true"); - } - return returnJSONResult(RESULT_CODE_SUCCESS, result); - } - - public static String returnJSONResult(int resultCode, Object content) { - Map dataMap = new LinkedHashMap(); - dataMap.put("ResultCode", resultCode); - dataMap.put("Content", content); - return JSONUtils.toJSONString(dataMap); - } - - public static void registerMBean() { - MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - try { - - ObjectName objectName = new ObjectName(MBEAN_NAME); - if (!mbeanServer.isRegistered(objectName)) { - mbeanServer.registerMBean(instance, objectName); - } - } catch (JMException ex) { - LOG.error("register mbean error", ex); - } - } - - public static void unregisterMBean() { - MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - - try { - mbeanServer.unregisterMBean(new ObjectName(MBEAN_NAME)); - } catch (JMException ex) { - LOG.error("unregister mbean error", ex); - } - } - - public static Map getParameters(String url) { - if (url == null || (url = url.trim()).length() == 0) { - return Collections. emptyMap(); - } - - String parametersStr = StringUtils.subString(url, "?", null); - if (parametersStr == null || parametersStr.length() == 0) { - return Collections. emptyMap(); - } - - String[] parametersArray = parametersStr.split("&"); - Map parameters = new LinkedHashMap(); - - for (String parameterStr : parametersArray) { - int index = parameterStr.indexOf("="); - if (index <= 0) { - continue; - } - - String name = parameterStr.substring(0, index); - String value = parameterStr.substring(index + 1); - parameters.put(name, value); - } - return parameters; - } -} +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.stat; + +import java.lang.management.ManagementFactory; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.support.http.stat.WebAppStatManager; +import com.alibaba.druid.support.json.JSONUtils; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.support.spring.stat.SpringStatManager; +import com.alibaba.druid.util.MapComparator; +import com.alibaba.druid.util.StringUtils; + +/** + * 注意:避免直接调用Druid相关对象例如DruidDataSource等,相关调用要到DruidStatManagerFacade里用反射实现 + * + * @author sandzhang + */ +public final class DruidStatService implements DruidStatServiceMBean { + + private final static Log LOG = LogFactory.getLog(DruidStatService.class); + + public final static String MBEAN_NAME = "com.alibaba.druid:type=DruidStatService"; + + private final static DruidStatService instance = new DruidStatService(); + + private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); + + public final static int RESULT_CODE_SUCCESS = 1; + public final static int RESULT_CODE_ERROR = -1; + + private final static int DEFAULT_PAGE = 1; + private final static int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; + private static final String DEFAULT_ORDER_TYPE = "asc"; + private static final String DEFAULT_ORDERBY = "SQL"; + + private DruidStatService(){ + } + + public static DruidStatService getInstance() { + return instance; + } + + public boolean isResetEnable() { + return statManagerFacade.isResetEnable(); + } + + public void setResetEnable(boolean value) { + statManagerFacade.setResetEnable(value); + } + + public String service(String url) { + + Map parameters = getParameters(url); + + if (url.equals("/basic.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.returnJSONBasicStat()); + } + + if (url.equals("/reset-all.json")) { + statManagerFacade.resetAll(); + + return returnJSONResult(RESULT_CODE_SUCCESS, null); + } + + if (url.equals("/datasource.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getDataSourceStatDataList()); + } + + if (url.equals("/activeConnectionStackTrace.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getActiveConnStackTraceList()); + } + + if (url.startsWith("/datasource-")) { + Integer id = StringUtils.subStringToInteger(url, "datasource-", "."); + Object result = statManagerFacade.getDataSourceStatData(id); + return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); + } + + if (url.startsWith("/connectionInfo-") && url.endsWith(".json")) { + Integer id = StringUtils.subStringToInteger(url, "connectionInfo-", "."); + List connectionInfoList = statManagerFacade.getPoolingConnectionInfoByDataSourceId(id); + return returnJSONResult(connectionInfoList == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, + connectionInfoList); + } + + if (url.startsWith("/activeConnectionStackTrace-") && url.endsWith(".json")) { + Integer id = StringUtils.subStringToInteger(url, "activeConnectionStackTrace-", "."); + return returnJSONActiveConnectionStackTrace(id); + } + + if (url.startsWith("/sql.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getSqlStatDataList(parameters)); + } + + if (url.startsWith("/wall.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getWallStatMap(parameters)); + } + + if (url.startsWith("/wall-") && url.indexOf(".json") > 0) { + Integer dataSourceId = StringUtils.subStringToInteger(url, "wall-", ".json"); + Object result = statManagerFacade.getWallStatMap(dataSourceId); + return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); + } + + if (url.startsWith("/sql-") && url.indexOf(".json") > 0) { + Integer id = StringUtils.subStringToInteger(url, "sql-", ".json"); + return getSqlStat(id); + } + + if (url.startsWith("/weburi.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatDataList(parameters)); + } + + if (url.startsWith("/weburi-") && url.indexOf(".json") > 0) { + String uri = StringUtils.subString(url, "weburi-", ".json"); + return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatData(uri)); + } + + if (url.startsWith("/webapp.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getWebAppStatDataList(parameters)); + } + + if (url.startsWith("/websession.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatDataList(parameters)); + } + + if (url.startsWith("/websession-") && url.indexOf(".json") > 0) { + String id = StringUtils.subString(url, "websession-", ".json"); + return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatData(id)); + } + + if (url.startsWith("/spring.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getSpringStatDataList(parameters)); + } + + if (url.startsWith("/spring-detail.json")) { + String clazz = parameters.get("class"); + String method = parameters.get("method"); + return returnJSONResult(RESULT_CODE_SUCCESS, getSpringMethodStatData(clazz, method)); + } + + return returnJSONResult(RESULT_CODE_ERROR, "Do not support this request, please contact with administrator."); + } + + private List> getSpringStatDataList(Map parameters) { + List> array = SpringStatManager.getInstance().getMethodStatData(); + return comparatorOrderBy(array, parameters); + } + + private List> getWebURIStatDataList(Map parameters) { + List> array = WebAppStatManager.getInstance().getURIStatData(); + return comparatorOrderBy(array, parameters); + } + + private Map getWebURIStatData(String uri) { + return WebAppStatManager.getInstance().getURIStatData(uri); + } + + private Map getWebSessionStatData(String sessionId) { + return WebAppStatManager.getInstance().getSessionStat(sessionId); + } + + private Map getSpringMethodStatData(String clazz, String method) { + return SpringStatManager.getInstance().getMethodStatData(clazz, method); + } + + private List> getWebSessionStatDataList(Map parameters) { + List> array = WebAppStatManager.getInstance().getSessionStatData(); + return comparatorOrderBy(array, parameters); + } + + private List> getWebAppStatDataList(Map parameters) { + List> array = WebAppStatManager.getInstance().getWebAppStatData(); + return comparatorOrderBy(array, parameters); + } + + private List> comparatorOrderBy(List> array, Map parameters) { + // when open the stat page before executing some sql + if (array == null || array.isEmpty()) { + return null; + } + + // when parameters is null + String orderBy, orderType = null; + Integer page = DEFAULT_PAGE; + Integer perPageCount = DEFAULT_PER_PAGE_COUNT; + if (parameters == null) { + orderBy = DEFAULT_ORDER_TYPE; + orderType = DEFAULT_ORDER_TYPE; + page = DEFAULT_PAGE; + perPageCount = DEFAULT_PER_PAGE_COUNT; + } else { + orderBy = parameters.get("orderBy"); + orderType = parameters.get("orderType"); + String pageParam = parameters.get("page"); + if (pageParam != null && pageParam.length() != 0) { + page = Integer.parseInt(pageParam); + } + String pageCountParam = parameters.get("perPageCount"); + if (pageCountParam != null && pageCountParam.length() > 0) { + perPageCount = Integer.parseInt(pageCountParam); + } + } + + // others,such as order + orderBy = orderBy == null ? DEFAULT_ORDERBY : orderBy; + orderType = orderType == null ? DEFAULT_ORDER_TYPE : orderType; + + if (!"desc".equals(orderType)) { + orderType = DEFAULT_ORDER_TYPE; + } + + // orderby the statData array + if (orderBy != null && orderBy.trim().length() != 0) { + Collections.sort(array, new MapComparator(orderBy, DEFAULT_ORDER_TYPE.equals(orderType))); + } + + // page + int fromIndex = (page - 1) * perPageCount; + int toIndex = page * perPageCount; + if (toIndex > array.size()) { + toIndex = array.size(); + } + + return array.subList(fromIndex, toIndex); + } + + private List> getSqlStatDataList(Map parameters) { + Integer dataSourceId = null; + + String dataSourceIdParam = parameters.get("dataSourceId"); + if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { + dataSourceId = Integer.parseInt(dataSourceIdParam); + } + + List> array = statManagerFacade.getSqlStatDataList(dataSourceId); + List> sortedArray = comparatorOrderBy(array, parameters); + return sortedArray; + } + + public Map getWallStatMap(Map parameters) { + Integer dataSourceId = null; + + String dataSourceIdParam = parameters.get("dataSourceId"); + if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { + dataSourceId = Integer.parseInt(dataSourceIdParam); + } + + 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) { + Map map = statManagerFacade.getSqlStatData(id); + + if (map == null) { + return returnJSONResult(RESULT_CODE_ERROR, null); + } + + String dbType = (String) map.get("DbType"); + String sql = (String) map.get("SQL"); + + map.put("formattedSql", SQLUtils.format(sql, dbType)); + List statementList = SQLUtils.parseStatements(sql, dbType); + + if (!statementList.isEmpty()) { + SQLStatement statemen = statementList.get(0); + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(statementList, dbType); + statemen.accept(visitor); + map.put("parsedTable", visitor.getTables().toString()); + map.put("parsedFields", visitor.getColumns().toString()); + map.put("parsedConditions", visitor.getConditions().toString()); + map.put("parsedRelationships", visitor.getRelationships().toString()); + map.put("parsedOrderbycolumns", visitor.getOrderByColumns().toString()); + } + + DateFormat format = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS"); + Date maxTimespanOccurTime = (Date) map.get("MaxTimespanOccurTime"); + if (maxTimespanOccurTime != null) { + map.put("MaxTimespanOccurTime", format.format(maxTimespanOccurTime)); + } + + return returnJSONResult(map == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, map); + } + + private String returnJSONActiveConnectionStackTrace(Integer id) { + List result = statManagerFacade.getActiveConnectionStackTraceByDataSourceId(id); + + if (result == null) { + return returnJSONResult(RESULT_CODE_ERROR, "require set removeAbandoned=true"); + } + return returnJSONResult(RESULT_CODE_SUCCESS, result); + } + + public static String returnJSONResult(int resultCode, Object content) { + Map dataMap = new LinkedHashMap(); + dataMap.put("ResultCode", resultCode); + dataMap.put("Content", content); + return JSONUtils.toJSONString(dataMap); + } + + public static void registerMBean() { + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); + try { + + ObjectName objectName = new ObjectName(MBEAN_NAME); + if (!mbeanServer.isRegistered(objectName)) { + mbeanServer.registerMBean(instance, objectName); + } + } catch (JMException ex) { + LOG.error("register mbean error", ex); + } + } + + public static void unregisterMBean() { + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); + + try { + mbeanServer.unregisterMBean(new ObjectName(MBEAN_NAME)); + } catch (JMException ex) { + LOG.error("unregister mbean error", ex); + } + } + + public static Map getParameters(String url) { + if (url == null || (url = url.trim()).length() == 0) { + return Collections. emptyMap(); + } + + String parametersStr = StringUtils.subString(url, "?", null); + if (parametersStr == null || parametersStr.length() == 0) { + return Collections. emptyMap(); + } + + String[] parametersArray = parametersStr.split("&"); + Map parameters = new LinkedHashMap(); + + for (String parameterStr : parametersArray) { + int index = parameterStr.indexOf("="); + if (index <= 0) { + continue; + } + + String name = parameterStr.substring(0, index); + String value = parameterStr.substring(index + 1); + parameters.put(name, value); + } + return parameters; + } +} diff --git a/src/main/resources/support/http/resources/wall.html b/src/main/resources/support/http/resources/wall.html index eac8bd835f..e7d41f64a7 100644 --- a/src/main/resources/support/http/resources/wall.html +++ b/src/main/resources/support/http/resources/wall.html @@ -59,20 +59,20 @@ - +
- - - - - - - - - - - + + + + + + + + + + + @@ -80,8 +80,8 @@
Table NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountTable NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCount
- - + + @@ -91,66 +91,69 @@ From f72c7ddf8f6501862e962ffffe093e7a219ea334 Mon Sep 17 00:00:00 2001 From: melin Date: Sat, 6 Apr 2013 15:38:11 +0800 Subject: [PATCH 3/6] Revert "delete logo.jpg" This reverts commit b324154a51f75138655a165e7817e65e0fc001ba. --- .../support/http/resources/img/logo.jpg | Bin 0 -> 6123 bytes .../support/http/resources/js/common.js | 355 +++++++++--------- 2 files changed, 178 insertions(+), 177 deletions(-) create mode 100644 src/main/resources/support/http/resources/img/logo.jpg diff --git a/src/main/resources/support/http/resources/img/logo.jpg b/src/main/resources/support/http/resources/img/logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fe2d4e9dbc38de8803d70b7c22b1d0c64d124d95 GIT binary patch literal 6123 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js index b2b1567c9b..adf3f56473 100644 --- a/src/main/resources/support/http/resources/js/common.js +++ b/src/main/resources/support/http/resources/js/common.js @@ -1,177 +1,178 @@ -$.namespace("druid.common"); -druid.common = function () { - var statViewOrderBy = ''; - var statViewOrderBy_old = ''; - var statViewOrderType = 'asc'; - - // only one page for now - var sqlViewPage = 1; - var sqlViewPerPageCount = 1000000; - - return { - init : function() { - this.buildFooter(); - }, - - buildHead : function(index) { - var html = ''; - $(document.body).prepend(html); - $(".navbar .nav li").eq(index).addClass("active"); - }, - - buildFooter : function() { - var html = ''; - $(document.body).append(html); - }, - - ajaxRequestForReset : function() { - if(!confirm("Are you sure to reset all stat? It'll clear all stat data !")){ - return; - } - - $.ajax({ - type: 'POST', - url: "reset-all.json", - success: function(data) { - if (data.ResultCode == 1) { - alert("already reset all stat"); - } - }, - dataType: "json" - }); - }, - - getAjaxUrl : function(uri) { - var result = uri; - - if (statViewOrderBy != undefined) - result += 'orderBy=' + statViewOrderBy + '&'; - - if (statViewOrderType != undefined) - result += 'orderType=' + statViewOrderType + '&'; - - if (sqlViewPage != undefined) - result += 'page=' + sqlViewPage + '&'; - - if (sqlViewPerPageCount != undefined) - result += 'perPageCount=' + sqlViewPerPageCount + '&'; - - return result; - }, - - resetSortMark : function() { - var divObj = document.getElementById('th-' + statViewOrderBy); - var old_divObj = document.getElementById('th-' + statViewOrderBy_old); - var replaceToStr = ''; - if (old_divObj) { - var html = old_divObj.innerHTML; - if (statViewOrderBy_old.indexOf('[') > 0) - replaceToStr = '-'; - html = html.replace('▲', replaceToStr); - html = html.replace('▼', replaceToStr); - old_divObj.innerHTML = html - } - if (divObj) { - var html = divObj.innerHTML; - if (statViewOrderBy.indexOf('[') > 0) - html = ''; - - if (statViewOrderType == 'asc') { - html += '▲'; - } else if (statViewOrderType == 'desc') { - html += '▼'; - } - divObj.innerHTML = html; - } - - this.ajaxRequestForBasicInfo(); - }, - - setOrderBy : function(orderBy) { - if (statViewOrderBy != orderBy) { - statViewOrderBy_old = statViewOrderBy; - statViewOrderBy = orderBy; - statViewOrderType = 'desc'; - druid.common.resetSortMark(); - return; - } - - statViewOrderBy_old = statViewOrderBy; - - if (statViewOrderType == 'asc') - statViewOrderType = 'desc' - else - statViewOrderType = 'asc'; - - druid.common.resetSortMark(); - }, - - ajaxuri : "", - handleAjaxResult : null, - ajaxRequestForBasicInfo : function() { - $.ajax({ - type: 'POST', - url: druid.common.getAjaxUrl(druid.common.ajaxuri), - success: function(data) { - druid.common.handleAjaxResult(data); - }, - dataType: "json" - }); - }, - - subSqlString : function(sql, len) { - if (sql == undefined || sql == null) { - return ''; - } - - if (sql.length <= len) - return sql; - return sql.substr(0, len) + '...'; - }, - - stripes : function() { - $("#dataTable tbody tr").each(function () { - $(this).removeClass("striped"); - }); - $("#dataTable tbody tr:even").each(function () { - $(this).addClass("striped"); - }); - }, - - getUrlVar : function(name) { - var vars = {}; - var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { - vars[key] = value; - }); - return vars[name]; - } - } -}(); - -$(document).ready(function() { - druid.common.init(); -}); +$.namespace("druid.common"); +druid.common = function () { + var statViewOrderBy = ''; + var statViewOrderBy_old = ''; + var statViewOrderType = 'asc'; + + // only one page for now + var sqlViewPage = 1; + var sqlViewPerPageCount = 1000000; + + return { + init : function() { + this.buildFooter(); + }, + + buildHead : function(index) { + var html = ''; + $(document.body).prepend(html); + $(".navbar .nav li").eq(index).addClass("active"); + }, + + buildFooter : function() { + var html = ''; + $(document.body).append(html); + }, + + ajaxRequestForReset : function() { + if(!confirm("Are you sure to reset all stat? It'll clear all stat data !")){ + return; + } + + $.ajax({ + type: 'POST', + url: "reset-all.json", + success: function(data) { + if (data.ResultCode == 1) { + alert("already reset all stat"); + } + }, + dataType: "json" + }); + }, + + getAjaxUrl : function(uri) { + var result = uri; + + if (statViewOrderBy != undefined) + result += 'orderBy=' + statViewOrderBy + '&'; + + if (statViewOrderType != undefined) + result += 'orderType=' + statViewOrderType + '&'; + + if (sqlViewPage != undefined) + result += 'page=' + sqlViewPage + '&'; + + if (sqlViewPerPageCount != undefined) + result += 'perPageCount=' + sqlViewPerPageCount + '&'; + + return result; + }, + + resetSortMark : function() { + var divObj = document.getElementById('th-' + statViewOrderBy); + var old_divObj = document.getElementById('th-' + statViewOrderBy_old); + var replaceToStr = ''; + if (old_divObj) { + var html = old_divObj.innerHTML; + if (statViewOrderBy_old.indexOf('[') > 0) + replaceToStr = '-'; + html = html.replace('▲', replaceToStr); + html = html.replace('▼', replaceToStr); + old_divObj.innerHTML = html + } + if (divObj) { + var html = divObj.innerHTML; + if (statViewOrderBy.indexOf('[') > 0) + html = ''; + + if (statViewOrderType == 'asc') { + html += '▲'; + } else if (statViewOrderType == 'desc') { + html += '▼'; + } + divObj.innerHTML = html; + } + + this.ajaxRequestForBasicInfo(); + }, + + setOrderBy : function(orderBy) { + if (statViewOrderBy != orderBy) { + statViewOrderBy_old = statViewOrderBy; + statViewOrderBy = orderBy; + statViewOrderType = 'desc'; + druid.common.resetSortMark(); + return; + } + + statViewOrderBy_old = statViewOrderBy; + + if (statViewOrderType == 'asc') + statViewOrderType = 'desc' + else + statViewOrderType = 'asc'; + + druid.common.resetSortMark(); + }, + + ajaxuri : "", + handleAjaxResult : null, + ajaxRequestForBasicInfo : function() { + $.ajax({ + type: 'POST', + url: druid.common.getAjaxUrl(druid.common.ajaxuri), + success: function(data) { + druid.common.handleAjaxResult(data); + }, + dataType: "json" + }); + }, + + subSqlString : function(sql, len) { + if (sql == undefined || sql == null) { + return ''; + } + + if (sql.length <= len) + return sql; + return sql.substr(0, len) + '...'; + }, + + stripes : function() { + $("#dataTable tbody tr").each(function () { + $(this).removeClass("striped"); + }); + $("#dataTable tbody tr:even").each(function () { + $(this).addClass("striped"); + }); + }, + + getUrlVar : function(name) { + var vars = {}; + var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { + vars[key] = value; + }); + return vars[name]; + } + } +}(); + +$(document).ready(function() { + druid.common.init(); +}); From 12a188379ada57f888b6fdbfbd9da6253ab10cb5 Mon Sep 17 00:00:00 2001 From: melin Date: Sat, 6 Apr 2013 15:39:12 +0800 Subject: [PATCH 4/6] delete logo.jpg --- .../support/http/resources/img/logo.jpg | Bin 6123 -> 0 bytes .../support/http/resources/js/common.js | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 src/main/resources/support/http/resources/img/logo.jpg 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 fe2d4e9dbc38de8803d70b7c22b1d0c64d124d95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6123 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 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); From 9c23429d70a2110da3a0e6e45c1e2a5347ee4afa Mon Sep 17 00:00:00 2001 From: melin Date: Sat, 6 Apr 2013 15:40:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"wall.html=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8E=92=E5=BA=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit eb78871f0bb47c5dadd4975877806a19bc881048. --- .../alibaba/druid/stat/DruidStatService.java | 764 +++++++++--------- .../support/http/resources/wall.html | 131 ++- 2 files changed, 443 insertions(+), 452 deletions(-) diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatService.java b/src/main/java/com/alibaba/druid/stat/DruidStatService.java index e8ac57e4fd..28d40a91e1 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatService.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatService.java @@ -1,385 +1,379 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.stat; - -import java.lang.management.ManagementFactory; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.management.JMException; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.support.http.stat.WebAppStatManager; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.support.spring.stat.SpringStatManager; -import com.alibaba.druid.util.MapComparator; -import com.alibaba.druid.util.StringUtils; - -/** - * 注意:避免直接调用Druid相关对象例如DruidDataSource等,相关调用要到DruidStatManagerFacade里用反射实现 - * - * @author sandzhang - */ -public final class DruidStatService implements DruidStatServiceMBean { - - private final static Log LOG = LogFactory.getLog(DruidStatService.class); - - public final static String MBEAN_NAME = "com.alibaba.druid:type=DruidStatService"; - - private final static DruidStatService instance = new DruidStatService(); - - private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); - - public final static int RESULT_CODE_SUCCESS = 1; - public final static int RESULT_CODE_ERROR = -1; - - private final static int DEFAULT_PAGE = 1; - private final static int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; - private static final String DEFAULT_ORDER_TYPE = "asc"; - private static final String DEFAULT_ORDERBY = "SQL"; - - private DruidStatService(){ - } - - public static DruidStatService getInstance() { - return instance; - } - - public boolean isResetEnable() { - return statManagerFacade.isResetEnable(); - } - - public void setResetEnable(boolean value) { - statManagerFacade.setResetEnable(value); - } - - public String service(String url) { - - Map parameters = getParameters(url); - - if (url.equals("/basic.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.returnJSONBasicStat()); - } - - if (url.equals("/reset-all.json")) { - statManagerFacade.resetAll(); - - return returnJSONResult(RESULT_CODE_SUCCESS, null); - } - - if (url.equals("/datasource.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getDataSourceStatDataList()); - } - - if (url.equals("/activeConnectionStackTrace.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getActiveConnStackTraceList()); - } - - if (url.startsWith("/datasource-")) { - Integer id = StringUtils.subStringToInteger(url, "datasource-", "."); - Object result = statManagerFacade.getDataSourceStatData(id); - return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); - } - - if (url.startsWith("/connectionInfo-") && url.endsWith(".json")) { - Integer id = StringUtils.subStringToInteger(url, "connectionInfo-", "."); - List connectionInfoList = statManagerFacade.getPoolingConnectionInfoByDataSourceId(id); - return returnJSONResult(connectionInfoList == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, - connectionInfoList); - } - - if (url.startsWith("/activeConnectionStackTrace-") && url.endsWith(".json")) { - Integer id = StringUtils.subStringToInteger(url, "activeConnectionStackTrace-", "."); - return returnJSONActiveConnectionStackTrace(id); - } - - if (url.startsWith("/sql.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getSqlStatDataList(parameters)); - } - - if (url.startsWith("/wall.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getWallStatMap(parameters)); - } - - if (url.startsWith("/wall-") && url.indexOf(".json") > 0) { - Integer dataSourceId = StringUtils.subStringToInteger(url, "wall-", ".json"); - Object result = statManagerFacade.getWallStatMap(dataSourceId); - return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); - } - - if (url.startsWith("/sql-") && url.indexOf(".json") > 0) { - Integer id = StringUtils.subStringToInteger(url, "sql-", ".json"); - return getSqlStat(id); - } - - if (url.startsWith("/weburi.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatDataList(parameters)); - } - - if (url.startsWith("/weburi-") && url.indexOf(".json") > 0) { - String uri = StringUtils.subString(url, "weburi-", ".json"); - return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatData(uri)); - } - - if (url.startsWith("/webapp.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getWebAppStatDataList(parameters)); - } - - if (url.startsWith("/websession.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatDataList(parameters)); - } - - if (url.startsWith("/websession-") && url.indexOf(".json") > 0) { - String id = StringUtils.subString(url, "websession-", ".json"); - return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatData(id)); - } - - if (url.startsWith("/spring.json")) { - return returnJSONResult(RESULT_CODE_SUCCESS, getSpringStatDataList(parameters)); - } - - if (url.startsWith("/spring-detail.json")) { - String clazz = parameters.get("class"); - String method = parameters.get("method"); - return returnJSONResult(RESULT_CODE_SUCCESS, getSpringMethodStatData(clazz, method)); - } - - return returnJSONResult(RESULT_CODE_ERROR, "Do not support this request, please contact with administrator."); - } - - private List> getSpringStatDataList(Map parameters) { - List> array = SpringStatManager.getInstance().getMethodStatData(); - return comparatorOrderBy(array, parameters); - } - - private List> getWebURIStatDataList(Map parameters) { - List> array = WebAppStatManager.getInstance().getURIStatData(); - return comparatorOrderBy(array, parameters); - } - - private Map getWebURIStatData(String uri) { - return WebAppStatManager.getInstance().getURIStatData(uri); - } - - private Map getWebSessionStatData(String sessionId) { - return WebAppStatManager.getInstance().getSessionStat(sessionId); - } - - private Map getSpringMethodStatData(String clazz, String method) { - return SpringStatManager.getInstance().getMethodStatData(clazz, method); - } - - private List> getWebSessionStatDataList(Map parameters) { - List> array = WebAppStatManager.getInstance().getSessionStatData(); - return comparatorOrderBy(array, parameters); - } - - private List> getWebAppStatDataList(Map parameters) { - List> array = WebAppStatManager.getInstance().getWebAppStatData(); - return comparatorOrderBy(array, parameters); - } - - private List> comparatorOrderBy(List> array, Map parameters) { - // when open the stat page before executing some sql - if (array == null || array.isEmpty()) { - return null; - } - - // when parameters is null - String orderBy, orderType = null; - Integer page = DEFAULT_PAGE; - Integer perPageCount = DEFAULT_PER_PAGE_COUNT; - if (parameters == null) { - orderBy = DEFAULT_ORDER_TYPE; - orderType = DEFAULT_ORDER_TYPE; - page = DEFAULT_PAGE; - perPageCount = DEFAULT_PER_PAGE_COUNT; - } else { - orderBy = parameters.get("orderBy"); - orderType = parameters.get("orderType"); - String pageParam = parameters.get("page"); - if (pageParam != null && pageParam.length() != 0) { - page = Integer.parseInt(pageParam); - } - String pageCountParam = parameters.get("perPageCount"); - if (pageCountParam != null && pageCountParam.length() > 0) { - perPageCount = Integer.parseInt(pageCountParam); - } - } - - // others,such as order - orderBy = orderBy == null ? DEFAULT_ORDERBY : orderBy; - orderType = orderType == null ? DEFAULT_ORDER_TYPE : orderType; - - if (!"desc".equals(orderType)) { - orderType = DEFAULT_ORDER_TYPE; - } - - // orderby the statData array - if (orderBy != null && orderBy.trim().length() != 0) { - Collections.sort(array, new MapComparator(orderBy, DEFAULT_ORDER_TYPE.equals(orderType))); - } - - // page - int fromIndex = (page - 1) * perPageCount; - int toIndex = page * perPageCount; - if (toIndex > array.size()) { - toIndex = array.size(); - } - - return array.subList(fromIndex, toIndex); - } - - private List> getSqlStatDataList(Map parameters) { - Integer dataSourceId = null; - - String dataSourceIdParam = parameters.get("dataSourceId"); - if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { - dataSourceId = Integer.parseInt(dataSourceIdParam); - } - - List> array = statManagerFacade.getSqlStatDataList(dataSourceId); - List> sortedArray = comparatorOrderBy(array, parameters); - return sortedArray; - } - - public Map getWallStatMap(Map parameters) { - Integer dataSourceId = null; - - String dataSourceIdParam = parameters.get("dataSourceId"); - if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { - dataSourceId = Integer.parseInt(dataSourceIdParam); - } - - 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) { - Map map = statManagerFacade.getSqlStatData(id); - - if (map == null) { - return returnJSONResult(RESULT_CODE_ERROR, null); - } - - String dbType = (String) map.get("DbType"); - String sql = (String) map.get("SQL"); - - map.put("formattedSql", SQLUtils.format(sql, dbType)); - List statementList = SQLUtils.parseStatements(sql, dbType); - - if (!statementList.isEmpty()) { - SQLStatement statemen = statementList.get(0); - SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(statementList, dbType); - statemen.accept(visitor); - map.put("parsedTable", visitor.getTables().toString()); - map.put("parsedFields", visitor.getColumns().toString()); - map.put("parsedConditions", visitor.getConditions().toString()); - map.put("parsedRelationships", visitor.getRelationships().toString()); - map.put("parsedOrderbycolumns", visitor.getOrderByColumns().toString()); - } - - DateFormat format = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS"); - Date maxTimespanOccurTime = (Date) map.get("MaxTimespanOccurTime"); - if (maxTimespanOccurTime != null) { - map.put("MaxTimespanOccurTime", format.format(maxTimespanOccurTime)); - } - - return returnJSONResult(map == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, map); - } - - private String returnJSONActiveConnectionStackTrace(Integer id) { - List result = statManagerFacade.getActiveConnectionStackTraceByDataSourceId(id); - - if (result == null) { - return returnJSONResult(RESULT_CODE_ERROR, "require set removeAbandoned=true"); - } - return returnJSONResult(RESULT_CODE_SUCCESS, result); - } - - public static String returnJSONResult(int resultCode, Object content) { - Map dataMap = new LinkedHashMap(); - dataMap.put("ResultCode", resultCode); - dataMap.put("Content", content); - return JSONUtils.toJSONString(dataMap); - } - - public static void registerMBean() { - MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - try { - - ObjectName objectName = new ObjectName(MBEAN_NAME); - if (!mbeanServer.isRegistered(objectName)) { - mbeanServer.registerMBean(instance, objectName); - } - } catch (JMException ex) { - LOG.error("register mbean error", ex); - } - } - - public static void unregisterMBean() { - MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - - try { - mbeanServer.unregisterMBean(new ObjectName(MBEAN_NAME)); - } catch (JMException ex) { - LOG.error("unregister mbean error", ex); - } - } - - public static Map getParameters(String url) { - if (url == null || (url = url.trim()).length() == 0) { - return Collections. emptyMap(); - } - - String parametersStr = StringUtils.subString(url, "?", null); - if (parametersStr == null || parametersStr.length() == 0) { - return Collections. emptyMap(); - } - - String[] parametersArray = parametersStr.split("&"); - Map parameters = new LinkedHashMap(); - - for (String parameterStr : parametersArray) { - int index = parameterStr.indexOf("="); - if (index <= 0) { - continue; - } - - String name = parameterStr.substring(0, index); - String value = parameterStr.substring(index + 1); - parameters.put(name, value); - } - return parameters; - } -} +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.stat; + +import java.lang.management.ManagementFactory; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import javax.management.JMException; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.support.http.stat.WebAppStatManager; +import com.alibaba.druid.support.json.JSONUtils; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.support.spring.stat.SpringStatManager; +import com.alibaba.druid.util.MapComparator; +import com.alibaba.druid.util.StringUtils; + +/** + * 注意:避免直接调用Druid相关对象例如DruidDataSource等,相关调用要到DruidStatManagerFacade里用反射实现 + * + * @author sandzhang + */ +public final class DruidStatService implements DruidStatServiceMBean { + + private final static Log LOG = LogFactory.getLog(DruidStatService.class); + + public final static String MBEAN_NAME = "com.alibaba.druid:type=DruidStatService"; + + private final static DruidStatService instance = new DruidStatService(); + + private static DruidStatManagerFacade statManagerFacade = DruidStatManagerFacade.getInstance(); + + public final static int RESULT_CODE_SUCCESS = 1; + public final static int RESULT_CODE_ERROR = -1; + + private final static int DEFAULT_PAGE = 1; + private final static int DEFAULT_PER_PAGE_COUNT = Integer.MAX_VALUE; + private static final String DEFAULT_ORDER_TYPE = "asc"; + private static final String DEFAULT_ORDERBY = "SQL"; + + private DruidStatService(){ + } + + public static DruidStatService getInstance() { + return instance; + } + + public boolean isResetEnable() { + return statManagerFacade.isResetEnable(); + } + + public void setResetEnable(boolean value) { + statManagerFacade.setResetEnable(value); + } + + public String service(String url) { + + Map parameters = getParameters(url); + + if (url.equals("/basic.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.returnJSONBasicStat()); + } + + if (url.equals("/reset-all.json")) { + statManagerFacade.resetAll(); + + return returnJSONResult(RESULT_CODE_SUCCESS, null); + } + + if (url.equals("/datasource.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getDataSourceStatDataList()); + } + + if (url.equals("/activeConnectionStackTrace.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, statManagerFacade.getActiveConnStackTraceList()); + } + + if (url.startsWith("/datasource-")) { + Integer id = StringUtils.subStringToInteger(url, "datasource-", "."); + Object result = statManagerFacade.getDataSourceStatData(id); + return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); + } + + if (url.startsWith("/connectionInfo-") && url.endsWith(".json")) { + Integer id = StringUtils.subStringToInteger(url, "connectionInfo-", "."); + List connectionInfoList = statManagerFacade.getPoolingConnectionInfoByDataSourceId(id); + return returnJSONResult(connectionInfoList == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, + connectionInfoList); + } + + if (url.startsWith("/activeConnectionStackTrace-") && url.endsWith(".json")) { + Integer id = StringUtils.subStringToInteger(url, "activeConnectionStackTrace-", "."); + return returnJSONActiveConnectionStackTrace(id); + } + + if (url.startsWith("/sql.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getSqlStatDataList(parameters)); + } + + if (url.startsWith("/wall.json")) { + Object result = statManagerFacade.getWallStatMap(null); + return returnJSONResult(RESULT_CODE_SUCCESS, result); + } + + if (url.startsWith("/wall-") && url.indexOf(".json") > 0) { + Integer dataSourceId = StringUtils.subStringToInteger(url, "wall-", ".json"); + Object result = statManagerFacade.getWallStatMap(dataSourceId); + return returnJSONResult(result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result); + } + + if (url.startsWith("/sql-") && url.indexOf(".json") > 0) { + Integer id = StringUtils.subStringToInteger(url, "sql-", ".json"); + return getSqlStat(id); + } + + if (url.startsWith("/weburi.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatDataList(parameters)); + } + + if (url.startsWith("/weburi-") && url.indexOf(".json") > 0) { + String uri = StringUtils.subString(url, "weburi-", ".json"); + return returnJSONResult(RESULT_CODE_SUCCESS, getWebURIStatData(uri)); + } + + if (url.startsWith("/webapp.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getWebAppStatDataList(parameters)); + } + + if (url.startsWith("/websession.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatDataList(parameters)); + } + + if (url.startsWith("/websession-") && url.indexOf(".json") > 0) { + String id = StringUtils.subString(url, "websession-", ".json"); + return returnJSONResult(RESULT_CODE_SUCCESS, getWebSessionStatData(id)); + } + + if (url.startsWith("/spring.json")) { + return returnJSONResult(RESULT_CODE_SUCCESS, getSpringStatDataList(parameters)); + } + + if (url.startsWith("/spring-detail.json")) { + String clazz = parameters.get("class"); + String method = parameters.get("method"); + return returnJSONResult(RESULT_CODE_SUCCESS, getSpringMethodStatData(clazz, method)); + } + + return returnJSONResult(RESULT_CODE_ERROR, "Do not support this request, please contact with administrator."); + } + + private List> getSpringStatDataList(Map parameters) { + List> array = SpringStatManager.getInstance().getMethodStatData(); + return comparatorOrderBy(array, parameters); + } + + private List> getWebURIStatDataList(Map parameters) { + List> array = WebAppStatManager.getInstance().getURIStatData(); + return comparatorOrderBy(array, parameters); + } + + private Map getWebURIStatData(String uri) { + return WebAppStatManager.getInstance().getURIStatData(uri); + } + + private Map getWebSessionStatData(String sessionId) { + return WebAppStatManager.getInstance().getSessionStat(sessionId); + } + + private Map getSpringMethodStatData(String clazz, String method) { + return SpringStatManager.getInstance().getMethodStatData(clazz, method); + } + + private List> getWebSessionStatDataList(Map parameters) { + List> array = WebAppStatManager.getInstance().getSessionStatData(); + return comparatorOrderBy(array, parameters); + } + + private List> getWebAppStatDataList(Map parameters) { + List> array = WebAppStatManager.getInstance().getWebAppStatData(); + return comparatorOrderBy(array, parameters); + } + + private List> comparatorOrderBy(List> array, Map parameters) { + // when open the stat page before executing some sql + if (array == null || array.isEmpty()) { + return null; + } + + // when parameters is null + String orderBy, orderType = null; + Integer page = DEFAULT_PAGE; + Integer perPageCount = DEFAULT_PER_PAGE_COUNT; + if (parameters == null) { + orderBy = DEFAULT_ORDER_TYPE; + orderType = DEFAULT_ORDER_TYPE; + page = DEFAULT_PAGE; + perPageCount = DEFAULT_PER_PAGE_COUNT; + } else { + orderBy = parameters.get("orderBy"); + orderType = parameters.get("orderType"); + String pageParam = parameters.get("page"); + if (pageParam != null && pageParam.length() != 0) { + page = Integer.parseInt(pageParam); + } + String pageCountParam = parameters.get("perPageCount"); + if (pageCountParam != null && pageCountParam.length() > 0) { + perPageCount = Integer.parseInt(pageCountParam); + } + } + + // others,such as order + orderBy = orderBy == null ? DEFAULT_ORDERBY : orderBy; + orderType = orderType == null ? DEFAULT_ORDER_TYPE : orderType; + + if (!"desc".equals(orderType)) { + orderType = DEFAULT_ORDER_TYPE; + } + + // orderby the statData array + if (orderBy != null && orderBy.trim().length() != 0) { + Collections.sort(array, new MapComparator(orderBy, DEFAULT_ORDER_TYPE.equals(orderType))); + } + + // page + int fromIndex = (page - 1) * perPageCount; + int toIndex = page * perPageCount; + if (toIndex > array.size()) { + toIndex = array.size(); + } + + return array.subList(fromIndex, toIndex); + } + + private List> getSqlStatDataList(Map parameters) { + Integer dataSourceId = null; + + String dataSourceIdParam = parameters.get("dataSourceId"); + if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { + dataSourceId = Integer.parseInt(dataSourceIdParam); + } + + List> array = statManagerFacade.getSqlStatDataList(dataSourceId); + List> sortedArray = comparatorOrderBy(array, parameters); + return sortedArray; + } + + public Map getWallStatMap(Map parameters) { + Integer dataSourceId = null; + + String dataSourceIdParam = parameters.get("dataSourceId"); + if (dataSourceIdParam != null && dataSourceIdParam.length() > 0) { + dataSourceId = Integer.parseInt(dataSourceIdParam); + } + + return statManagerFacade.getWallStatMap(dataSourceId); + } + + private String getSqlStat(Integer id) { + Map map = statManagerFacade.getSqlStatData(id); + + if (map == null) { + return returnJSONResult(RESULT_CODE_ERROR, null); + } + + String dbType = (String) map.get("DbType"); + String sql = (String) map.get("SQL"); + + map.put("formattedSql", SQLUtils.format(sql, dbType)); + List statementList = SQLUtils.parseStatements(sql, dbType); + + if (!statementList.isEmpty()) { + SQLStatement statemen = statementList.get(0); + SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(statementList, dbType); + statemen.accept(visitor); + map.put("parsedTable", visitor.getTables().toString()); + map.put("parsedFields", visitor.getColumns().toString()); + map.put("parsedConditions", visitor.getConditions().toString()); + map.put("parsedRelationships", visitor.getRelationships().toString()); + map.put("parsedOrderbycolumns", visitor.getOrderByColumns().toString()); + } + + DateFormat format = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss:SSS"); + Date maxTimespanOccurTime = (Date) map.get("MaxTimespanOccurTime"); + if (maxTimespanOccurTime != null) { + map.put("MaxTimespanOccurTime", format.format(maxTimespanOccurTime)); + } + + return returnJSONResult(map == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, map); + } + + private String returnJSONActiveConnectionStackTrace(Integer id) { + List result = statManagerFacade.getActiveConnectionStackTraceByDataSourceId(id); + + if (result == null) { + return returnJSONResult(RESULT_CODE_ERROR, "require set removeAbandoned=true"); + } + return returnJSONResult(RESULT_CODE_SUCCESS, result); + } + + public static String returnJSONResult(int resultCode, Object content) { + Map dataMap = new LinkedHashMap(); + dataMap.put("ResultCode", resultCode); + dataMap.put("Content", content); + return JSONUtils.toJSONString(dataMap); + } + + public static void registerMBean() { + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); + try { + + ObjectName objectName = new ObjectName(MBEAN_NAME); + if (!mbeanServer.isRegistered(objectName)) { + mbeanServer.registerMBean(instance, objectName); + } + } catch (JMException ex) { + LOG.error("register mbean error", ex); + } + } + + public static void unregisterMBean() { + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); + + try { + mbeanServer.unregisterMBean(new ObjectName(MBEAN_NAME)); + } catch (JMException ex) { + LOG.error("unregister mbean error", ex); + } + } + + public static Map getParameters(String url) { + if (url == null || (url = url.trim()).length() == 0) { + return Collections. emptyMap(); + } + + String parametersStr = StringUtils.subString(url, "?", null); + if (parametersStr == null || parametersStr.length() == 0) { + return Collections. emptyMap(); + } + + String[] parametersArray = parametersStr.split("&"); + Map parameters = new LinkedHashMap(); + + for (String parameterStr : parametersArray) { + int index = parameterStr.indexOf("="); + if (index <= 0) { + continue; + } + + String name = parameterStr.substring(0, index); + String value = parameterStr.substring(index + 1); + parameters.put(name, value); + } + return parameters; + } +} diff --git a/src/main/resources/support/http/resources/wall.html b/src/main/resources/support/http/resources/wall.html index e7d41f64a7..eac8bd835f 100644 --- a/src/main/resources/support/http/resources/wall.html +++ b/src/main/resources/support/http/resources/wall.html @@ -59,20 +59,20 @@
Function NameInvokeCountFunction NameInvokeCount
- +
- - - - - - - - - - - + + + + + + + + + + + @@ -80,8 +80,8 @@
Table NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountTable NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCount
- - + + @@ -91,69 +91,66 @@ From d73b12adf733193436581eed95743b92ec0d38ef Mon Sep 17 00:00:00 2001 From: melin Date: Sat, 6 Apr 2013 15:43:41 +0800 Subject: [PATCH 6/6] =?UTF-8?q?wall.html=E5=A2=9E=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/druid/stat/DruidStatService.java | 12 +- .../support/http/resources/wall.html | 131 +++++++++--------- 2 files changed, 76 insertions(+), 67 deletions(-) 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/wall.html b/src/main/resources/support/http/resources/wall.html index eac8bd835f..e7d41f64a7 100644 --- a/src/main/resources/support/http/resources/wall.html +++ b/src/main/resources/support/http/resources/wall.html @@ -59,20 +59,20 @@
Function NameInvokeCountFunction NameInvokeCount
- +
- - - - - - - - - - - + + + + + + + + + + + @@ -80,8 +80,8 @@
Table NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCountTable NameSelectCountSelectIntoCountInsertCountUpdateCountDeleteCountTruncateCountCreateCountAlterCountDropCountReplaceCount
- - + + @@ -91,66 +91,69 @@
Function NameInvokeCountFunction NameInvokeCount