From a78b5b7b2ac6eff4462548ed523f2e01076e77f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8D=8F=E9=80=A0=E7=9A=84=E4=BF=A1=E4=BB=B0?= Date: Tue, 23 Aug 2022 05:36:29 +0000 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8C=E8=8B=A5=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=9C=A8=E4=BB=BB=E5=8A=A1=E7=9A=84=E7=88=B6?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E5=88=99=E6=97=A0=E6=B3=95=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=E5=AE=9E=E9=99=85=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BC=80=E5=8F=91=E4=B8=AD=EF=BC=8C=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=BC=9A=E4=B8=BA=E6=89=80=E6=9C=89=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=BB=BA=E4=B8=80=E4=B8=AA=E5=85=B1=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E7=88=B6=E7=B1=BB=EF=BC=8C=E4=BB=BB=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=85=A5=E5=8F=A3=E5=9C=A8=E7=88=B6=E7=B1=BB?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E4=BB=A5=E4=BE=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=82=E6=AD=A4=E6=97=B6=E4=BD=BF=E7=94=A8=20`getDeclaredMet?= =?UTF-8?q?hod()`=20=E6=98=AF=E6=97=A0=E6=B3=95=E4=BB=8E=E5=AD=90=E7=B1=BB?= =?UTF-8?q?=E6=89=BE=E5=88=B0=E8=A6=81=E6=89=A7=E8=A1=8C=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=9A=84=EF=BC=8C=E8=80=8C=E6=98=AF=E8=A6=81=E6=8D=A2?= =?UTF-8?q?=E7=94=A8=20`getMethod()`=20=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 捏造的信仰 --- .../src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java index 663b4a1f..57808fa2 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java @@ -52,12 +52,12 @@ public class JobInvokeUtil { if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) { - Method method = bean.getClass().getDeclaredMethod(methodName, getMethodParamsType(methodParams)); + Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams)); method.invoke(bean, getMethodParamsValue(methodParams)); } else { - Method method = bean.getClass().getDeclaredMethod(methodName); + Method method = bean.getClass().getMethod(methodName); method.invoke(bean); } } From d4b800036c7f64e0564c4f2f7dab3af92fbe1a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E4=BA=9A=E9=A3=9E?= Date: Fri, 26 Aug 2022 16:26:09 +0000 Subject: [PATCH 2/7] =?UTF-8?q?style=E9=87=8D=E5=A4=8D=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 胡亚飞 --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 0958a137..da91d737 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -808,7 +808,6 @@ public class ExcelUtil if (!headerStyles.containsKey(key)) { CellStyle style = wb.createCellStyle(); - style = wb.createCellStyle(); style.cloneStyleFrom(styles.get("data")); style.setAlignment(HorizontalAlignment.CENTER); style.setVerticalAlignment(VerticalAlignment.CENTER); @@ -842,7 +841,6 @@ public class ExcelUtil if (!styles.containsKey(key)) { CellStyle style = wb.createCellStyle(); - style = wb.createCellStyle(); style.setAlignment(excel.align()); style.setVerticalAlignment(VerticalAlignment.CENTER); style.setBorderRight(BorderStyle.THIN); From 42d602b7a8d35c8a931059e793cb8cb24e6ed89d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 28 Aug 2022 20:09:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=BE=A4?= =?UTF-8?q?=E5=8F=B7=EF=BC=9A160110482?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- ruoyi-ui/src/views/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d2e99718..6a8f66b8 100644 --- a/README.md +++ b/README.md @@ -94,4 +94,4 @@ ## 若依前后端分离交流群 -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-139821253-blue.svg)](https://jq.qq.com/?_wv=1027&k=njiWDmkj) [![加入QQ群](https://img.shields.io/badge/104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) 点击按钮入群。 \ No newline at end of file +QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) 点击按钮入群。 \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 544ab541..be5bb653 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -121,8 +121,8 @@ QQ群：满937441 满887144332 满180251782 满104180207 满186866453 满201396349 满101456076 满101539465 满264312783 满167385320 - 满139821253 - 104748341满104748341 + 160110482

From 036144b9eaaa782a9728298d376200dabe40ae36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8D=8F=E9=80=A0=E7=9A=84=E4=BF=A1=E4=BB=B0?= Date: Wed, 7 Sep 2022 03:00:51 +0000 Subject: [PATCH 4/7] =?UTF-8?q?=E6=8F=92=E5=85=A5=20SysOperLog=20=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=20operUrl=20=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E7=9A=84=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 捏造的信仰 --- .../src/main/java/com/ruoyi/framework/aspectj/LogAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 4e6f245f..804b4fe8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -78,7 +78,7 @@ public class LogAspect // 请求的地址 String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); operLog.setOperIp(ip); - operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); + operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); if (loginUser != null) { operLog.setOperName(loginUser.getUsername()); From f5bec709111dcf7a2d9900b19e8b8c5b1162c55c Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 12 Sep 2022 17:22:07 +0800 Subject: [PATCH 5/7] R add isError and isSuccess method --- .../src/main/java/com/ruoyi/common/core/domain/R.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java index c3df6aef..d8774609 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java @@ -102,4 +102,14 @@ public class R implements Serializable { this.data = data; } + + public Boolean isError() + { + return !isSuccess(); + } + + public Boolean isSuccess() + { + return R.SUCCESS == getCode(); + } } From 2293822dc2a01c4b86bc851779144513b1b457d6 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 12 Sep 2022 17:22:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=BC=BA=E5=B0=91=E6=95=B0=E6=8D=AE(I5OF3O)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysDeptMapper.xml | 6 ++++-- ruoyi-ui/src/views/system/dept/index.vue | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 000166ed..7a6fc158 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -59,8 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"