From b7db6f6686f639fa642b270a74d98d0175525015 Mon Sep 17 00:00:00 2001 From: 1332987 <13329870472@163.com> Date: Wed, 20 Apr 2022 18:03:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Didea=20=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/common/core/text/Convert.java | 2 +- .../com/ruoyi/common/core/utils/file/FileUtils.java | 2 -- .../com/ruoyi/common/core/utils/file/ImageUtils.java | 6 +++--- .../com/ruoyi/common/core/utils/html/EscapeUtil.java | 2 +- .../java/com/ruoyi/common/core/utils/ip/IpUtils.java | 2 ++ .../com/ruoyi/common/core/utils/poi/ExcelUtil.java | 8 +++++--- .../java/com/ruoyi/common/core/utils/uuid/UUID.java | 4 +--- .../common/core/exception/ServiceExceptionTest.java | 8 +------- .../java/com/ruoyi/common/log/aspect/LogAspect.java | 1 + .../common/security/aspect/PreAuthorizeAspect.java | 10 +++------- .../ruoyi/common/security/service/TokenService.java | 1 + .../java/com/ruoyi/job/service/SysJobServiceImpl.java | 1 - 12 files changed, 19 insertions(+), 28 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java index 7dc1f0f3..7816cffb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java @@ -609,7 +609,7 @@ public class Convert { return new BigDecimal((Long) value); } if (value instanceof Double) { - return new BigDecimal((Double) value); + return BigDecimal.valueOf((Double) value); } if (value instanceof Integer) { return new BigDecimal((Integer) value); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java index 2d8bc00f..c1c5d40a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java @@ -47,8 +47,6 @@ public class FileUtils { while ((length = fis.read(b)) > 0) { os.write(b, 0, length); } - } catch (IOException e) { - throw e; } finally { if (os != null) { try { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java index 26bc3e61..74ace6f4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java @@ -23,7 +23,7 @@ public class ImageUtils { try { return IOUtils.toByteArray(is); } catch (Exception e) { - log.error("图片加载异常 {}", e); + log.error("图片加载异常 ", e); return null; } finally { IOUtils.closeQuietly(is); @@ -36,7 +36,7 @@ public class ImageUtils { result = Arrays.copyOf(result, result.length); return new ByteArrayInputStream(result); } catch (Exception e) { - log.error("获取图片异常 {}", e); + log.error("获取图片异常 ", e); } return null; } @@ -59,7 +59,7 @@ public class ImageUtils { in = urlConnection.getInputStream(); return IOUtils.toByteArray(in); } catch (Exception e) { - log.error("访问文件异常 {}", e); + log.error("访问文件异常 ", e); return null; } finally { IOUtils.closeQuietly(in); diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java index bd246446..e891154d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java @@ -120,7 +120,7 @@ public class EscapeUtil { tmp.append(content.substring(lastPos)); lastPos = content.length(); } else { - tmp.append(content.substring(lastPos, pos)); + tmp.append(content, lastPos, pos); lastPos = pos; } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java index c7a9c650..3582eee7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java @@ -189,6 +189,7 @@ public class IpUtils { try { return InetAddress.getLocalHost().getHostAddress(); } catch (UnknownHostException e) { + e.printStackTrace(); } return "127.0.0.1"; } @@ -202,6 +203,7 @@ public class IpUtils { try { return InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { + e.printStackTrace(); } return "未知"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index 617c3e3e..17d7ae56 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -657,7 +657,7 @@ public class ExcelUtil { addStatisticsData(column, Convert.toStr(value), attr); } } catch (Exception e) { - log.error("导出Excel失败{}", e); + log.error("导出Excel失败", e); } return cell; } @@ -704,10 +704,11 @@ public class ExcelUtil { public String dataFormatHandlerAdapter(Object value, Excel excel) { try { Object instance = excel.handler().newInstance(); - Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class}); + Method formatMethod = excel.handler().getMethod("format", Object.class, String[].class); value = formatMethod.invoke(instance, value, excel.args()); } catch (Exception e) { - log.error("不能格式化数据 " + excel.handler(), e.getMessage()); + log.info("不能格式化数据 {}" ,excel.handler()); + log.error("不能格式化数据 " , e); } return Convert.toStr(value); } @@ -724,6 +725,7 @@ public class ExcelUtil { try { temp = Double.valueOf(text); } catch (NumberFormatException e) { + log.error("NumberFormatException ",e); } statistics.put(index, statistics.get(index) + temp); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java index 31894af5..494080b2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java @@ -422,9 +422,7 @@ public final class UUID implements java.io.Serializable, Comparable { // can simply be numerically compared as two numbers return (this.mostSigBits < val.mostSigBits ? -1 : (this.mostSigBits > val.mostSigBits ? 1 : - (this.leastSigBits < val.leastSigBits ? -1 : - (this.leastSigBits > val.leastSigBits ? 1 : - 0)))); + (Long.compare(this.leastSigBits, val.leastSigBits)))); } /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java b/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java index b8977659..76a6fd5b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java +++ b/ruoyi-common/ruoyi-common-core/src/main/test/java/com/ruoyi/common/core/exception/ServiceExceptionTest.java @@ -20,8 +20,6 @@ class ServiceExceptionTest { @Test void testThirdTest() { GlobalException globalException2 = new GlobalException(""); - globalException2.getMessage(); - globalException2.getDetailMessage(); globalException2.setDetailMessage(""); throw globalException2; } @@ -29,12 +27,8 @@ class ServiceExceptionTest { @Test void testThirdTest2() { GlobalException globalException2 = new GlobalException(); - globalException2.getMessage(); - globalException2.getDetailMessage(); System.out.println(globalException2.getMessage()); System.out.println(globalException2.getDetailMessage()); - System.out.println(globalException2.setDetailMessage("")); - globalException2.setDetailMessage(""); - throw globalException2; + throw globalException2.setDetailMessage(""); } } \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index 78927c38..e5ccd3a6 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -147,6 +147,7 @@ public class LogAspect { Object jsonObj = JSON.toJSON(o); params += jsonObj.toString() + " "; } catch (Exception e) { + e.printStackTrace(); } } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java index cd02ca98..589eb6da 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java @@ -53,13 +53,9 @@ public class PreAuthorizeAspect { // 注解鉴权 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); checkMethodAnnotation(signature.getMethod()); - try { - // 执行原有逻辑 - Object obj = joinPoint.proceed(); - return obj; - } catch (Throwable e) { - throw e; - } + // 执行原有逻辑 + Object obj = joinPoint.proceed(); + return obj; } /** diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java index 7f5ef121..b5173179 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java @@ -103,6 +103,7 @@ public class TokenService { return user; } } catch (Exception e) { + e.printStackTrace(); } return user; } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java index 6f9723f2..ddb7e236 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java @@ -10,7 +10,6 @@ import org.quartz.JobDataMap; import org.quartz.JobKey; import org.quartz.Scheduler; import org.quartz.SchedulerException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;