From 9581661675774409219d6257213942d3555e94f5 Mon Sep 17 00:00:00 2001
From: renfufei <renfufei@qq.com>
Date: Wed, 14 Dec 2016 10:45:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9SQL=E7=9B=91=E6=8E=A7=EF=BC=8CSess?=
 =?UTF-8?q?ion=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2,=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=A7=E5=88=B6,?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=BD=91=E7=BB=9C=E6=83=85=E5=86=B5=E8=BE=83?=
 =?UTF-8?q?=E5=B7=AE=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E5=A4=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8F=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/support/http/resources/sql.html | 42 ++++++++++++++++++-
 .../support/http/resources/websession.html    | 42 ++++++++++++++++++-
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html
index dd0f858ae7..e35305643f 100644
--- a/src/main/resources/support/http/resources/sql.html
+++ b/src/main/resources/support/http/resources/sql.html
@@ -18,6 +18,17 @@
           				<h3>
           					SQL Stat
           					<a href="sql.json" target="_blank">View JSON API</a>
+          					<span class="pull-right" style="font-size: 16px; margin-right: 20px;">
+          						<label langkey="RefreshPeriod" class="lang" style="display: inline;" for="refreshSecondsSelect">Refresh Period</label>
+          						<select id="refreshSecondsSelect" class="refresh-seconds-select btn" style="width:80px;" onchange="javascript:druid.sql.refreshSeconds=parseInt(this.options[this.options.selectedIndex].value);">
+                                    <option value="5"selected="selected">5s</option>
+                                    <option value="10">10s</option>
+                                    <option value="20">20s</option>
+                                    <option value="30">30s</option>
+                                    <option value="60">60s</option>
+                                </select>
+          						<a id="btnSuspendRefresh" langkey="SuspendRefresh" class="btn btn-primary lang" href="javascript:druid.sql.switchSuspendRefresh();">Suspend Refresh</a>
+          					</span>
           				</h3>
 						<table id="dataTable" class="table table-bordered table-striped responsive-utilities">
 							<thead>
@@ -89,9 +100,36 @@
 	    				druid.common.ajaxuri = dataSourceId ? 'sql.json?dataSourceId=' + dataSourceId + '&' : 'sql.json?';
 	    				druid.common.handleCallback = druid.sql.handleAjaxResult;
 	    				druid.common.setOrderBy("SQL");
-	    				druid.common.ajaxRequestForBasicInfo();
-	    				setInterval("druid.common.ajaxRequestForBasicInfo();",5000);
+                        druid.sql.controlRefresh();
 	    			},
+                    controlRefresh : function() {
+                        var FIVE = 5;
+                        if(!druid.sql.refreshSeconds){
+                            druid.sql.refreshSeconds=FIVE;
+                        }
+                        if(!druid.sql.suspendedSeconds){
+                            druid.sql.suspendedSeconds=0;
+                        }
+                        druid.sql.suspendedSeconds += FIVE;
+                        if(!druid.sql.disableAutoRefresh){
+                            if(druid.sql.suspendedSeconds >= druid.sql.refreshSeconds){
+                                druid.sql.suspendedSeconds = 0;
+                                druid.common.ajaxRequestForBasicInfo();
+                            }
+                        }
+                        setTimeout(druid.sql.controlRefresh, FIVE * 1000);
+                    },
+                    switchSuspendRefresh : function() {
+                        druid.sql.disableAutoRefresh = !druid.sql.disableAutoRefresh;
+                        if(druid.sql.disableAutoRefresh){
+                            $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary");
+                        } else {
+                            $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning");
+                        }
+                    },
+                    disableAutoRefresh : false,
+                    refreshSeconds : 5,
+                    suspendedSeconds : 0,
 	    			
 	    			handleAjaxResult : function(data) {
 	    				var sqlStatList = data.Content;
diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html
index 8bcd78d28c..191814f25b 100644
--- a/src/main/resources/support/http/resources/websession.html
+++ b/src/main/resources/support/http/resources/websession.html
@@ -17,6 +17,17 @@
           				<h3>
           					Web Session Stat
           					<a href="websession.json" target="_blank">View JSON API</a>
+          					<span class="pull-right" style="font-size: 16px; margin-right: 20px;">
+          						<label langkey="RefreshPeriod" class="lang" style="display: inline;" for="refreshSecondsSelect">Refresh Period</label>
+          						<select id="refreshSecondsSelect" class="refresh-seconds-select btn" style="width:80px;" onchange="javascript:druid.websession.refreshSeconds=parseInt(this.options[this.options.selectedIndex].value);">
+                                    <option value="5"selected="selected">5s</option>
+                                    <option value="10">10s</option>
+                                    <option value="20">20s</option>
+                                    <option value="30">30s</option>
+                                    <option value="60">60s</option>
+                                </select>
+          						<a id="btnSuspendRefresh" langkey="SuspendRefresh" class="btn btn-primary lang" href="javascript:druid.websession.switchSuspendRefresh();">Suspend Refresh</a>
+          					</span>
           				</h3>
 						<table id="dataTable" class="table table-bordered table-striped">
 							<thead>
@@ -55,9 +66,36 @@
     				druid.common.buildHead(6);
     				druid.common.ajaxuri = 'websession.json?';
     				druid.common.handleCallback = druid.websession.handleAjaxResult;
-    				druid.common.ajaxRequestForBasicInfo();
-    				setInterval("druid.common.ajaxRequestForBasicInfo();",5000);
+                    druid.websession.controlRefresh();
     			},
+                controlRefresh : function() {
+                    var FIVE = 5;
+                    if(!druid.websession.refreshSeconds){
+                        druid.websession.refreshSeconds=FIVE;
+                    }
+                    if(!druid.websession.suspendedSeconds){
+                        druid.websession.suspendedSeconds=0;
+                    }
+                    druid.websession.suspendedSeconds += FIVE;
+                    if(!druid.websession.disableAutoRefresh){
+                        if(druid.websession.suspendedSeconds >= druid.websession.refreshSeconds){
+                            druid.websession.suspendedSeconds = 0;
+                            druid.common.ajaxRequestForBasicInfo();
+                        }
+                    }
+                    setTimeout(druid.websession.controlRefresh, FIVE * 1000);
+                },
+                switchSuspendRefresh : function() {
+                    druid.websession.disableAutoRefresh = !druid.websession.disableAutoRefresh;
+                    if(druid.websession.disableAutoRefresh){
+                        $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary");
+                    } else {
+                        $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning");
+                    }
+                },
+                disableAutoRefresh : false,
+                refreshSeconds : 5,
+                suspendedSeconds : 0,
     			
     			handleAjaxResult : function(data) {
     				var statList = data.Content;

From a667531ef1ade3675874b712aa3de43ec2345b42 Mon Sep 17 00:00:00 2001
From: renfufei <renfufei@qq.com>
Date: Wed, 14 Dec 2016 11:21:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=82=E7=85=A7=E5=8E=9F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=BF=9B=E8=A1=8C=E4=BB=A3=E7=A0=81=E7=9A=84=E6=8E=92?=
 =?UTF-8?q?=E7=89=88=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/support/http/resources/sql.html | 70 +++++++++----------
 .../support/http/resources/websession.html    | 70 +++++++++----------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html
index e35305643f..dca2ba896e 100644
--- a/src/main/resources/support/http/resources/sql.html
+++ b/src/main/resources/support/http/resources/sql.html
@@ -21,12 +21,12 @@
           					<span class="pull-right" style="font-size: 16px; margin-right: 20px;">
           						<label langkey="RefreshPeriod" class="lang" style="display: inline;" for="refreshSecondsSelect">Refresh Period</label>
           						<select id="refreshSecondsSelect" class="refresh-seconds-select btn" style="width:80px;" onchange="javascript:druid.sql.refreshSeconds=parseInt(this.options[this.options.selectedIndex].value);">
-                                    <option value="5"selected="selected">5s</option>
-                                    <option value="10">10s</option>
-                                    <option value="20">20s</option>
-                                    <option value="30">30s</option>
-                                    <option value="60">60s</option>
-                                </select>
+          							<option value="5"selected="selected">5s</option>
+          							<option value="10">10s</option>
+          							<option value="20">20s</option>
+          							<option value="30">30s</option>
+          							<option value="60">60s</option>
+          						</select>
           						<a id="btnSuspendRefresh" langkey="SuspendRefresh" class="btn btn-primary lang" href="javascript:druid.sql.switchSuspendRefresh();">Suspend Refresh</a>
           					</span>
           				</h3>
@@ -100,36 +100,36 @@
 	    				druid.common.ajaxuri = dataSourceId ? 'sql.json?dataSourceId=' + dataSourceId + '&' : 'sql.json?';
 	    				druid.common.handleCallback = druid.sql.handleAjaxResult;
 	    				druid.common.setOrderBy("SQL");
-                        druid.sql.controlRefresh();
+	    				druid.sql.controlRefresh();
 	    			},
-                    controlRefresh : function() {
-                        var FIVE = 5;
-                        if(!druid.sql.refreshSeconds){
-                            druid.sql.refreshSeconds=FIVE;
-                        }
-                        if(!druid.sql.suspendedSeconds){
-                            druid.sql.suspendedSeconds=0;
-                        }
-                        druid.sql.suspendedSeconds += FIVE;
-                        if(!druid.sql.disableAutoRefresh){
-                            if(druid.sql.suspendedSeconds >= druid.sql.refreshSeconds){
-                                druid.sql.suspendedSeconds = 0;
-                                druid.common.ajaxRequestForBasicInfo();
-                            }
-                        }
-                        setTimeout(druid.sql.controlRefresh, FIVE * 1000);
-                    },
-                    switchSuspendRefresh : function() {
-                        druid.sql.disableAutoRefresh = !druid.sql.disableAutoRefresh;
-                        if(druid.sql.disableAutoRefresh){
-                            $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary");
-                        } else {
-                            $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning");
-                        }
-                    },
-                    disableAutoRefresh : false,
-                    refreshSeconds : 5,
-                    suspendedSeconds : 0,
+	    			controlRefresh : function() {
+	    				var FIVE = 5;
+	    				if(!druid.sql.refreshSeconds){
+	    					druid.sql.refreshSeconds=FIVE;
+	    				}
+	    				if(!druid.sql.suspendedSeconds){
+	    					druid.sql.suspendedSeconds=0;
+	    				}
+	    				druid.sql.suspendedSeconds += FIVE;
+	    				if(!druid.sql.disableAutoRefresh){
+	    					if(druid.sql.suspendedSeconds >= druid.sql.refreshSeconds){
+	    						druid.sql.suspendedSeconds = 0;
+	    						druid.common.ajaxRequestForBasicInfo();
+	    					}
+	    				}
+	    				setTimeout(druid.sql.controlRefresh, FIVE * 1000);
+	    			},
+	    			switchSuspendRefresh : function() {
+	    				druid.sql.disableAutoRefresh = !druid.sql.disableAutoRefresh;
+	    				if(druid.sql.disableAutoRefresh){
+	    					$("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary");
+	    				} else {
+	    					$("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning");
+	    				}
+	    			},
+	    			disableAutoRefresh : false,
+	    			refreshSeconds : 5,
+	    			suspendedSeconds : 0,
 	    			
 	    			handleAjaxResult : function(data) {
 	    				var sqlStatList = data.Content;
diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html
index 191814f25b..7cacd2bdcd 100644
--- a/src/main/resources/support/http/resources/websession.html
+++ b/src/main/resources/support/http/resources/websession.html
@@ -20,12 +20,12 @@
           					<span class="pull-right" style="font-size: 16px; margin-right: 20px;">
           						<label langkey="RefreshPeriod" class="lang" style="display: inline;" for="refreshSecondsSelect">Refresh Period</label>
           						<select id="refreshSecondsSelect" class="refresh-seconds-select btn" style="width:80px;" onchange="javascript:druid.websession.refreshSeconds=parseInt(this.options[this.options.selectedIndex].value);">
-                                    <option value="5"selected="selected">5s</option>
-                                    <option value="10">10s</option>
-                                    <option value="20">20s</option>
-                                    <option value="30">30s</option>
-                                    <option value="60">60s</option>
-                                </select>
+          							<option value="5"selected="selected">5s</option>
+          							<option value="10">10s</option>
+          							<option value="20">20s</option>
+          							<option value="30">30s</option>
+          							<option value="60">60s</option>
+          						</select>
           						<a id="btnSuspendRefresh" langkey="SuspendRefresh" class="btn btn-primary lang" href="javascript:druid.websession.switchSuspendRefresh();">Suspend Refresh</a>
           					</span>
           				</h3>
@@ -66,36 +66,36 @@
     				druid.common.buildHead(6);
     				druid.common.ajaxuri = 'websession.json?';
     				druid.common.handleCallback = druid.websession.handleAjaxResult;
-                    druid.websession.controlRefresh();
+    				druid.websession.controlRefresh();
     			},
-                controlRefresh : function() {
-                    var FIVE = 5;
-                    if(!druid.websession.refreshSeconds){
-                        druid.websession.refreshSeconds=FIVE;
-                    }
-                    if(!druid.websession.suspendedSeconds){
-                        druid.websession.suspendedSeconds=0;
-                    }
-                    druid.websession.suspendedSeconds += FIVE;
-                    if(!druid.websession.disableAutoRefresh){
-                        if(druid.websession.suspendedSeconds >= druid.websession.refreshSeconds){
-                            druid.websession.suspendedSeconds = 0;
-                            druid.common.ajaxRequestForBasicInfo();
-                        }
-                    }
-                    setTimeout(druid.websession.controlRefresh, FIVE * 1000);
-                },
-                switchSuspendRefresh : function() {
-                    druid.websession.disableAutoRefresh = !druid.websession.disableAutoRefresh;
-                    if(druid.websession.disableAutoRefresh){
-                        $("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary");
-                    } else {
-                        $("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning");
-                    }
-                },
-                disableAutoRefresh : false,
-                refreshSeconds : 5,
-                suspendedSeconds : 0,
+    			controlRefresh : function() {
+    				var FIVE = 5;
+    				if(!druid.websession.refreshSeconds){
+    					druid.websession.refreshSeconds=FIVE;
+    				}
+    				if(!druid.websession.suspendedSeconds){
+    					druid.websession.suspendedSeconds=0;
+    				}
+    				druid.websession.suspendedSeconds += FIVE;
+    				if(!druid.websession.disableAutoRefresh){
+    					if(druid.websession.suspendedSeconds >= druid.websession.refreshSeconds){
+    						druid.websession.suspendedSeconds = 0;
+    						druid.common.ajaxRequestForBasicInfo();
+    					}
+    				}
+    				setTimeout(druid.websession.controlRefresh, FIVE * 1000);
+    			},
+    			switchSuspendRefresh : function() {
+    				druid.websession.disableAutoRefresh = !druid.websession.disableAutoRefresh;
+    				if(druid.websession.disableAutoRefresh){
+    					$("#btnSuspendRefresh").addClass("btn-warning").removeClass("btn-primary");
+    				} else {
+    					$("#btnSuspendRefresh").addClass("btn-primary").removeClass("btn-warning");
+    				}
+    			},
+    			disableAutoRefresh : false,
+    			refreshSeconds : 5,
+    			suspendedSeconds : 0,
     			
     			handleAjaxResult : function(data) {
     				var statList = data.Content;