From bb2ade75a82d768db99a46cff54eecc0b67d4de0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 六月 2021 15:38:44 +0800
Subject: [PATCH] update 升级 hutool 5.7.1 适配工具类
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 22 +++++++++++-----------
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
index 73f7f93..b09bc98 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
@@ -30,7 +30,7 @@
FilterRegistrationBean registration = new FilterRegistrationBean();
registration.setDispatcherTypes(DispatcherType.REQUEST);
registration.setFilter(new XssFilter());
- registration.addUrlPatterns(StrUtil.split(xssProperties.getUrlPatterns(), ","));
+ registration.addUrlPatterns(StrUtil.splitToArray(xssProperties.getUrlPatterns(), ","));
registration.setName("xssFilter");
registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
Map<String, String> initParameters = new HashMap<String, String>();
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index 283ba19..928a051 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -11,7 +11,7 @@
/**
* 浠g爜鐢熸垚鍣� 宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class GenUtils
@@ -61,7 +61,7 @@
column.setHtmlType(GenConstants.HTML_INPUT);
// 濡傛灉鏄诞鐐瑰瀷 缁熶竴鐢˙igDecimal
- String[] str = StrUtil.split(StrUtil.subBetween(column.getColumnType(), "(", ")"), ",");
+ String[] str = StrUtil.splitToArray(StrUtil.subBetween(column.getColumnType(), "(", ")"), ",");
if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
{
column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
@@ -132,7 +132,7 @@
/**
* 鏍¢獙鏁扮粍鏄惁鍖呭惈鎸囧畾鍊�
- *
+ *
* @param arr 鏁扮粍
* @param targetValue 鍊�
* @return 鏄惁鍖呭惈
@@ -144,7 +144,7 @@
/**
* 鑾峰彇妯″潡鍚�
- *
+ *
* @param packageName 鍖呭悕
* @return 妯″潡鍚�
*/
@@ -158,7 +158,7 @@
/**
* 鑾峰彇涓氬姟鍚�
- *
+ *
* @param tableName 琛ㄥ悕
* @return 涓氬姟鍚�
*/
@@ -172,7 +172,7 @@
/**
* 琛ㄥ悕杞崲鎴怞ava绫诲悕
- *
+ *
* @param tableName 琛ㄥ悕绉�
* @return 绫诲悕
*/
@@ -182,7 +182,7 @@
String tablePrefix = GenConfig.getTablePrefix();
if (autoRemovePre && StrUtil.isNotEmpty(tablePrefix))
{
- String[] searchList = StrUtil.split(tablePrefix, ",");
+ String[] searchList = StrUtil.splitToArray(tablePrefix, ",");
tableName = replaceFirst(tableName, searchList);
}
return StrUtil.upperFirst(StrUtil.toCamelCase(tableName));
@@ -190,7 +190,7 @@
/**
* 鎵归噺鏇挎崲鍓嶇紑
- *
+ *
* @param replacementm 鏇挎崲鍊�
* @param searchList 鏇挎崲鍒楄〃
* @return
@@ -211,7 +211,7 @@
/**
* 鍏抽敭瀛楁浛鎹�
- *
+ *
* @param text 闇�瑕佽鏇挎崲鐨勫悕瀛�
* @return 鏇挎崲鍚庣殑鍚嶅瓧
*/
@@ -222,7 +222,7 @@
/**
* 鑾峰彇鏁版嵁搴撶被鍨嬪瓧娈�
- *
+ *
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
@@ -240,7 +240,7 @@
/**
* 鑾峰彇瀛楁闀垮害
- *
+ *
* @param columnType 鍒楃被鍨�
* @return 鎴彇鍚庣殑鍒楃被鍨�
*/
--
Gitblit v1.9.3