From ce30aba0496cf221f4b2beadd18b21e0bd27e147 Mon Sep 17 00:00:00 2001 From: Kayleigh Wang <2273852548@qq.com> Date: Sat, 28 Feb 2026 20:27:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E8=A7=A3=E5=86=B3=20Maven=20?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=97=B6=E7=9A=84=20unchecked=20=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=20fix=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=BC=83=E7=94=A8=20API=20=E5=AF=BC=E8=87=B4=E7=9A=84=E6=89=93?= =?UTF-8?q?=E5=8C=85=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/web/controller/AuthController.java | 4 ++-- .../dromara/common/mybatis/helper/DataPermissionHelper.java | 2 +- .../org/dromara/common/satoken/core/dao/PlusSaTokenDao.java | 2 +- .../java/org/dromara/common/satoken/utils/LoginHelper.java | 4 ++-- .../java/org/dromara/common/web/core/I18nLocaleResolver.java | 3 ++- .../java/org/dromara/job/snailjob/TestMapJobAnnotation.java | 3 ++- .../org/dromara/job/snailjob/TestMapReduceAnnotation1.java | 3 ++- .../dromara/workflow/service/impl/FlwNodeExtServiceImpl.java | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index c448a60d3..405903af0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -229,9 +229,9 @@ public class AuthController { String referer = request.getHeader("referer"); if (StringUtils.isNotBlank(referer)) { // 这里从referer中取值是为了本地使用hosts添加虚拟域名，方便本地环境调试 - host = referer.split("//")[1].split("/")[0]; + host = new java.net.URI(referer).getHost(); } else { - host = new URL(request.getRequestURL().toString()).getHost(); + host = new java.net.URI(request.getRequestURL().toString()).getHost(); } // 根据域名进行筛选 List list = StreamUtils.filter(voList, vo -> diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java index 8963648c0..76cfd2ad9 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java @@ -23,7 +23,7 @@ import java.util.function.Supplier; * @version 3.5.0 */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -@SuppressWarnings("unchecked cast") +@SuppressWarnings("unchecked") public class DataPermissionHelper { private static final String DATA_PERMISSION_KEY = "data:permission"; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java index 14abf896a..09f82324e 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java @@ -113,7 +113,7 @@ public class PlusSaTokenDao implements SaTokenDaoBySessionFollowObject { * @param key 键名称 * @return object */ - @SuppressWarnings("unchecked cast") + @SuppressWarnings("unchecked") @Override public T getObject(String key, Class classType) { Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key)); diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java index 730bae29d..38a367a16 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java @@ -63,7 +63,7 @@ public class LoginHelper { /** * 获取用户(多级缓存) */ - @SuppressWarnings("unchecked cast") + @SuppressWarnings("unchecked") public static T getLoginUser() { SaSession session = StpUtil.getTokenSession(); if (ObjectUtil.isNull(session)) { @@ -75,7 +75,7 @@ public class LoginHelper { /** * 获取用户基于token */ - @SuppressWarnings("unchecked cast") + @SuppressWarnings("unchecked") public static T getLoginUser(String token) { SaSession session = StpUtil.getTokenSessionByToken(token); if (ObjectUtil.isNull(session)) { diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java index 98ddd06b5..41fe4276c 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java @@ -19,7 +19,8 @@ public class I18nLocaleResolver implements LocaleResolver { Locale locale = Locale.getDefault(); if (language != null && language.length() > 0) { String[] split = language.split("_"); - locale = new Locale(split[0], split[1]); + String languageTag = String.join("-", split); + locale = Locale.forLanguageTag(languageTag); } return locale; } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java index f58d7724a..58fc1a745 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public class TestMapJobAnnotation { @MapExecutor - public ExecuteResult doJobMapExecute(MapArgs mapArgs, MapHandler mapHandler) { + public ExecuteResult doJobMapExecute(MapArgs mapArgs, MapHandler> mapHandler) { // 生成1~200数值并分片 int partitionSize = 50; List> partition = IntStream.rangeClosed(1, 200) @@ -41,6 +41,7 @@ public class TestMapJobAnnotation { @MapExecutor(taskName = "doCalc") public ExecuteResult doCalc(MapArgs mapArgs) { + @SuppressWarnings("unchecked") List sourceList = (List) mapArgs.getMapResult(); // 遍历sourceList的每一个元素,计算出一个累加值partitionTotal int partitionTotal = sourceList.stream().mapToInt(i -> i).sum(); diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java index f926016f9..ed12f2896 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java @@ -28,7 +28,7 @@ import java.util.stream.IntStream; public class TestMapReduceAnnotation1 { @MapExecutor - public ExecuteResult rootMapExecute(MapArgs mapArgs, MapHandler mapHandler) { + public ExecuteResult rootMapExecute(MapArgs mapArgs, MapHandler> mapHandler) { int partitionSize = 50; List> partition = IntStream.rangeClosed(1, 200) .boxed() @@ -42,6 +42,7 @@ public class TestMapReduceAnnotation1 { @MapExecutor(taskName = "doCalc") public ExecuteResult doCalc(MapArgs mapArgs) { + @SuppressWarnings("unchecked") List sourceList = (List) mapArgs.getMapResult(); // 遍历sourceList的每一个元素,计算出一个累加值partitionTotal int partitionTotal = sourceList.stream().mapToInt(i -> i).sum(); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java index ce845dc45..8e398692c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java @@ -102,7 +102,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService * @param sources 数据来源（枚举类或字典类型） * @return 构建的 `NodeExt` 对象 */ - @SuppressWarnings("unchecked cast") + @SuppressWarnings("unchecked") private NodeExt buildNodeExt(String code, String name, int type, List sources) { NodeExt nodeExt = new NodeExt(); nodeExt.setCode(code); From c53680876538ffd67d8601f64c8202d89f20e46a Mon Sep 17 00:00:00 2001 From: Kayleigh Wang <2273852548@qq.com> Date: Sun, 1 Mar 2026 14:09:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/service/impl/SysMenuServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java index 0c69b1f3f..d7226e8cc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java @@ -394,7 +394,7 @@ public class SysMenuServiceImpl implements ISysMenuService { log.warn("[根目录路由冲突] 根目录下路由 '{}' 必须唯一，已被菜单 '{}' 占用", path, sysMenu.getMenuName()); return false; } else if (StringUtils.equalsAnyIgnoreCase(routeName, dbRouteName) - && sysMenu.getMenuType().equals(menu.getMenuType())) { + && sysMenu.getMenuType().equals(menu.getMenuType()) && parentId.equals(dbParentId)) { log.warn("[路由名称冲突] 路由名称 '{}' 需全局唯一，已被菜单 '{}' 使用", routeName, sysMenu.getMenuName()); return false; }