From a8e025bfe08ef85c873c461a78187e0188e2fa7d Mon Sep 17 00:00:00 2001
From: zhouhaibin <283595276@qq.com>
Date: Sun, 12 Aug 2012 17:23:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=20=E8=A7=A3=E5=86=B3=E6=B8=A9=E5=B0=91?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../druid/support/JSONDruidStatService.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java b/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java
index 75f488e751..5c66a635f3 100644
--- a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java
+++ b/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java
@@ -92,6 +92,23 @@ public class JSONDruidStatService {
     
     private List<Map<String, Object>> getWebURIStatDataList(Map<String, String> parameters) {
         List<Map<String, Object>> array = WebAppStatManager.getInstance().getURIStatData();
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         return array;
     }
 

From 78da4c26d72d0f1ed9ed01984e1212d17fc57f14 Mon Sep 17 00:00:00 2001
From: zhouhaibin <283595276@qq.com>
Date: Mon, 13 Aug 2012 10:23:43 +0800
Subject: [PATCH 2/2] support weburi monitor order by function

support weburi monitor order by function
---
 .../druid/support/JSONDruidStatService.java   | 30 +++++--------------
 .../support/http/resources/weburi.html        |  4 +++
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java b/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java
index 2f4013081f..c0349b5c0f 100644
--- a/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java
+++ b/src/main/java/com/alibaba/druid/support/JSONDruidStatService.java
@@ -96,34 +96,15 @@ public class JSONDruidStatService {
     
     private List<Map<String, Object>> getWebURIStatDataList(Map<String, String> parameters) {
         List<Map<String, Object>> array = WebAppStatManager.getInstance().getURIStatData();
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        return array;
+        return comparatorOrderBy(array, parameters);    
     }
     
     private List<Map<String, Object>> getWebSessionStatDataList(Map<String, String> parameters) {
         List<Map<String, Object>> array = WebAppStatManager.getInstance().getSessionStatData();
         return array;
     }
-
-    private List<Map<String, Object>> getSqlStatDataList(Map<String, String> parameters) {
-        List<Map<String, Object>> array = druidStatManager.getSqlStatDataList();
-
+    
+    private List<Map<String,Object>> comparatorOrderBy(List<Map<String, Object>> array,Map<String, String> parameters){
         // when open the stat page before executing some sql
         if (array == null || array.isEmpty()) return null;
 
@@ -162,6 +143,11 @@ public class JSONDruidStatService {
 
         return array.subList(fromIndex, toIndex);
     }
+    
+    private List<Map<String, Object>> getSqlStatDataList(Map<String, String> parameters) {
+        List<Map<String, Object>> array = druidStatManager.getSqlStatDataList();
+        return comparatorOrderBy(array, parameters);
+    }
 
     private String returnJSONActiveConnectionStackTrace(Integer id) {
         List<String> result = druidStatManager.getActiveConnectionStackTraceByDataSourceId(id);
diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html
index 2139430a4a..51e9d0f972 100644
--- a/src/main/resources/support/http/resources/weburi.html
+++ b/src/main/resources/support/http/resources/weburi.html
@@ -39,4 +39,8 @@
         </div>
 		<div id="footer">powered by <a href="mailto:sandzhangtoo@gmail.com">sandzhang</a></div>
 	</body>
+	
+	<script>
+		setOrderBy('URI');
+	</script>
 </html>
\ No newline at end of file