bug fixed for spring.html & websession.html

src/main/resources/support/http/resources/js/lang.js

@@ -123,17 +123,17 @@ druid.lang = function() {
 		'Class' : ['Class', 'Class'],
 		'Method' : ['Method', 'Method'],
 //		'ExecuteCount' : ['ExecuteCount', ''],
-		'ExecuteErrorCount' : ['ExecuteErrorCount', '执行出错个数'],
+		'ExecuteErrorCount' : ['ExecuteErrorCount', '执行出错数'],
 		'ExecuteTimeMillis' : ['ExecuteTimeMillis', '执行时间'],
-		'RunningCount' : ['RunningCount', '正运行次数'],
+		'RunningCount' : ['RunningCount', '执行中'],
 		'ConcurrentMax' : ['ConcurrentMax', '最大并发'],
-		'JdbcExecuteCount' : ['JdbcExecuteCount', 'jdbc执行次数'],
-		'JdbcExecuteErrorCount' : ['JdbcExecuteErrorCount', 'jdbc执行出错次数'],
-		'JdbcExecuteTimeMillis' : ['JdbcExecuteTimeMillis', 'jdbc执行时间'],
-		'JdbcCommitCount' : ['JdbcCommitCount', 'jdbc提交次数'],
-		'JdbcRollbackCount' : ['JdbcRollbackCount', 'jdbc回滚次数'],
-		'JdbcFetchRowCount' : ['JdbcFetchRowCount', 'jdbc查询次数'],
-		'JdbcUpdateCount' : ['JdbcUpdateCount', 'jdbc更新次数'],
+		'JdbcExecuteCount' : ['JdbcExecuteCount', 'Jdbc执行次数'],
+		'JdbcExecuteErrorCount' : ['JdbcExecuteErrorCount', 'Jdbc执行出错次数'],
+		'JdbcExecuteTimeMillis' : ['JdbcExecuteTimeMillis', 'Jdbc执行时间'],
+		'JdbcCommitCount' : ['JdbcCommitCount', 'Jdbc提交次数'],
+		'JdbcRollbackCount' : ['JdbcRollbackCount', 'Jdbc回滚次数'],
+		'JdbcFetchRowCount' : ['JdbcFetchRowCount', 'Jdbc返回行数'],
+		'JdbcUpdateCount' : ['JdbcUpdateCount', 'Jdbc更新行数'],
 		'JdbcPoolConnectionOpenCount' : ['JdbcPoolConnectionOpenCount', '连接池获取连接次数'],
 		'JdbcPoolConnectionCloseCount' : ['JdbcPoolConnectionCloseCount', '连接池关闭连接次数'],
 		'JdbcResultSetOpenCount' : ['JdbcResultSetOpenCount', 'ResultSet打开次数'],

src/main/resources/support/http/resources/spring.html

@@ -22,20 +22,18 @@
 							<thead>
 								<tr>
 									<th>N</th>
-									<th><a id="th-Class" href="" class="lang" langKey="Class">Class</a></th>
-									<th><a id="th-Method" href="" class="lang" langKey="Method">Method</a></th>
-									<th><a id="th-ExecuteCount" href="" class="lang" langKey="ExecuteCount">ExecuteCount</a></th>
-									<th><a id="th-ExecuteErrorCount" href="" class="lang" langKey="ExecuteErrorCount">ExecuteErrorCount</a></th>
-									<th><a id="th-ExecuteTimeMillis" href="" class="lang" langKey="ExecuteTimeMillis">ExecuteTimeMillis</a></th>
-									<th><a id="th-RunningCount" href="" class="lang" langKey="RunningCount">RunningCount</a></th>
-									<th><a id="th-ConcurrentMax" href="" class="lang" langKey="ConcurrentMax">ConcurrentMax</a></th>
-									<th><a id="th-JdbcExecuteCount" href="" class="lang" langKey="JdbcExecuteCount">JdbcExecuteCount</a></th>
-									<th><a id="th-JdbcExecuteErrorCount" href="" class="lang" langKey="JdbcExecuteErrorCount">JdbcExecuteErrorCount</a></th>
-									<th><a id="th-JdbcExecuteTimeMillis" href="" class="lang" langKey="JdbcExecuteTimeMillis">JdbcExecuteTimeMillis</a></th>
-									<th><a id="th-JdbcCommitCount" href="" class="lang" langKey="JdbcCommitCount">JdbcCommitCount</a></th>
-									<th><a id="th-JdbcRollbackCount" href="" class="lang" langKey="JdbcRollbackCount">JdbcRollbackCount</a></th>
-									<th><a id="th-JdbcFetchRowCount" href="" class="lang" langKey="JdbcFetchRowCount">JdbcFetchRowCount</a></th>
-									<th><a id="th-JdbcUpdateCount" href="" class="lang" langKey="JdbcUpdateCount">JdbcUpdateCount</a></th>
+									<th><a id="th-Class" href="javascript:void(0);" class="lang" langKey="Class">Class</a></th>
+									<th><a id="th-Method" href="javascript:void(0);" class="lang" langKey="Method">Method</a></th>
+									<th><a id="th-ExecuteCount" href="javascript:void(0);" class="lang" langKey="ExecuteCount">ExecuteCount</a></th>
+									<th><a id="th-ExecuteTimeMillis" href="javascript:void(0);" class="lang" langKey="ExecuteTimeMillis">ExecuteTimeMillis</a></th>
+									<th><a id="th-RunningCount" href="javascript:void(0);" class="lang" langKey="RunningCount">RunningCount</a></th>
+									<th><a id="th-ConcurrentMax" href="javascript:void(0);" class="lang" langKey="ConcurrentMax">ConcurrentMax</a></th>
+									<th><a id="th-JdbcExecuteCount" href="javascript:void(0);" class="lang" langKey="JdbcExecuteCount">JdbcExecuteCount</a></th>
+									<th><a id="th-JdbcExecuteTimeMillis" href="javascript:void(0);" class="lang" langKey="JdbcExecuteTimeMillis">JdbcExecuteTimeMillis</a></th>
+									<th><a id="th-JdbcCommitCount" href="javascript:void(0);" class="lang" langKey="JdbcCommitCount">JdbcCommitCount</a></th>
+									<th><a id="th-JdbcRollbackCount" href="javascript:void(0);" class="lang" langKey="JdbcRollbackCount">JdbcRollbackCount</a></th>
+									<th><a id="th-JdbcFetchRowCount" href="javascript:void(0);" class="lang" langKey="JdbcFetchRowCount">JdbcFetchRowCount</a></th>
+									<th><a id="th-JdbcUpdateCount" href="javascript:void(0);" class="lang" langKey="JdbcUpdateCount">JdbcUpdateCount</a></th>
 								</tr>
 							</thead> 
 							<tbody></tbody>

src/main/resources/support/http/resources/websession.html

@@ -22,32 +22,13 @@
 							<thead>
 								<tr>
 									<th>N</th>
-									<!-- 
-									<th><a id="th-SESSIONID" >SESSIONID </a></th>
-									<th width="50"><a id="th-Principal" >Principal</a></th>
-									<th width="100"><a id="th-CreateTime" >CreateTime</a></th>
-									<th width="100"><a id="th-LastAccessTime" >LastAccess</a></th>
-									<th width="50"><a id="th-RemoteAddress" >RemoteAddress</a></th>
-									<th width="50"><a id="th-RequestCount" >RequestCount</a></th>
-									<th width="50" title="RequestTimeMillisTotal"><a id="th-RequestTimeMillisTotal" >RequestTime</a></th>
-									<th width="50"><a id="th-RunningCount"  title="Running Count">Running</a></th>
-									<th width="80" title="Concurrent Max"><a id="th-ConcurrentMax" >Concurrent</a></th>
-									<th width="80" title="Jdbc Exec Count"><a id="th-JdbcExecuteCount" >JdbcCount</a></th>
-									<th width="80" title="Jdbc Exec Time"><a id="th-JdbcExecuteTimeMillis"  title="JdbcExecuteTimeMillis">JdbcTime</a></th>
-									<th width="80"><a id="th-JdbcCommitCount" >JdbcCommit</a></th>
-									<th width="80"><a id="th-JdbcRollbackCount" >JdbcRollback</a></th>
-									<th width="80"><a id="th-JdbcFetchRowCount" >JdbcFetchRow</a></th>
-									<th width="80"><a id="th-JdbcUpdateCount" >JdbcUpdate</a></th>
-									 -->
 									<th><a id="th-SESSIONID" class="lang" langKey="SESSIONID">SESSIONID</a></th>
-									<th><a id="th-UserAgent" class="lang" langKey="UserAgent">UserAgent</a></th>
 									<th><a id="th-Principal" class="lang" langKey="Principal">Principal</a></th>
 									<th><a id="th-CreateTime" class="lang" langKey="CreateTime">CreateTime</a></th>
 									<th><a id="th-LastAccessTime" class="lang"  langKey="LastAccessTime">LastAccessTime</a></th>
 									<th><a id="th-RemoteAddress" class="lang" langKey="RemoteAddress">RemoteAddress</a></th>
 									<th><a id="th-RequestCount" class="lang" langKey="RequestCount">RequestCount</a></th>
 									<th><a id="th-RequestTimeMillisTotal" class="lang" langKey="RequestTimeMillisTotal">RequestTimeMillisTotal</a></th>
-									<th><a id="th-RequestInterval" class="lang" langKey="RequestInterval">RequestInterval</a></th>
 									<th><a id="th-RunningCount" class="lang" langKey="RunningCount">RunningCount</a></th>
 									<th><a id="th-ConcurrentMax" class="lang" langKey="ConcurrentMax">ConcurrentMax</a></th>
 									<th><a id="th-JdbcExecuteCount" class="lang" langKey="JdbcExecuteCount">JdbcExecuteCount</a></th>

src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest92.java

@@ -0,0 +1,44 @@
+/*
+ * 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.bvt.filter.wall;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.wall.WallProvider;
+import com.alibaba.druid.wall.spi.MySqlWallProvider;
+
+/**
+ * SQLServerWallTest
+ * 
+ * @author RaymondXiu
+ * @version 1.0, 2012-3-18
+ * @see
+ */
+public class MySqlWallTest92 extends TestCase {
+
+    public void test_false() throws Exception {
+        WallProvider provider = new MySqlWallProvider();
+        
+        Assert.assertTrue(provider.checkValid(//
+        "SELECT * FROM T WHERE FID = 40 OR EXTRACTVALUE(4484,CONCAT(0x5c,0x7163646371,(SELECT (CASE WHEN (4484=4484) THEN 1 ELSE 0 END)),0x7165767271))"));
+
+        Assert.assertEquals(1, provider.getTableStats().size());
+        Assert.assertTrue(provider.getTableStats().containsKey("t"));
+    }
+
+}