From cfdeada3fdb415ea451fb3fb76b96a2e7977752c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 11:21:09 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
index b31804b..a37268a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
@@ -1,6 +1,7 @@
package com.ruoyi.common.utils.sql;
-import com.ruoyi.common.utils.StringUtils;
+import cn.hutool.core.lang.Validator;
+import com.ruoyi.common.exception.BaseException;
/**
* sql鎿嶄綔宸ュ叿绫�
@@ -10,18 +11,18 @@
public class SqlUtil
{
/**
- * 浠呮敮鎸佸瓧姣嶃�佹暟瀛椼�佷笅鍒掔嚎銆佺┖鏍笺�侀�楀彿锛堟敮鎸佸涓瓧娈垫帓搴忥級
+ * 浠呮敮鎸佸瓧姣嶃�佹暟瀛椼�佷笅鍒掔嚎銆佺┖鏍笺�侀�楀彿銆佸皬鏁扮偣锛堟敮鎸佸涓瓧娈垫帓搴忥級
*/
- public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,]+";
+ public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
/**
* 妫�鏌ュ瓧绗︼紝闃叉娉ㄥ叆缁曡繃
*/
public static String escapeOrderBySql(String value)
{
- if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
+ if (Validator.isNotEmpty(value) && !isValidOrderBySql(value))
{
- return StringUtils.EMPTY;
+ throw new BaseException("鍙傛暟涓嶇鍚堣鑼冿紝涓嶈兘杩涜鏌ヨ");
}
return value;
}
--
Gitblit v1.9.3