From 03f7bc0f3fb6152082fa7ff2237699b490d18a20 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 28 Sep 2022 19:26:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=89=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 017a358f..29e37955 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -508,6 +508,8 @@ public class SysUserServiceImpl implements ISysUserService else if (isUpdateSupport) { BeanValidators.validateWithException(validator, user); + checkUserAllowed(user); + checkUserDataScope(user.getUserId()); user.setUpdateBy(operName); this.updateUser(user); successNum++; From 5b8edbf381547cb99e13d9c209bc4c9bc47eeffc Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 28 Sep 2022 19:31:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8B=BE=E9=80=89=E5=B1=9E=E6=80=A7=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/tool/gen/editTable.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue index 5dc36c33..951497a7 100644 --- a/ruoyi-ui/src/views/tool/gen/editTable.vue +++ b/ruoyi-ui/src/views/tool/gen/editTable.vue @@ -45,22 +45,22 @@ @@ -79,7 +79,7 @@ From 3607e008a3ea45ffe3c289786214f23404eeeb81 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 28 Sep 2022 19:32:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=99=90=E6=B5=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97KEY(I5SQ09)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java index 7b8ccf1d..f06465f3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java @@ -50,7 +50,6 @@ public class RateLimiterAspect @Before("@annotation(rateLimiter)") public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable { - String key = rateLimiter.key(); int time = rateLimiter.time(); int count = rateLimiter.count(); @@ -63,7 +62,7 @@ public class RateLimiterAspect { throw new ServiceException("访问过于频繁，请稍候再试"); } - log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key); + log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), combineKey); } catch (ServiceException e) { From c542b7ac32793d0338c64e26614902cd2840e8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=9F=E6=9B=BE=E4=B8=BA=E4=BD=A0=E3=80=81=E5=83=8F?= =?UTF-8?q?=E8=B6=85=E4=BA=BA?= <1553592282@qq.com> Date: Fri, 30 Sep 2022 23:06:10 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E5=8C=85=E5=90=AB=E7=A9=BA=E5=AD=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 也曾为你、像超人 <1553592282@qq.com> --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 5 +++++ 1 file changed, 5 insertions(+) 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 da91d737..d6876412 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 @@ -699,6 +699,11 @@ public class ExcelUtil subList = getListCellValue(vo); subMergedLastRowNum = subMergedLastRowNum + subList.size(); } + else + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + } int column = 0; for (Object[] os : fields) From 4d72fb4289aef2a1b34677ac598e88f4f98e930e Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 10 Oct 2022 09:22:37 +0800 Subject: [PATCH 5/6] R isError and isSuccess static --- .../java/com/ruoyi/common/core/domain/R.java | 8 ++++---- .../com/ruoyi/common/utils/poi/ExcelUtil.java | 20 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) 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 d8774609..ef15802b 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 @@ -103,13 +103,13 @@ public class R implements Serializable this.data = data; } - public Boolean isError() + public static Boolean isError(R ret) { - return !isSuccess(); + return !isSuccess(ret); } - public Boolean isSuccess() + public static Boolean isSuccess(R ret) { - return R.SUCCESS == getCode(); + return R.SUCCESS == ret.getCode(); } } 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 d6876412..6137c869 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 @@ -694,17 +694,19 @@ public class ExcelUtil // 得到导出对象. T vo = (T) list.get(i); Collection subList = null; - if (isSubListValue(vo)) + if (isSubList()) { - subList = getListCellValue(vo); - subMergedLastRowNum = subMergedLastRowNum + subList.size(); + if (isSubListValue(vo)) + { + subList = getListCellValue(vo); + subMergedLastRowNum = subMergedLastRowNum + subList.size(); + } + else + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + } } - else - { - subMergedFirstRowNum++; - subMergedLastRowNum++; - } - int column = 0; for (Object[] os : fields) { From a32a931d2411d61f90e60181d48268417cc90d54 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 10 Oct 2022 09:22:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7core-js=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC3.25.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 9c5562bf..06c1fc03 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -39,7 +39,7 @@ "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", "clipboard": "2.0.8", - "core-js": "3.25.2", + "core-js": "3.25.3", "echarts": "4.9.0", "element-ui": "2.15.10", "file-saver": "2.0.5",