From 25888aa95af3cbe408d4df8271b52d75d1bc0996 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Wed, 1 Jan 2025 13:42:46 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/common/core/text/Convert.java | 12 ++++++------ .../java/com/muyu/common/core/utils/SpringUtils.java | 3 +-- .../common/datascope/aspect/DataScopeAspect.java | 6 ++---- .../muyu/system/service/impl/SysMenuServiceImpl.java | 2 +- .../src/main/java/com/xxl/job/core/util/IpUtil.java | 3 +-- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java index fb57cb9..1730c9c 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java @@ -876,17 +876,17 @@ 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++) { // 优化double计算精度丢失问题 BigDecimal nNum = new BigDecimal(n); BigDecimal decimal = new BigDecimal(10); BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN); double d = scale.doubleValue(); - s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); + s.append((digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "")); } - if (s.length() < 1) { - s = "整"; + if (s.isEmpty()) { + s = new StringBuilder("整"); } int integerPart = (int) Math.floor(n); @@ -896,8 +896,8 @@ public class Convert { p = digit[integerPart % 10] + unit[1][j] + p; integerPart = integerPart / 10; } - s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s; + s.insert(0, p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i]); } - return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); + return head + s.toString().replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java index c37a65c..8ddb3af 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java @@ -43,8 +43,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor { * @throws org.springframework.beans.BeansException */ public static T getBean (Class clz) throws BeansException { - T result = (T) beanFactory.getBean(clz); - return result; + return beanFactory.getBean(clz); } /** diff --git a/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java b/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java index 3d66b0d..ff9110d 100644 --- a/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java +++ b/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java @@ -109,8 +109,7 @@ public class DataScopeAspect { if (StringUtils.isNotBlank(sqlString.toString())) { Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) params; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) { baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); } } @@ -141,8 +140,7 @@ public class DataScopeAspect { */ private void clearDataScope (final JoinPoint joinPoint) { Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) params; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) { baseEntity.getParams().put(DATA_SCOPE, ""); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index e3554da..88b738a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -464,7 +464,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl public List getChildPerms (List list, int parentId) { List returnList = new ArrayList(); for (Iterator iterator = list.iterator() ; iterator.hasNext() ; ) { - SysMenu t = (SysMenu) iterator.next(); + SysMenu t = iterator.next(); // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 if (t.getParentId() == parentId) { recursionFn(list, t); diff --git a/xxl-job/xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java b/xxl-job/xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java index c97c4fe..f34ab87 100644 --- a/xxl-job/xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java +++ b/xxl-job/xxl-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java @@ -57,11 +57,10 @@ public class IpUtil { return false; } String name = address.getHostAddress(); - boolean result = (name != null + return (name != null && IP_PATTERN.matcher(name).matches() && !ANYHOST_VALUE.equals(name) && !LOCALHOST_VALUE.equals(name)); - return result; }