From 0cc4b8fb730f8ac501600eb92683ca59e2e69c0b Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 3 Jul 2013 00:14:18 +0800 Subject: [PATCH] bug fixed for spring.html & websession.html --- .../support/http/resources/js/lang.js | 18 ++++---- .../support/http/resources/spring.html | 26 +++++------ .../support/http/resources/websession.html | 19 -------- .../bvt/filter/wall/MySqlWallTest92.java | 44 +++++++++++++++++++ 4 files changed, 65 insertions(+), 42 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest92.java diff --git a/src/main/resources/support/http/resources/js/lang.js b/src/main/resources/support/http/resources/js/lang.js index 94b2c3d7a6..cc9c732be3 100644 --- a/src/main/resources/support/http/resources/js/lang.js +++ b/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打开次数'], diff --git a/src/main/resources/support/http/resources/spring.html b/src/main/resources/support/http/resources/spring.html index aa6e032b18..6bfc26f180 100644 --- a/src/main/resources/support/http/resources/spring.html +++ b/src/main/resources/support/http/resources/spring.html @@ -22,20 +22,18 @@ N - Class - Method - ExecuteCount - ExecuteErrorCount - ExecuteTimeMillis - RunningCount - ConcurrentMax - JdbcExecuteCount - JdbcExecuteErrorCount - JdbcExecuteTimeMillis - JdbcCommitCount - JdbcRollbackCount - JdbcFetchRowCount - JdbcUpdateCount + Class + Method + ExecuteCount + ExecuteTimeMillis + RunningCount + ConcurrentMax + JdbcExecuteCount + JdbcExecuteTimeMillis + JdbcCommitCount + JdbcRollbackCount + JdbcFetchRowCount + JdbcUpdateCount diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html index e3468dc24b..9f93312e88 100644 --- a/src/main/resources/support/http/resources/websession.html +++ b/src/main/resources/support/http/resources/websession.html @@ -22,32 +22,13 @@ N - SESSIONID - UserAgent Principal CreateTime LastAccessTime RemoteAddress RequestCount RequestTimeMillisTotal - RequestInterval RunningCount ConcurrentMax JdbcExecuteCount diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest92.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest92.java new file mode 100644 index 0000000000..b450c96995 --- /dev/null +++ b/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")); + } + +}