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<TenantListVo> list = StreamUtils.filter(voList, vo ->
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 8507092f6..7fb17b33a 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
@@ -27,7 +27,7 @@ import java.util.stream.IntStream;
 public class TestMapJobAnnotation {
 
     @MapExecutor
-    public ExecuteResult doJobMapExecute(MapArgs mapArgs, MapHandler mapHandler) {
+    public ExecuteResult doJobMapExecute(MapArgs mapArgs, MapHandler<List<Integer>> mapHandler) {
         // 生成1~200数值并分片
         int partitionSize = 50;
         List<List<Integer>> partition = IntStream.rangeClosed(1, 200)
@@ -42,6 +42,7 @@ public class TestMapJobAnnotation {
 
     @MapExecutor(taskName = "doCalc")
     public ExecuteResult doCalc(MapArgs mapArgs) {
+        @SuppressWarnings("unchecked")
         List<Integer> sourceList = (List<Integer>) 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 17aa9e461..c0697314b 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
@@ -29,7 +29,7 @@ import java.util.stream.IntStream;
 public class TestMapReduceAnnotation1 {
 
     @MapExecutor
-    public ExecuteResult rootMapExecute(MapArgs mapArgs, MapHandler mapHandler) {
+    public ExecuteResult rootMapExecute(MapArgs mapArgs, MapHandler<List<Integer>> mapHandler) {
         int partitionSize = 50;
         List<List<Integer>> partition = IntStream.rangeClosed(1, 200)
                 .boxed()
@@ -43,6 +43,7 @@ public class TestMapReduceAnnotation1 {
 
     @MapExecutor(taskName = "doCalc")
     public ExecuteResult doCalc(MapArgs mapArgs) {
+        @SuppressWarnings("unchecked")
         List<Integer> sourceList = (List<Integer>) mapArgs.getMapResult();
         // 遍历sourceList的每一个元素,计算出一个累加值partitionTotal
         int partitionTotal = sourceList.stream().mapToInt(i -> i).sum();
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;
                 }