From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 a37268a..8121e02 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,15 +1,14 @@
package com.ruoyi.common.utils.sql;
-import cn.hutool.core.lang.Validator;
-import com.ruoyi.common.exception.BaseException;
+import com.ruoyi.common.exception.UtilException;
+import com.ruoyi.common.utils.StringUtils;
/**
* sql鎿嶄綔宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
-public class SqlUtil
-{
+public class SqlUtil {
/**
* 浠呮敮鎸佸瓧姣嶃�佹暟瀛椼�佷笅鍒掔嚎銆佺┖鏍笺�侀�楀彿銆佸皬鏁扮偣锛堟敮鎸佸涓瓧娈垫帓搴忥級
*/
@@ -18,11 +17,9 @@
/**
* 妫�鏌ュ瓧绗︼紝闃叉娉ㄥ叆缁曡繃
*/
- public static String escapeOrderBySql(String value)
- {
- if (Validator.isNotEmpty(value) && !isValidOrderBySql(value))
- {
- throw new BaseException("鍙傛暟涓嶇鍚堣鑼冿紝涓嶈兘杩涜鏌ヨ");
+ public static String escapeOrderBySql(String value) {
+ if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) {
+ throw new UtilException("鍙傛暟涓嶇鍚堣鑼冿紝涓嶈兘杩涜鏌ヨ");
}
return value;
}
@@ -30,8 +27,7 @@
/**
* 楠岃瘉 order by 璇硶鏄惁绗﹀悎瑙勮寖
*/
- public static boolean isValidOrderBySql(String value)
- {
+ public static boolean isValidOrderBySql(String value) {
return value.matches(SQL_PATTERN);
}
}
--
Gitblit v1.9.3