diff --git a/pear-common/src/main/java/com/pearadmin/common/config/CoreConfig.java b/pear-common/src/main/java/com/pearadmin/common/config/CoreConfig.java
index f8df25fcd758320f90709b52ab97af0672bf6b64..d771528a01476ca6d75424b2f27d18aed08b2c4b 100644
--- a/pear-common/src/main/java/com/pearadmin/common/config/CoreConfig.java
+++ b/pear-common/src/main/java/com/pearadmin/common/config/CoreConfig.java
@@ -17,6 +17,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
import javax.annotation.Resource;
import java.io.Serializable;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -36,7 +37,7 @@ public class CoreConfig {
mailAccount.setFrom(sysContext.getConfig(ConfigurationConstant.MAIN_FROM));
mailAccount.setUser(sysContext.getConfig(ConfigurationConstant.MAIN_USER));
mailAccount.setPass(sysContext.getConfig(ConfigurationConstant.MAIN_PASS));
- mailAccount.setCharset(Charset.forName("UTF-8"));
+ mailAccount.setCharset(StandardCharsets.UTF_8);
mailAccount.setAuth(true);
return mailAccount;
}
diff --git a/pear-common/src/main/java/com/pearadmin/common/plugins/repeat/impl/SameUrlDataInterceptor.java b/pear-common/src/main/java/com/pearadmin/common/plugins/repeat/impl/SameUrlDataInterceptor.java
index ef82ee81a08c1656041979529cf29fac939564d1..a073ea57edee543873c5d824ce09f14bcb7498a2 100644
--- a/pear-common/src/main/java/com/pearadmin/common/plugins/repeat/impl/SameUrlDataInterceptor.java
+++ b/pear-common/src/main/java/com/pearadmin/common/plugins/repeat/impl/SameUrlDataInterceptor.java
@@ -27,12 +27,12 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
/**
* 间隔时间，单位:秒 默认10秒
- *
+ *
* 两次相同参数的请求，如果间隔时间大于该参数，系统不会认定为重复提交的数据
*/
private int intervalTime = 10;
- public void setIntervalTime()
+ public void setIntervalTime(int intervalTime)
{
this.intervalTime = intervalTime;
}
@@ -92,10 +92,6 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
{
long time1 = (Long) nowMap.get(REPEAT_TIME);
long time2 = (Long) preMap.get(REPEAT_TIME);
- if ((time1 - time2) < (this.intervalTime * 1000))
- {
- return true;
- }
- return false;
+ return (time1 - time2) < (this.intervalTime * 1000L);
}
}
diff --git a/pear-common/src/main/java/com/pearadmin/common/tools/database/SqlInjectionUtil.java b/pear-common/src/main/java/com/pearadmin/common/tools/database/SqlInjectionUtil.java
index d86ed7a2e4a5280c7d968bb8a6105c66b3bacf01..ebe6902f7c2c8f79b34b5888fc98305aecd37a0a 100644
--- a/pear-common/src/main/java/com/pearadmin/common/tools/database/SqlInjectionUtil.java
+++ b/pear-common/src/main/java/com/pearadmin/common/tools/database/SqlInjectionUtil.java
@@ -7,7 +7,7 @@ import java.security.MessageDigest;
/**
* sql注入处理工具类
- *
+ *
* @author zhoujf
*/
@Slf4j
@@ -70,7 +70,7 @@ public class SqlInjectionUtil {
}
/**
* sql注入过滤处理，遇到注入关键字抛异常
- *
+ *
* @param value
* @return
*/
@@ -81,19 +81,18 @@ public class SqlInjectionUtil {
// 统一转为小写
value = value.toLowerCase();
String[] xssArr = xssStr.split("\\|");
- for (int i = 0; i < xssArr.length; i++) {
- if (value.indexOf(xssArr[i]) > -1) {
- log.error("请注意，存在SQL注入关键词---> {}", xssArr[i]);
+ for (String s : xssArr) {
+ if (value.contains(s)) {
+ log.error("请注意，存在SQL注入关键词---> {}", s);
log.error("请注意，值可能存在SQL注入风险!---> {}", value);
throw new RuntimeException("请注意，值可能存在SQL注入风险!--->" + value);
}
}
- return;
}
/**
* sql注入过滤处理，遇到注入关键字抛异常
- *
+ *
* @param values
* @return
*/
@@ -105,15 +104,14 @@ public class SqlInjectionUtil {
}
// 统一转为小写
value = value.toLowerCase();
- for (int i = 0; i < xssArr.length; i++) {
- if (value.indexOf(xssArr[i]) > -1) {
- log.error("请注意，存在SQL注入关键词---> {}", xssArr[i]);
+ for (String s : xssArr) {
+ if (value.contains(s)) {
+ log.error("请注意，存在SQL注入关键词---> {}", s);
log.error("请注意，值可能存在SQL注入风险!---> {}", value);
throw new RuntimeException("请注意，值可能存在SQL注入风险!--->" + value);
}
}
}
- return;
}
/**
@@ -130,14 +128,13 @@ public class SqlInjectionUtil {
}
// 统一转为小写
value = value.toLowerCase();
- for (int i = 0; i < xssArr.length; i++) {
- if (value.indexOf(xssArr[i]) > -1 || value.startsWith(xssArr[i].trim())) {
- log.error("请注意，存在SQL注入关键词---> {}", xssArr[i]);
+ for (String s : xssArr) {
+ if (value.contains(s) || value.startsWith(s.trim())) {
+ log.error("请注意，存在SQL注入关键词---> {}", s);
log.error("请注意，值可能存在SQL注入风险!---> {}", value);
throw new RuntimeException("请注意，值可能存在SQL注入风险!--->" + value);
}
}
- return;
}
@@ -155,14 +152,13 @@ public class SqlInjectionUtil {
}
// 统一转为小写
value = value.toLowerCase();
- for (int i = 0; i < xssArr.length; i++) {
- if (value.indexOf(xssArr[i]) > -1 || value.startsWith(xssArr[i].trim())) {
- log.error("请注意，存在SQL注入关键词---> {}", xssArr[i]);
+ for (String s : xssArr) {
+ if (value.contains(s) || value.startsWith(s.trim())) {
+ log.error("请注意，存在SQL注入关键词---> {}", s);
log.error("请注意，值可能存在SQL注入风险!---> {}", value);
throw new RuntimeException("请注意，值可能存在SQL注入风险!--->" + value);
}
}
- return;
}
}
diff --git a/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java b/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java
index 10ac60c11b42d5b9856acf00a4d18564c8d16ecd..0cad31ebe11534036d35492c774f6846e9b0b486 100644
--- a/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java
+++ b/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java
@@ -30,11 +30,7 @@ public class SecurityUtil {
public static boolean isAuthentication(){
// if security session eq s-id is not null to index
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
- if (!(auth instanceof AnonymousAuthenticationToken)) {
- return true;
- }else{
- return false;
- }
+ return !(auth instanceof AnonymousAuthenticationToken);
}
}
diff --git a/pear-common/src/main/java/com/pearadmin/common/tools/sequence/SequenceUtil.java b/pear-common/src/main/java/com/pearadmin/common/tools/sequence/SequenceUtil.java
index b7dbd91594c5ff6384c9690389f9389c297112b5..5ff3203695bf55b1f6f9badbaa19728ef2f2c51b 100644
--- a/pear-common/src/main/java/com/pearadmin/common/tools/sequence/SequenceUtil.java
+++ b/pear-common/src/main/java/com/pearadmin/common/tools/sequence/SequenceUtil.java
@@ -30,11 +30,11 @@ public class SequenceUtil {
private static final long sequenceBits = 12L;
/** 为 算 法 提 供 可 用 配 置 */
private static final long workerIdShift = sequenceBits;
- private static final long maxWorkerId = -1L ^ (-1L << workerIdBits);
- private static final long maxCenterId = -1L ^ (-1L << centerIdBits);
+ private static final long maxWorkerId = ~(-1L << workerIdBits);
+ private static final long maxCenterId = ~(-1L << centerIdBits);
private static final long centerIdShift = sequenceBits + workerIdBits;
private static final long timestampLeftShift = sequenceBits + workerIdBits + centerIdBits;
- private static final long sequenceMask = -1L ^ (-1L << sequenceBits);
+ private static final long sequenceMask = ~(-1L << sequenceBits);
public static synchronized long makeSequence() throws Exception{
long timestamp = timeGen();
// 当 前 时 间 小 于 上 次 Id 生 成 时 间 ,说 明 系 统 时 钟 回 退, 应 会 抛 出 异 常
diff --git a/pear-common/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java b/pear-common/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java
index 01fe1113aa3ec44f730815775af33fca550eaa8b..c6dc22e0f9885caadb7bc76fe54c2de05503ec70 100644
--- a/pear-common/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java
+++ b/pear-common/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java
@@ -17,15 +17,15 @@ public class CharsetKit
public static final String GBK = "GBK";
/** ISO-8859-1 */
- public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
+ public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1;
/** UTF-8 */
- public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
+ public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8;
/** GBK */
public static final Charset CHARSET_GBK = Charset.forName(GBK);
/**
* 转换为Charset对象
- *
+ *
* @param charset 字符集，为空则返回默认字符集
* @return Charset
*/
@@ -36,7 +36,7 @@ public class CharsetKit
/**
* 转换字符串的字符集编码
- *
+ *
* @param source 字符串
* @param srcCharset 源字符集，默认ISO-8859-1
* @param destCharset 目标字符集，默认UTF-8
@@ -49,7 +49,7 @@ public class CharsetKit
/**
* 转换字符串的字符集编码
- *
+ *
* @param source 字符串
* @param srcCharset 源字符集，默认ISO-8859-1
* @param destCharset 目标字符集，默认UTF-8
diff --git a/pear-common/src/main/java/com/pearadmin/common/tools/string/Convert.java b/pear-common/src/main/java/com/pearadmin/common/tools/string/Convert.java
index fc7998d90fdcd9bd689449fc23fa5d760354d813..86ef4cf098b0c87126a6fc6a3a65f1ff43b56c2b 100644
--- a/pear-common/src/main/java/com/pearadmin/common/tools/string/Convert.java
+++ b/pear-common/src/main/java/com/pearadmin/common/tools/string/Convert.java
@@ -16,7 +16,7 @@ public class Convert
* 转换为字符串
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -38,7 +38,7 @@ public class Convert
* 转换为字符串
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -51,7 +51,7 @@ public class Convert
* 转换为字符
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -75,7 +75,7 @@ public class Convert
* 转换为字符
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -88,7 +88,7 @@ public class Convert
* 转换为byte
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -126,7 +126,7 @@ public class Convert
* 转换为byte
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -139,7 +139,7 @@ public class Convert
* 转换为Short
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -177,7 +177,7 @@ public class Convert
* 转换为Short
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -190,7 +190,7 @@ public class Convert
* 转换为Number
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -224,7 +224,7 @@ public class Convert
* 转换为Number
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -237,7 +237,7 @@ public class Convert
* 转换为int
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -275,7 +275,7 @@ public class Convert
* 转换为int
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -286,7 +286,7 @@ public class Convert
/**
* 转换为Integer数组
- *
+ *
* @param str 被转换的值
* @return 结果
*/
@@ -297,7 +297,7 @@ public class Convert
/**
* 转换为Long数组
- *
+ *
* @param str 被转换的值
* @return 结果
*/
@@ -308,7 +308,7 @@ public class Convert
/**
* 转换为Integer数组
- *
+ *
* @param split 分隔符
* @param split 被转换的值
* @return 结果
@@ -331,7 +331,7 @@ public class Convert
/**
* 转换为Long数组
- *
+ *
* @param split 分隔符
* @param str 被转换的值
* @return 结果
@@ -354,7 +354,7 @@ public class Convert
/**
* 转换为String数组
- *
+ *
* @param str 被转换的值
* @return 结果
*/
@@ -365,7 +365,7 @@ public class Convert
/**
* 转换为String数组
- *
+ *
* @param split 分隔符
* @param split 被转换的值
* @return 结果
@@ -379,7 +379,7 @@ public class Convert
* 转换为long
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -418,7 +418,7 @@ public class Convert
* 转换为long
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -431,7 +431,7 @@ public class Convert
* 转换为double
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -470,7 +470,7 @@ public class Convert
* 转换为double
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -483,7 +483,7 @@ public class Convert
* 转换为Float
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -521,7 +521,7 @@ public class Convert
* 转换为Float
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -534,7 +534,7 @@ public class Convert
* 转换为boolean
* String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -580,7 +580,7 @@ public class Convert
* 转换为boolean
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -592,7 +592,7 @@ public class Convert
/**
* 转换为Enum对象
* 如果给定的值为空，或者转换失败，返回默认值
- *
+ *
* @param clazz Enum的Class
* @param value 值
* @param defaultValue 默认值
@@ -628,7 +628,7 @@ public class Convert
/**
* 转换为Enum对象
* 如果给定的值为空，或者转换失败，返回默认值null
- *
+ *
* @param clazz Enum的Class
* @param value 值
* @return Enum
@@ -642,7 +642,7 @@ public class Convert
* 转换为BigInteger
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -680,7 +680,7 @@ public class Convert
* 转换为BigInteger
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -693,7 +693,7 @@ public class Convert
* 转换为BigDecimal
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
@@ -714,7 +714,7 @@ public class Convert
}
if (value instanceof Double)
{
- return new BigDecimal((Double) value);
+ return BigDecimal.valueOf((Double) value);
}
if (value instanceof Integer)
{
@@ -739,7 +739,7 @@ public class Convert
* 转换为BigDecimal
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
@@ -751,7 +751,7 @@ public class Convert
/**
* 将对象转为字符串
* 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
- *
+ *
* @param obj 对象
* @return 字符串
*/
@@ -763,7 +763,7 @@ public class Convert
/**
* 将对象转为字符串
* 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
- *
+ *
* @param obj 对象
* @param charsetName 字符集
* @return 字符串
@@ -776,7 +776,7 @@ public class Convert
/**
* 将对象转为字符串
* 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
- *
+ *
* @param obj 对象
* @param charset 字符集
* @return 字符串
@@ -805,7 +805,7 @@ public class Convert
/**
* 将byte数组转为字符串
- *
+ *
* @param bytes byte数组
* @param charset 字符集
* @return 字符串
@@ -817,7 +817,7 @@ public class Convert
/**
* 解码字节码
- *
+ *
* @param data 字符串
* @param charset 字符集，如果此字段为空，则解码的结果取决于平台
* @return 解码后的字符串
@@ -838,7 +838,7 @@ public class Convert
/**
* 将编码的byteBuffer数据转换为字符串
- *
+ *
* @param data 数据
* @param charset 字符集，如果为空使用当前系统字符集
* @return 字符串
@@ -855,7 +855,7 @@ public class Convert
/**
* 将编码的byteBuffer数据转换为字符串
- *
+ *
* @param data 数据
* @param charset 字符集，如果为空使用当前系统字符集
* @return 字符串
@@ -872,7 +872,7 @@ public class Convert
// ----------------------------------------------------------------------- 全角半角转换
/**
* 半角转全角
- *
+ *
* @param input String.
* @return 全角字符串.
*/
@@ -883,7 +883,7 @@ public class Convert
/**
* 半角转全角
- *
+ *
* @param input String
* @param notConvertSet 不替换的字符集合
* @return 全角字符串.
@@ -914,7 +914,7 @@ public class Convert
/**
* 全角转半角
- *
+ *
* @param input String.
* @return 半角字符串
*/
@@ -925,7 +925,7 @@ public class Convert
/**
* 替换全角为半角
- *
+ *
* @param text 文本
* @param notConvertSet 不替换的字符集合
* @return 替换后的字符
@@ -950,14 +950,13 @@ public class Convert
c[i] = (char) (c[i] - 65248);
}
}
- String returnString = new String(c);
- return returnString;
+ return new String(c);
}
/**
* 数字金额大写转换 先写个完整的然后将如零拾替换成零
- *
+ *
* @param n 数字
* @return 中文大写数字
*/
@@ -970,27 +969,27 @@ public class Convert
String head = n < 0 ? "负" : "";
n = Math.abs(n);
- String s = "";
+ StringBuilder s = new StringBuilder();
for (int i = 0; i < fraction.length; i++)
{
- s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+ s.append((digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""));
}
if (s.length() < 1)
{
- s = "整";
+ s = new StringBuilder("整");
}
int integerPart = (int) Math.floor(n);
for (int i = 0; i < unit[0].length && integerPart > 0; i++)
{
- String p = "";
+ StringBuilder p = new StringBuilder();
for (int j = 0; j < unit[1].length && n > 0; j++)
{
- p = digit[integerPart % 10] + unit[1][j] + p;
+ p.insert(0, digit[integerPart % 10] + unit[1][j]);
integerPart = integerPart / 10;
}
- s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
+ s.insert(0, p.toString().replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i]);
}
- return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
+ return head + s.toString().replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
}
}
diff --git a/pear-common/src/main/java/com/pearadmin/common/tools/system/SystemUtil.java b/pear-common/src/main/java/com/pearadmin/common/tools/system/SystemUtil.java
index e3883325eb34c1a072f2104502227cb5668c248a..3ba9f86759166df608b7e5b6c7ea734c07b3ac2d 100644
--- a/pear-common/src/main/java/com/pearadmin/common/tools/system/SystemUtil.java
+++ b/pear-common/src/main/java/com/pearadmin/common/tools/system/SystemUtil.java
@@ -48,7 +48,7 @@ public class SystemUtil {
public static String getHostName() {
try {
return InetAddress.getLocalHost().getHostName();
- } catch (UnknownHostException e) {
+ } catch (UnknownHostException ignored) {
}
return "未知";
}
diff --git a/pear-common/src/main/java/com/pearadmin/common/xss/XssSupport.java b/pear-common/src/main/java/com/pearadmin/common/xss/XssSupport.java
index 8892eb939f34e887aebf364c68ebf8faca3f02c4..215cd7fb8eae59c27df1f2539feb47d9b8a578a9 100644
--- a/pear-common/src/main/java/com/pearadmin/common/xss/XssSupport.java
+++ b/pear-common/src/main/java/com/pearadmin/common/xss/XssSupport.java
@@ -9,6 +9,7 @@ import org.apache.commons.lang3.BooleanUtils;
import javax.servlet.*;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -62,9 +63,7 @@ public class XssSupport implements Filter {
String temp = filterConfig.getInitParameter("excludes");
if (temp != null) {
String[] url = temp.split(",");
- for (int i = 0; url != null && i < url.length; i++) {
- excludes.add(url[i]);
- }
+ excludes.addAll(Arrays.asList(url));
}
}
diff --git a/pear-entrance/src/main/java/com/pearadmin/secure/SecureExtendConfiguration.java b/pear-entrance/src/main/java/com/pearadmin/secure/SecureExtendConfiguration.java
index ebc343888bd6cf66aed0eb23c5775d80d821361a..9df08669d5a2b8b61ec5a9ec78ff4e52ad28fec8 100644
--- a/pear-entrance/src/main/java/com/pearadmin/secure/SecureExtendConfiguration.java
+++ b/pear-entrance/src/main/java/com/pearadmin/secure/SecureExtendConfiguration.java
@@ -92,13 +92,11 @@ public class SecureExtendConfiguration {
*/
@Bean
public ScheduledThreadPoolExecutor manageSessionThreadPool() {
- ScheduledThreadPoolExecutor executor =
- new ScheduledThreadPoolExecutor(1, r -> {
- Thread t = new Thread(r);
- t.setName("removeSession");
- t.setDaemon(true);
- return t;
- });
- return executor;
+ return new ScheduledThreadPoolExecutor(1, r -> {
+ Thread t = new Thread(r);
+ t.setName("removeSession");
+ t.setDaemon(true);
+ return t;
+ });
}
}
diff --git a/pear-entrance/src/main/java/com/pearadmin/secure/support/SecurePermissionSupport.java b/pear-entrance/src/main/java/com/pearadmin/secure/support/SecurePermissionSupport.java
index ea83342f10745d38cfaf86dcfeb0a1ce1027e981..6d8a082c30a8da93af841e051f777553c4c80f06 100644
--- a/pear-entrance/src/main/java/com/pearadmin/secure/support/SecurePermissionSupport.java
+++ b/pear-entrance/src/main/java/com/pearadmin/secure/support/SecurePermissionSupport.java
@@ -40,11 +40,7 @@ public class SecurePermissionSupport implements PermissionEvaluator {
for (SysPower sysPower : powerList) {
permissions.add(sysPower.getPowerCode());
}
- if (permissions.contains(permission)) {
- return true;
- } else {
- return false;
- }
+ return permissions.contains(permission);
}
@Override
diff --git a/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/GenUtils.java b/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/GenUtils.java
index 74b746eb548f119f67f5ea9b09e86672eeb180cd..757f1840be72442be2319cfa763963344cee4094 100644
--- a/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/GenUtils.java
+++ b/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/GenUtils.java
@@ -119,7 +119,7 @@ public class GenUtils
/**
* 校验数组是否包含指定值
- *
+ *
* @param arr 数组
* @param targetValue 值
* @return 是否包含
@@ -131,7 +131,7 @@ public class GenUtils
/**
* 获取模块名
- *
+ *
* @param packageName 包名
* @return 模块名
*/
@@ -139,13 +139,12 @@ public class GenUtils
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtil.substring(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtil.substring(packageName, lastIndex + 1, nameLength);
}
/**
* 获取业务名
- *
+ *
* @param tableName 表名
* @return 业务名
*/
@@ -153,13 +152,12 @@ public class GenUtils
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
- String businessName = StringUtil.substring(tableName, lastIndex + 1, nameLength);
- return businessName;
+ return StringUtil.substring(tableName, lastIndex + 1, nameLength);
}
/**
* 表名转换成Java类名
- *
+ *
* @param tableName 表名称
* @return 类名
*/
@@ -177,7 +175,7 @@ public class GenUtils
/**
* 批量替换前缀
- *
+ *
* @param replacementm 替换值
* @param searchList 替换列表
* @return
@@ -208,7 +206,7 @@ public class GenUtils
/**
* 获取数据库类型字段
- *
+ *
* @param columnType 列类型
* @return 截取后的列类型
*/
@@ -226,7 +224,7 @@ public class GenUtils
/**
* 获取字段长度
- *
+ *
* @param columnType 列类型
* @return 截取后的列类型
*/
@@ -245,7 +243,7 @@ public class GenUtils
/**
* 获取空数组列表
- *
+ *
* @param length 长度
* @return 数组信息
*/
@@ -258,4 +256,4 @@ public class GenUtils
}
return values;
}
-}
\ No newline at end of file
+}
diff --git a/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/VelocityUtils.java b/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/VelocityUtils.java
index 1cdf6061f1e827b32e4332afc3fb541be87320d7..cc6a5356833d3c17d66344c0c634e1364c83c86d 100644
--- a/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/VelocityUtils.java
+++ b/pear-modules/pear-generate/src/main/java/com/pearadmin/generate/util/VelocityUtils.java
@@ -28,7 +28,7 @@ public class VelocityUtils
/** html空间路径 */
private static final String TEMPLATES_PATH = "main/resources/templates";
-
+
/** 默认上级菜单，系统工具 */
private static final String DEFAULT_PARENT_MENU_ID = "3";
@@ -100,7 +100,7 @@ public class VelocityUtils
/**
* 获取模板信息
- *
+ *
* @return 模板列表
*/
public static List getTemplateList(String tplCategory)
@@ -204,7 +204,7 @@ public class VelocityUtils
/**
* 获取项目文件路径
- *
+ *
* @return 路径
*/
public static String getProjectPath()
@@ -219,20 +219,19 @@ public class VelocityUtils
/**
* 获取包前缀
- *
+ *
* @param packageName 包名称
* @return 包前缀名称
*/
public static String getPackagePrefix(String packageName)
{
int lastIndex = packageName.lastIndexOf(".");
- String basePackage = StringUtil.substring(packageName, 0, lastIndex);
- return basePackage;
+ return StringUtil.substring(packageName, 0, lastIndex);
}
/**
* 根据列类型获取导入包
- *
+ *
* @param genTable 业务表对象
* @return 返回需要导入的包列表
*/
@@ -261,7 +260,7 @@ public class VelocityUtils
/**
* 获取权限前缀
- *
+ *
* @param moduleName 模块名称
* @param businessName 业务名称
* @return 返回权限前缀
@@ -329,7 +328,7 @@ public class VelocityUtils
/**
* 获取需要在哪一列上面显示展开按钮
- *
+ *
* @param genTable 业务表对象
* @return 展开按钮列序号
*/
@@ -353,4 +352,4 @@ public class VelocityUtils
}
return num;
}
-}
\ No newline at end of file
+}
diff --git a/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorJsonRestResource.java b/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorJsonRestResource.java
index 4986e65413ac729654e7e6652bf8928326263ac0..be310bed095d27c1ec4b9b334eb613603e9b9184 100644
--- a/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorJsonRestResource.java
+++ b/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorJsonRestResource.java
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
@RestController
@@ -39,7 +40,7 @@ public class ModelEditorJsonRestResource implements ModelDataJsonConstants {
}
modelNode.put(MODEL_ID, model.getId());
ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
- new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
+ new String(repositoryService.getModelEditorSource(model.getId()), StandardCharsets.UTF_8));
modelNode.put("model", editorJsonNode);
} catch (Exception e) {
throw new ActivitiException("Error creating model JSON", e);
diff --git a/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorSaveRestResource.java b/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorSaveRestResource.java
index a4107e81a42a35365a417b09b48fc52d53c5c085..8302b88dc34640da044a46493eb5098a0a11a9b0 100644
--- a/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorSaveRestResource.java
+++ b/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorSaveRestResource.java
@@ -15,6 +15,7 @@ import javax.annotation.Resource;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
@RestController
@RequestMapping("service")
@@ -45,9 +46,9 @@ public class ModelEditorSaveRestResource implements ModelDataJsonConstants {
model.setMetaInfo(modelJson.toString());
model.setName(name);
repositoryService.saveModel(model);
- repositoryService.addModelEditorSource(model.getId(), json_xml.getBytes("utf-8"));
+ repositoryService.addModelEditorSource(model.getId(), json_xml.getBytes(StandardCharsets.UTF_8));
- InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes("utf-8"));
+ InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes(StandardCharsets.UTF_8));
TranscoderInput input = new TranscoderInput(svgStream);
PNGTranscoder transcoder = new PNGTranscoder();
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
diff --git a/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorToolRestResource.java b/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorToolRestResource.java
index 01eb81a814e086c0dd4a9924059abe84dc632e55..667c91499a1d13c4882628ea91da9848fd805462 100644
--- a/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorToolRestResource.java
+++ b/pear-modules/pear-process/src/main/java/com/pearadmin/process/resource/ModelEditorToolRestResource.java
@@ -5,6 +5,7 @@ import org.apache.commons.io.IOUtils;
import org.springframework.web.bind.annotation.*;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
@RestController
@RequestMapping("service")
@@ -15,7 +16,7 @@ public class ModelEditorToolRestResource {
public String getStencilset() {
InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
try {
- return IOUtils.toString(stencilsetStream, "utf-8");
+ return IOUtils.toString(stencilsetStream, StandardCharsets.UTF_8);
} catch (Exception e) {
throw new ActivitiException("Error while loading stencil set", e);
}
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/context/SysContextService.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/context/SysContextService.java
index ea9853708959396526671a5cc166d645b9ad5245..b9c2b1d1975fdd1f5330a534f0a5b60af8ba9d19 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/context/SysContextService.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/context/SysContextService.java
@@ -54,7 +54,7 @@ public class SysContextService implements SysContext {
SysBasePower sysPowerModel = new SysBasePower();
BeanUtils.copyProperties(sysPower, sysPowerModel);
sysPowerModelList.add(sysPowerModel);
- }catch (Exception e){
+ }catch (Exception ignored){
}
}
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysDictDataController.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysDictDataController.java
index 02551480c52671957897d322d2b86c6713aacd2c..5eb7db5ef05a6c067843995b1012a5ec9dbc57a9 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysDictDataController.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysDictDataController.java
@@ -83,7 +83,7 @@ public class SysDictDataController extends BaseController {
Result> result = new Result>();
List ls = null;
try {
- if(dictCode.indexOf(",")!=-1) {
+ if(dictCode.contains(",")) {
String[] params = dictCode.split(",");
if(params.length<3) {
@@ -120,7 +120,7 @@ public class SysDictDataController extends BaseController {
public Result> loadDictItem(@PathVariable String dictCode, @RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) {
Result> result = new Result<>();
try {
- if(dictCode.indexOf(",")!=-1) {
+ if(dictCode.contains(",")) {
String[] params = dictCode.split(",");
if(params.length!=3) {
return Result.failure("字典Code格式不正确！");
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java
index 40bfeaee847e5f9383a8578482840f9cc80d618f..9cc5c0487274990fc4fff0dd5c97ae27fb6ac487 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysFileServiceImpl.java
@@ -71,8 +71,7 @@ public class ISysFileServiceImpl implements ISysFileService {
String fileId = SequenceUtil.makeStringId();
String name = file.getOriginalFilename();
String suffixName = name.substring(name.lastIndexOf("."));
- String hash = fileId;
- String fileName = hash + suffixName;
+ String fileName = fileId + suffixName;
String fileDir = LocalDate.now().toString();
String parentPath = uploadProperty.getUploadPath() +fileDir;
java.io.File filepath = new java.io.File(parentPath, fileName);
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysConfigServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysConfigServiceImpl.java
index 71c8698368f05729f1c7b2fb85900e317713256a..932f9fbbbc45e5fc961bbdba988f707ea592d749 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysConfigServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysConfigServiceImpl.java
@@ -89,11 +89,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
@Override
public Boolean updateById(SysConfig sysConfig) {
int result = sysConfigMapper.updateById(sysConfig);
- if(result > 0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
@@ -104,11 +100,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
@Override
public Boolean remove(String id) {
Integer result = sysConfigMapper.deleteById(id);
- if(result>0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
@@ -119,11 +111,7 @@ public class SysConfigServiceImpl implements ISysConfigService {
@Override
public Boolean batchRemove(String[] ids) {
Integer result = sysConfigMapper.deleteByIds(ids);
- if(result>0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
}
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDeptServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDeptServiceImpl.java
index 4220828b730694d29696df7c8e59b1d79504672a..cb4f465f05d21974581480b0f1d3b7df76fc9445 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDeptServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDeptServiceImpl.java
@@ -51,11 +51,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
@Override
public boolean save(SysDept sysDept) {
int result = sysDeptMapper.insert(sysDept);
- if(result>0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
@@ -76,11 +72,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
@Override
public boolean update(SysDept sysDept) {
Integer result = sysDeptMapper.updateById(sysDept);
- if(result > 0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDictDataServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDictDataServiceImpl.java
index b4874225a1e252538221c65a766b3a0f46511746..6591e5271d622d69a9c313bde980266e32eee6da 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDictDataServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysDictDataServiceImpl.java
@@ -46,8 +46,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
@Override
public List selectByCode(String typeCode) {
try {
- List list= loadingCacheSysDictData.get(typeCode);
- return list;
+ return loadingCacheSysDictData.get(typeCode);
} catch (ExecutionException e) {
e.printStackTrace();
}
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java
index 3e73cdd71c80c6dc4601f611d1901ecdd969b16f..e1c917bb4f634040d63bd25ec3bb5531c917e283 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java
@@ -35,11 +35,7 @@ public class SysLogServiceImpl implements ISysLogService {
sysLog.setSystemOs(ServletUtil.getSystem());
sysLog.setOperateName(null != SecurityUtil.currentUser() ? SecurityUtil.currentUser().getName() : "未登录用户");
int result = sysLogMapper.insert(sysLog);
- if(result>0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
@Override
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysRoleServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysRoleServiceImpl.java
index 8d08cfe6bfe584677c58c3729f73756618c623d6..d2a024ce57a5ff031a5ea6582ed8fb000fe7ad40 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysRoleServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysRoleServiceImpl.java
@@ -83,11 +83,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
@Override
public boolean save(SysRole sysRole) {
int result = sysRoleMapper.insert(sysRole);
- if(result>0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
@@ -108,11 +104,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
@Override
public boolean update(SysRole sysRole) {
Integer result = sysRoleMapper.updateById(sysRole);
- if(result > 0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
@@ -150,11 +142,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
rolePowers.add(sysRolePower);
});
int result = sysRolePowerMapper.batchInsert(rolePowers);
- if(result > 0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java
index 99753023bf328abf04b109cc2de1fc483b4f1839..2f4e8268e657a152ba8dce9bac3ea985fa624183 100644
--- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java
+++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java
@@ -126,11 +126,7 @@ public class SysUserServiceImpl implements ISysUserService {
@Override
public boolean save(SysUser sysUser) {
int result = sysUserMapper.insert(sysUser);
- if(result>0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
@@ -141,11 +137,7 @@ public class SysUserServiceImpl implements ISysUserService {
@Override
public boolean update(SysUser sysUser) {
Integer result = sysUserMapper.updateById(sysUser);
- if(result > 0){
- return true;
- }else{
- return false;
- }
+ return result > 0;
}
/**
@@ -165,11 +157,7 @@ public class SysUserServiceImpl implements ISysUserService {
sysUserRoles.add(sysUserRole);
});
int i = sysUserRoleMapper.batchInsert(sysUserRoles);
- if(i>0){
- return true;
- }else{
- return false;
- }
+ return i > 0;
}
/**