Pre Merge pull request !402 from mashuo/springboot3

fix: 代码生成javax替换为jakarta
2026-01-27 04:01:56 +08:00 · 2025-12-08 14:57:46 +00:00 · 2025-03-31 01:17:21 +00:00
52 changed files with 179 additions and 581 deletions
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.7</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.6</h1>
 <h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.7-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.6-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>

--- a/docker/copy.sh
+++ b/docker/copy.sh
@@ -10,7 +10,7 @@ usage() {
 # copy sql
 echo "begin copy sql "
 cp ../sql/ry_20250523.sql ./mysql/db
-cp ../sql/ry_config_20250902.sql ./mysql/db
+cp ../sql/ry_config_20250224.sql ./mysql/db

 # copy html
 echo "begin copy html "
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi</artifactId>
-    <version>3.6.7</version>
+    <version>3.6.6</version>

    <name>ruoyi</name>
    <url>http://www.ruoyi.vip</url>
    <description>若依微服务系统</description>

    <properties>
-        <ruoyi.version>3.6.7</ruoyi.version>
+        <ruoyi.version>3.6.6</ruoyi.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>17</java.version>
@@ -24,11 +24,11 @@
        <mybatis-spring.version>3.0.3</mybatis-spring.version>
        <kaptcha.version>2.3.3</kaptcha.version>
        <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
-        <druid.version>1.2.27</druid.version>
+        <druid.version>1.2.23</druid.version>
        <dynamic-ds.version>4.3.1</dynamic-ds.version>
-        <commons.io.version>2.21.0</commons.io.version>
+        <commons.io.version>2.19.0</commons.io.version>
        <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.60</fastjson.version>
+        <fastjson.version>2.0.57</fastjson.version>
        <jjwt.version>0.9.1</jjwt.version>
        <minio.version>8.2.2</minio.version>
        <poi.version>4.1.2</poi.version>
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-api</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -114,6 +114,11 @@ public class SysUser extends BaseEntity
    }

    public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
    {
        return UserConstants.isAdmin(userId);
    }
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
@@ -3,7 +3,7 @@ package com.ruoyi.common.core.exception.file;
 import java.util.Arrays;

 /**
- * 文件上传无效扩展名异常类
+ * 文件上传 误异常类
 * 
 * @author ruoyi
 */
--- 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
@@ -1004,7 +1004,7 @@ public class ExcelUtil<T>
                String separator = attr.separator();
                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                {
-                    cell.setCellStyle(createCellStyle(cell.getCellStyle(), dateFormat));
+                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
                    cell.setCellValue(parseDateToStr(dateFormat, value));
                }
                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
@@ -1034,21 +1034,6 @@ public class ExcelUtil<T>
        return cell;
    }

-    /**
-     * 使用自定义格式，同时避免样式污染
-     * 
-     * @param cellStyle 从此样式复制
-     * @param format 格式匹配的字符串
-     * @return 格式化后CellStyle对象
-     */
-    private CellStyle createCellStyle(CellStyle cellStyle, String format)
-    {
-        CellStyle style = wb.createCellStyle();
-        style.cloneStyleFrom(cellStyle);
-        style.setDataFormat(wb.getCreationHelper().createDataFormat().getFormat(format));
-        return style;
-    }
-
    /**
     * 设置 POI XSSFSheet 单元格提示或选择框
     * 
--- a/ruoyi-common/ruoyi-common-datascope/pom.xml
+++ b/ruoyi-common/ruoyi-common-datascope/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-log/pom.xml
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-redis/pom.xml
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ b/ruoyi-common/ruoyi-common-seata/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -1,14 +1,13 @@
 package com.ruoyi.common.security.utils;

+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.model.LoginUser;
-import jakarta.servlet.http.HttpServletRequest;

 /**
 * 权限获取工具类
@@ -80,16 +79,6 @@ public class SecurityUtils
        return token;
    }

-    /**
-     * 是否为管理员
-     * 
-     * @return 结果
-     */
-    public static boolean isAdmin()
-    {
-        return isAdmin(getUserId());
-    }
-
    /**
     * 是否为管理员
     * 
@@ -98,7 +87,7 @@ public class SecurityUtils
     */
    public static boolean isAdmin(Long userId)
    {
-        return UserConstants.isAdmin(userId);
+        return userId != null && 1L == userId;
    }

    /**
--- a/ruoyi-common/ruoyi-common-sensitive/pom.xml
+++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
 	
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java
@@ -97,10 +97,6 @@ public class SysMenuController extends BaseController
        {
            return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
        }
-        else if (!menuService.checkRouteConfigUnique(menu))
-        {
-            return error("新增菜单'" + menu.getMenuName() + "'失败，路由名称或地址已存在");
-        }
        menu.setCreateBy(SecurityUtils.getUsername());
        return toAjax(menuService.insertMenu(menu));
    }
@@ -125,10 +121,6 @@ public class SysMenuController extends BaseController
        {
            return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
        }
-        else if (!menuService.checkRouteConfigUnique(menu))
-        {
-            return error("修改菜单'" + menu.getMenuName() + "'失败，路由名称或地址已存在");
-        }
        menu.setUpdateBy(SecurityUtils.getUsername());
        return toAjax(menuService.updateMenu(menu));
    }
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -235,7 +235,7 @@ public class SysUserController extends BaseController
            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
        }
        List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SecurityUtils.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        ajax.put("posts", postService.selectPostAll());
        return ajax;
    }
@@ -350,7 +350,7 @@ public class SysUserController extends BaseController
        SysUser user = userService.selectUserById(userId);
        List<SysRole> roles = roleService.selectRolesByUserId(userId);
        ajax.put("user", user);
-        ajax.put("roles", SecurityUtils.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
        return ajax;
    }

--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -122,13 +122,4 @@ public interface SysMenuMapper
     * @return 结果
     */
    public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
-
-    /**
-     * 根据路由路径或名称查询菜单信息（用于唯一性校验）
-     *
-     * @param path 路由地址
-     * @param routeName 路由名称
-     * @return 匹配的菜单列表
-     */
-    public List<SysMenu> selectMenusByPathOrRouteName(@Param("path") String path, @Param("routeName") String routeName);
 }
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
@@ -141,12 +141,4 @@ public interface ISysMenuService
     * @return 结果
     */
    public boolean checkMenuNameUnique(SysMenu menu);
-
-    /**
-     * 校验路由组合是否唯一
-     *
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public boolean checkRouteConfigUnique(SysMenu menu);
 }
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -15,6 +15,7 @@ import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.domain.vo.TreeSelect;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
@@ -189,7 +190,7 @@ public class SysDeptServiceImpl implements ISysDeptService
    @Override
    public void checkDeptDataScope(Long deptId)
    {
-        if (!SecurityUtils.isAdmin() && StringUtils.isNotNull(deptId))
+        if (!SysUser.isAdmin(SecurityUtils.getUserId()) && StringUtils.isNotNull(deptId))
        {
            SysDept dept = new SysDept();
            dept.setDeptId(deptId);
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -8,8 +8,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.constant.Constants;
@@ -17,6 +15,7 @@ import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.domain.SysMenu;
 import com.ruoyi.system.domain.vo.MetaVo;
 import com.ruoyi.system.domain.vo.RouterVo;
@@ -34,12 +33,8 @@ import com.ruoyi.system.service.ISysMenuService;
@Service
 public class SysMenuServiceImpl implements ISysMenuService
 {
-    private static final Logger log = LoggerFactory.getLogger(SysMenuServiceImpl.class);
-
    public static final String PREMISSION_STRING = "perms[\"{0}\"]";

-    public static final Long MENU_ROOT_ID = 0L;
-
    @Autowired
    private SysMenuMapper menuMapper;

@@ -72,7 +67,7 @@ public class SysMenuServiceImpl implements ISysMenuService
    {
        List<SysMenu> menuList = null;
        // 管理员显示所有菜单信息
-        if (SecurityUtils.isAdmin(userId))
+        if (SysUser.isAdmin(userId))
        {
            menuList = menuMapper.selectMenuList(menu);
        }
@@ -144,7 +139,7 @@ public class SysMenuServiceImpl implements ISysMenuService
        {
            menus = menuMapper.selectMenuTreeByUserId(userId);
        }
-        return getChildPerms(menus, MENU_ROOT_ID);
+        return getChildPerms(menus, 0);
    }

    /**
@@ -199,7 +194,7 @@ public class SysMenuServiceImpl implements ISysMenuService
                childrenList.add(children);
                router.setChildren(childrenList);
            }
-            else if (menu.getParentId().intValue() == MENU_ROOT_ID && isInnerLink(menu))
+            else if (menu.getParentId().intValue() == 0 && isInnerLink(menu))
            {
                router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
                router.setPath("/");
@@ -351,47 +346,6 @@ public class SysMenuServiceImpl implements ISysMenuService
        return UserConstants.UNIQUE;
    }

-    /**
-     * 校验路由名称是否唯一
-     *
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    @Override
-    public boolean checkRouteConfigUnique(SysMenu menu)
-    {
-        Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
-        Long parentId = menu.getParentId();
-        String path = menu.getPath();
-        String routeName = StringUtils.isEmpty(menu.getRouteName()) ? path : menu.getRouteName();
-        List<SysMenu> sysMenuList = menuMapper.selectMenusByPathOrRouteName(path, routeName);
-        for (SysMenu sysMenu : sysMenuList)
-        {
-            if (sysMenu.getMenuId().longValue() != menuId.longValue())
-            {
-                Long dbParentId = sysMenu.getParentId();
-                String dbPath = sysMenu.getPath();
-                String dbRouteName = StringUtils.isEmpty(sysMenu.getRouteName()) ? dbPath : sysMenu.getRouteName();
-                if (StringUtils.equalsAnyIgnoreCase(path, dbPath) && parentId.longValue() == dbParentId.longValue())
-                {
-                    log.warn("[同级路由冲突] 同级下已存在相同路由路径 '{}'，冲突菜单：{}", dbPath, sysMenu.getMenuName());
-                    return UserConstants.NOT_UNIQUE;
-                }
-                else if (StringUtils.equalsAnyIgnoreCase(path, dbPath) && parentId.longValue() == MENU_ROOT_ID)
-                {
-                    log.warn("[根目录路由冲突] 根目录下路由 '{}' 必须唯一，已被菜单 '{}' 占用", path, sysMenu.getMenuName());
-                    return UserConstants.NOT_UNIQUE;
-                }
-                else if (StringUtils.equalsAnyIgnoreCase(routeName, dbRouteName))
-                {
-                    log.warn("[路由名称冲突] 路由名称 '{}' 需全局唯一，已被菜单 '{}' 使用", routeName, sysMenu.getMenuName());
-                    return UserConstants.NOT_UNIQUE;
-                }
-            }
-        }
-        return UserConstants.UNIQUE;
-    }
-
    /**
     * 获取路由名称
     * 
@@ -431,12 +385,12 @@ public class SysMenuServiceImpl implements ISysMenuService
    {
        String routerPath = menu.getPath();
        // 内链打开外网方式
-        if (menu.getParentId().intValue() != MENU_ROOT_ID && isInnerLink(menu))
+        if (menu.getParentId().intValue() != 0 && isInnerLink(menu))
        {
            routerPath = innerLinkReplaceEach(routerPath);
        }
        // 非外链并且是一级目录（类型为目录）
-        if (MENU_ROOT_ID == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
+        if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
                && UserConstants.NO_FRAME.equals(menu.getIsFrame()))
        {
            routerPath = "/" + menu.getPath();
@@ -462,7 +416,7 @@ public class SysMenuServiceImpl implements ISysMenuService
        {
            component = menu.getComponent();
        }
-        else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != MENU_ROOT_ID && isInnerLink(menu))
+        else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu))
        {
            component = UserConstants.INNER_LINK;
        }
@@ -481,21 +435,10 @@ public class SysMenuServiceImpl implements ISysMenuService
     */
    public boolean isMenuFrame(SysMenu menu)
    {
-        return menu.getParentId().intValue() == MENU_ROOT_ID && UserConstants.TYPE_MENU.equals(menu.getMenuType())
+        return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
                && menu.getIsFrame().equals(UserConstants.NO_FRAME);
    }

-    /**
-     * 是否为parent_view组件
-     * 
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public boolean isParentView(SysMenu menu)
-    {
-        return menu.getParentId().intValue() != MENU_ROOT_ID && UserConstants.TYPE_DIR.equals(menu.getMenuType());
-    }
-
    /**
     * 是否为内链组件
     * 
@@ -507,6 +450,17 @@ public class SysMenuServiceImpl implements ISysMenuService
        return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath());
    }

+    /**
+     * 是否为parent_view组件
+     * 
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    public boolean isParentView(SysMenu menu)
+    {
+        return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
+    }
+
    /**
     * 根据父节点的ID获取所有子节点
     * 
@@ -514,7 +468,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     * @param parentId 传入的父节点ID
     * @return String
     */
-    public List<SysMenu> getChildPerms(List<SysMenu> list, long parentId)
+    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId)
    {
        List<SysMenu> returnList = new ArrayList<SysMenu>();
        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();)
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -15,6 +15,7 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.datascope.annotation.DataScope;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.domain.SysRoleDept;
 import com.ruoyi.system.domain.SysRoleMenu;
 import com.ruoyi.system.domain.SysUserRole;
@@ -196,7 +197,7 @@ public class SysRoleServiceImpl implements ISysRoleService
    @Override
    public void checkRoleDataScope(Long... roleIds)
    {
-        if (!SecurityUtils.isAdmin())
+        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
        {
            for (Long roleId : roleIds)
            {
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -238,7 +238,7 @@ public class SysUserServiceImpl implements ISysUserService
    @Override
    public void checkUserDataScope(Long userId)
    {
-        if (!SecurityUtils.isAdmin())
+        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
        {
            SysUser user = new SysUser();
            user.setUserId(userId);
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -130,12 +130,7 @@
 	
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
-		where menu_name= #{menuName} and parent_id = #{parentId} limit 1
-	</select>
-	
-	<select id="selectMenusByPathOrRouteName" parameterType="SysMenu" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		where menu_type in ('M', 'C') and (path = #{path} or path = #{routeName} or route_name = #{path} or route_name = #{routeName})
+		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
 	</select>
 	
 	<update id="updateMenu" parameterType="SysMenu">
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "ruoyi",
-  "version": "3.6.7",
+  "version": "3.6.6",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -130,16 +130,6 @@
  border-radius: 4px;
 }

-/* horizontal el menu */
-.el-menu--horizontal .el-menu-item .svg-icon + span,
-.el-menu--horizontal .el-submenu__title .svg-icon + span {
-  margin-left: 3px;
-}
-
-.el-menu--horizontal .el-menu--popup {
-  min-width: 120px !important;
-}
-
@media (max-width: 768px) {
  .pagination-container .el-pagination > .el-pagination__jump {
    display: none !important;
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -61,7 +61,7 @@
    }

    .svg-icon {
-      margin-right: 10px !important;
+      margin-right: 16px;
    }

    .el-menu {
@@ -116,17 +116,15 @@
      margin-left: 54px;
    }

-    .el-menu:not(.el-menu--horizontal) {
-      .submenu-title-noDropdown {
+    .submenu-title-noDropdown {
+      padding: 0 !important;
+      position: relative;
+
+      .el-tooltip {
        padding: 0 !important;
-        position: relative;

-        .el-tooltip {
-          padding: 0 !important;
-
-          .svg-icon {
-            margin-left: 20px;
-          }
+        .svg-icon {
+          margin-left: 20px;
        }
      }
    }
--- a/ruoyi-ui/src/components/Breadcrumb/index.vue
+++ b/ruoyi-ui/src/components/Breadcrumb/index.vue
@@ -94,6 +94,7 @@ export default {
  display: inline-block;
  font-size: 14px;
  line-height: 50px;
+  margin-left: 8px;
  .no-redirect {
    color: #97a8be;
    cursor: text;
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div>
    <template v-for="(item, index) in options">
-      <template v-if="isValueMatch(item.value)">
+      <template v-if="values.includes(item.value)">
        <span
          v-if="(item.raw.listClass == 'default' || item.raw.listClass == '') && (item.raw.cssClass == '' || item.raw.cssClass == null)"
          :key="item.value"
@@ -36,6 +36,7 @@ export default {
      default: null,
    },
    value: [Number, String, Array],
+    // 当未找到匹配的数据时，显示value
    showValue: {
      type: Boolean,
      default: true,
@@ -53,7 +54,6 @@ export default {
  computed: {
    values() {
      if (this.value === null || typeof this.value === 'undefined' || this.value === '') return []
-      if (typeof this.value === 'number' || typeof this.value === 'boolean') return [this.value]
      return Array.isArray(this.value) ? this.value.map(item => '' + item) : String(this.value).split(this.separator)
    },
    unmatch() {
@@ -63,18 +63,14 @@ export default {
      // 传入值为数组
      let unmatch = false // 添加一个标志来判断是否有未匹配项
      this.values.forEach(item => {
-        if (!this.options.some(v => v.value == item)) {
+        if (!this.options.some(v => v.value === item)) {
          this.unmatchArray.push(item)
          unmatch = true // 如果有未匹配项，将标志设置为true
        }
      })
      return unmatch // 返回标志的值
    },
-  },
-  methods: {
-    isValueMatch(itemValue) {
-      return this.values.some(val => val == itemValue)
-    }
+
  },
  filters: {
    handleArray(array) {
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -162,7 +162,7 @@ export default {
        this.$store.dispatch('app/toggleSideBarHide', true)
      }
    }
-  }
+  },
 }
 </script>

@@ -171,7 +171,7 @@ export default {
  float: left;
  height: 50px !important;
  line-height: 50px !important;
-  color: #303133 !important;
+  color: #999093 !important;
  padding: 0 5px !important;
  margin: 0 10px !important;
 }
@@ -186,7 +186,7 @@ export default {
  float: left;
  height: 50px !important;
  line-height: 50px !important;
-  color: #303133 !important;
+  color: #999093 !important;
  padding: 0 5px !important;
  margin: 0 10px !important;
 }
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -80,39 +80,6 @@ export default {
    min-height: 0px;
  }
 }
-
-/* 移动端fixed-header优化 */
-@media screen and (max-width: 991px) {
-  .fixed-header + .app-main {
-    padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
-    padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
-    overscroll-behavior-y: none;
-  }
-
-  .hasTagsView .fixed-header + .app-main {
-    padding-bottom: max(60px, calc(constant(safe-area-inset-bottom) + 40px));
-    padding-bottom: max(60px, calc(env(safe-area-inset-bottom) + 40px));
-    overscroll-behavior-y: none;
-  }
-}
-
-@supports (-webkit-touch-callout: none) {
-  @media screen and (max-width: 991px) {
-    .fixed-header + .app-main {
-      padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
-      padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
-      height: calc(100svh - 50px);
-      height: calc(100dvh - 50px);
-    }
-
-    .hasTagsView .fixed-header + .app-main {
-      padding-bottom: max(17px, calc(constant(safe-area-inset-bottom) + 10px));
-      padding-bottom: max(17px, calc(env(safe-area-inset-bottom) + 10px));
-      height: calc(100svh - 84px);
-      height: calc(100dvh - 84px);
-    }
-  }
-}
 </style>

 <style lang="scss">
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -1,13 +1,10 @@
 <template>
-  <div class="navbar" :class="'nav' + navType">
+  <div class="navbar">
    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />

-    <breadcrumb v-if="navType == 1" id="breadcrumb-container" class="breadcrumb-container" />
-    <top-nav v-if="navType == 2" id="topmenu-container" class="topmenu-container" />
-    <template v-if="navType == 3">
-      <logo v-show="showLogo" :collapse="false"></logo>
-      <top-bar id="topbar-container" class="topbar-container" />
-    </template>
+    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
+    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
+
    <div class="right-menu">
      <template v-if="device!=='mobile'">
        <search id="header-search" class="right-menu-item" />
@@ -53,8 +50,6 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
-import TopBar from './TopBar'
-import Logo from './Sidebar/Logo'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
@@ -66,9 +61,7 @@ export default {
  emits: ['setLayout'],
  components: {
    Breadcrumb,
-    Logo,
    TopNav,
-    TopBar,
    Hamburger,
    Screenfull,
    SizeSelect,
@@ -88,14 +81,9 @@ export default {
        return this.$store.state.settings.showSettings
      }
    },
-    navType: {
+    topNav: {
      get() {
-        return this.$store.state.settings.navType
-      }
-    },
-    showLogo: {
-      get() {
-        return this.$store.state.settings.sidebarLogo
+        return this.$store.state.settings.topNav
      }
    }
  },
@@ -122,33 +110,20 @@ export default {
 </script>

 <style lang="scss" scoped>
-.navbar.nav3 {
-  .hamburger-container {
-    display: none !important;
-  }
-}
-
 .navbar {
  height: 50px;
  overflow: hidden;
  position: relative;
  background: #fff;
  box-shadow: 0 1px 4px rgba(0,21,41,.08);
-  display: flex;
-  align-items: center;
-  // padding: 0 8px;
-  box-sizing: border-box;

  .hamburger-container {
    line-height: 46px;
    height: 100%;
+    float: left;
    cursor: pointer;
    transition: background .3s;
    -webkit-tap-highlight-color:transparent;
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    margin-right: 8px;

    &:hover {
      background: rgba(0, 0, 0, .025)
@@ -156,7 +131,7 @@ export default {
  }

  .breadcrumb-container {
-    flex-shrink: 0;
+    float: left;
  }

  .topmenu-container {
@@ -164,26 +139,15 @@ export default {
    left: 50px;
  }

-  .topbar-container {
-    flex: 1;
-    min-width: 0;
-    display: flex;
-    align-items: center;
-    overflow: hidden;
-    margin-left: 8px;
-  }
-
  .errLog-container {
    display: inline-block;
    vertical-align: top;
  }

  .right-menu {
+    float: right;
    height: 100%;
    line-height: 50px;
-    display: flex;
-    align-items: center;
-    margin-left: auto;

    &:focus {
      outline: none;
--- a/ruoyi-ui/src/layout/components/Settings/index.vue
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -3,27 +3,6 @@
    <div class="drawer-container">
      <div>
        <div class="setting-drawer-content">
-          <div class="setting-drawer-title">
-            <h3 class="drawer-title">菜单导航设置</h3>
-          </div>
-          <div class="nav-wrap">
-            <el-tooltip content="左侧菜单" placement="bottom">
-              <div class="item left" @click="handleNavType(1)" :style="{'--theme': theme}" :class="{ activeItem: navType == 1 }">
-                <b></b><b></b>
-              </div>
-            </el-tooltip>
-
-            <el-tooltip content="混合菜单" placement="bottom">
-              <div class="item mix" @click="handleNavType(2)" :style="{'--theme': theme}" :class="{ activeItem: navType == 2 }">
-                <b></b><b></b>
-              </div>
-            </el-tooltip>
-            <el-tooltip content="顶部菜单" placement="bottom">
-              <div class="item top" @click="handleNavType(3)" :style="{'--theme': theme}" :class="{ activeItem: navType == 3 }">
-                <b></b><b></b>
-              </div>
-            </el-tooltip>
-          </div>
          <div class="setting-drawer-title">
            <h3 class="drawer-title">主题风格设置</h3>
          </div>
@@ -60,6 +39,11 @@

        <h3 class="drawer-title">系统布局配置</h3>

+        <div class="drawer-item">
+          <span>开启 TopNav</span>
+          <el-switch v-model="topNav" class="drawer-switch" />
+        </div>
+
        <div class="drawer-item">
          <span>开启 Tags-Views</span>
          <el-switch v-model="tagsView" class="drawer-switch" />
@@ -109,7 +93,6 @@ export default {
    return {
      theme: this.$store.state.settings.theme,
      sideTheme: this.$store.state.settings.sideTheme,
-      navType: this.$store.state.settings.navType,
      showSettings: false
    }
  },
@@ -125,6 +108,21 @@ export default {
        })
      }
    },
+    topNav: {
+      get() {
+        return this.$store.state.settings.topNav
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'topNav',
+          value: val
+        })
+        if (!val) {
+          this.$store.dispatch('app/toggleSideBarHide', false)
+          this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes)
+        }
+      }
+    },
    tagsView: {
      get() {
        return this.$store.state.settings.tagsView
@@ -182,25 +180,6 @@ export default {
      }
    }
  },
-  watch: {
-    navType: {
-      handler(val) {
-        if (val == 1) {
-          this.$store.dispatch("app/toggleSideBarHide", false)
-        }
-        if (val == 2) {
-        }
-        if (val == 3) {
-          this.$store.dispatch("app/toggleSideBarHide", true)
-        }
-        if ([1, 3].includes(val)) {
-          this.$store.commit("SET_SIDEBAR_ROUTERS",this.$store.state.permission.defaultRoutes)
-        }
-      },
-      immediate: true,
-      deep: true
-    }
-  },
  methods: {
    themeChange(val) {
      this.$store.dispatch('settings/changeSetting', {
@@ -216,13 +195,6 @@ export default {
      })
      this.sideTheme = val
    },
-    handleNavType(val) {
-      this.$store.dispatch('settings/changeSetting', {
-        key: 'navType',
-        value: val
-      })
-      this.navType = val
-    },
    openSetting() {
      this.showSettings = true
    },
@@ -234,7 +206,7 @@ export default {
      this.$cache.local.set(
        "layout-setting",
        `{
-            "navType":${this.navType},
+            "topNav":${this.topNav},
            "tagsView":${this.tagsView},
            "tagsIcon":${this.tagsIcon},
            "fixedHeader":${this.fixedHeader},
@@ -257,133 +229,70 @@ export default {
 </script>

 <style lang="scss" scoped>
-.setting-drawer-content {
-  .setting-drawer-title {
-    margin-bottom: 12px;
-    color: rgba(0, 0, 0, .85);
-    font-size: 14px;
-    line-height: 22px;
-    font-weight: bold;
-  }
+  .setting-drawer-content {
+    .setting-drawer-title {
+      margin-bottom: 12px;
+      color: rgba(0, 0, 0, .85);
+      font-size: 14px;
+      line-height: 22px;
+      font-weight: bold;
+    }

-  .setting-drawer-block-checbox {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin-top: 10px;
-    margin-bottom: 20px;
+    .setting-drawer-block-checbox {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      margin-top: 10px;
+      margin-bottom: 20px;

-    .setting-drawer-block-checbox-item {
-      position: relative;
-      margin-right: 16px;
-      border-radius: 2px;
-      cursor: pointer;
+      .setting-drawer-block-checbox-item {
+        position: relative;
+        margin-right: 16px;
+        border-radius: 2px;
+        cursor: pointer;

-      img {
-        width: 48px;
-        height: 48px;
-      }
+        img {
+          width: 48px;
+          height: 48px;
+        }

-      .setting-drawer-block-checbox-selectIcon {
-        position: absolute;
-        top: 0;
-        right: 0;
-        width: 100%;
-        height: 100%;
-        padding-top: 15px;
-        padding-left: 24px;
-        color: #1890ff;
-        font-weight: 700;
-        font-size: 14px;
+        .setting-drawer-block-checbox-selectIcon {
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 100%;
+          height: 100%;
+          padding-top: 15px;
+          padding-left: 24px;
+          color: #1890ff;
+          font-weight: 700;
+          font-size: 14px;
+        }
      }
    }
  }
-}

-.drawer-container {
-  padding: 20px;
-  font-size: 14px;
-  line-height: 1.5;
-  word-wrap: break-word;
-
-  .drawer-title {
-    margin-bottom: 12px;
-    color: rgba(0, 0, 0, .85);
+  .drawer-container {
+    padding: 20px;
    font-size: 14px;
-    line-height: 22px;
-  }
+    line-height: 1.5;
+    word-wrap: break-word;

-  .drawer-item {
-    color: rgba(0, 0, 0, .65);
-    font-size: 14px;
-    padding: 12px 0;
-  }
-
-  .drawer-switch {
-    float: right
-  }
-}
-
-// 导航模式
-.nav-wrap {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  margin-top: 10px;
-  margin-bottom: 20px;
-
-  .activeItem {
-    border: 2px solid #{'var(--theme)'} !important;
-  }
-
-  .item {
-    position: relative;
-    margin-right: 16px;
-    cursor: pointer;
-    width: 56px;
-    height: 48px;
-    border-radius: 4px;
-    background: #f0f2f5;
-    border: 2px solid transparent;
-  }
-
-  .left {
-    b:first-child {
-      display: block;
-      height: 30%;
-      background: #fff;
+    .drawer-title {
+      margin-bottom: 12px;
+      color: rgba(0, 0, 0, .85);
+      font-size: 14px;
+      line-height: 22px;
    }
-    b:last-child {
-      width: 30%;
-      background: #1b2a47;
-      position: absolute;
-      height: 100%;
-      top: 0;
-      border-radius: 4px 0 0 4px;
+
+    .drawer-item {
+      color: rgba(0, 0, 0, .65);
+      font-size: 14px;
+      padding: 12px 0;
+    }
+
+    .drawer-switch {
+      float: right
    }
  }
-  .mix {
-    b:first-child {
-      border-radius: 4px 4px 0 0;
-      display: block;
-      height: 30%;
-      background: #1b2a47;
-    }
-    b:last-child {
-      width: 30%;
-      background: #1b2a47;
-      position: absolute;
-      height: 70%;
-      border-radius: 0 0 0 4px;
-    }
-  }
-  .top {
-    b:first-child {
-      display: block;
-      height: 30%;
-      background: #1b2a47;
-      border-radius: 4px 4px 0 0;
-    }
-  }
-}
 </style>
--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -1,13 +1,13 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' && navType !== 3 ? variables.menuBackground : variables.menuLightBackground }">
+  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
    <transition name="sidebarLogoFade">
      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' && navType !== 3 ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
      </router-link>
      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' && navType !== 3 ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
      </router-link>
    </transition>
  </div>
@@ -31,9 +31,6 @@ export default {
    },
    sideTheme() {
      return this.$store.state.settings.sideTheme
-    },
-    navType() {
-      return this.$store.state.settings.navType
    }
  },
  data() {
@@ -57,6 +54,7 @@ export default {

 .sidebar-logo-container {
  position: relative;
+  width: 100%;
  height: 50px;
  line-height: 50px;
  background: #2b2f3a;
--- a/ruoyi-ui/src/layout/components/TopBar/index.vue
+++ b/ruoyi-ui/src/layout/components/TopBar/index.vue
@@ -1,98 +0,0 @@
-<template>
-  <el-menu class="topbar-menu" :default-active="activeMenu" :active-text-color="theme" mode="horizontal">
-    <sidebar-item :key="route.path + index" v-for="(route, index) in topMenus" :item="route" :base-path="route.path" />
-
-    <el-submenu index="more" class="el-submenu__hide-arrow" v-if="moreRoutes.length > 0">
-      <template slot="title">更多菜单</template>
-      <sidebar-item :key="route.path + index" v-for="(route, index) in moreRoutes" :item="route" :base-path="route.path" />
-    </el-submenu>
-  </el-menu>
-</template>
-
-<script>
-import SidebarItem from '../Sidebar/SidebarItem'
-
-export default {
-  components: { SidebarItem },
-  data() {
-    return {
-      // 顶部栏初始数
-      visibleNumber: 5
-    }
-  },
-  computed: {
-    theme() {
-      return this.$store.state.settings.theme
-    },
-    topMenus() {
-      return this.$store.state.permission.sidebarRouters.filter((f) => !f.hidden).slice(0, this.visibleNumber)
-    },
-    moreRoutes() {
-      const sidebarRouters = this.$store.state.permission.sidebarRouters;
-      return sidebarRouters.filter((f) => !f.hidden).slice(this.visibleNumber, sidebarRouters.length - this.visibleNumber)
-    },
-    // 默认激活的菜单
-    activeMenu() {
-      const { meta, path } = this.$route
-      if (meta.activeMenu) {
-        return meta.activeMenu
-      }
-      return path
-    },
-  },
-  beforeMount() {
-    window.addEventListener('resize', this.setVisibleNumber)
-  },
-  beforeDestroy() {
-    window.removeEventListener('resize', this.setVisibleNumber)
-  },
-  mounted() {
-    this.setVisibleNumber()
-  },
-  methods: {
-    // 根据宽度计算设置显示栏数
-    setVisibleNumber() {
-      const width = document.body.getBoundingClientRect().width / 3
-      this.visibleNumber = parseInt(width / 85)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-/* menu item */
-.topbar-menu.el-menu--horizontal .el-submenu__title, .topbar-menu.el-menu--horizontal .el-menu-item {
-  padding: 0 10px !important;
-}
-
-.el-menu--horizontal .el-menu--popup .el-menu-item:hover {
-  background-color: #f5f7fa !important;
-}
-
-/* submenu item */
-.topbar-menu.el-menu--horizontal > .el-submenu .el-submenu__title {
-  float: left;
-  height: 47px !important;
-  line-height: 50px !important;
-  color: #303133;
-  margin: 0 15px !important;
-}
-
-/* topbar more arrow */ 
-.topbar-menu .el-submenu .el-submenu__icon-arrow {
-  position: static;
-  vertical-align: middle;
-  margin-left: 8px;
-  margin-top: 0px;
-}
-
-/* menu__title el-menu-item */
-.topbar-menu.el-menu--horizontal .el-submenu__title, .topbar-menu.el-menu--horizontal .el-menu-item {
-  height: 55px;
-}
-
-.el-menu--horizontal .el-menu .el-menu-item, .el-menu--horizontal .el-menu .el-submenu__title{
-  color: #303133;
-}
-</style>
-
--- a/ruoyi-ui/src/settings.js
+++ b/ruoyi-ui/src/settings.js
@@ -15,9 +15,9 @@ module.exports = {
  showSettings: true,

  /**
-   * 菜单导航模式 1、纯左侧 2、混合（左侧+顶部） 3、纯顶部
+   * 是否显示顶部导航
   */
-  navType: 1,
+  topNav: false,

  /**
   * 是否显示 tagsView
@@ -32,7 +32,7 @@ module.exports = {
  /**
   * 是否固定头部
   */
-  fixedHeader: true,
+  fixedHeader: false,

  /**
   * 是否显示logo
@@ -52,5 +52,5 @@ module.exports = {
  /**
   * 底部版权文本内容
   */
-  footerContent: 'Copyright © 2018-2026 RuoYi. All Rights Reserved.'
+  footerContent: 'Copyright © 2018-2025 RuoYi. All Rights Reserved.'
 }
--- a/ruoyi-ui/src/store/modules/settings.js
+++ b/ruoyi-ui/src/store/modules/settings.js
@@ -1,7 +1,7 @@
 import defaultSettings from '@/settings'
 import { useDynamicTitle } from '@/utils/dynamicTitle'

-const { sideTheme, showSettings, navType, tagsView, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings
+const { sideTheme, showSettings, topNav, tagsView, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings

 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
@@ -9,7 +9,7 @@ const state = {
  theme: storageSetting.theme || '#409EFF',
  sideTheme: storageSetting.sideTheme || sideTheme,
  showSettings: showSettings,
-  navType: storageSetting.navType === undefined ? navType : storageSetting.navType,
+  topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
  tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
  tagsIcon: storageSetting.tagsIcon === undefined ? tagsIcon : storageSetting.tagsIcon,
  fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -26,8 +26,6 @@ service.interceptors.request.use(config => {
  const isToken = (config.headers || {}).isToken === false
  // 是否需要防止数据重复提交
  const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
-  // 间隔时间(ms)，小于此时间视为重复提交
-  const interval = (config.headers || {}).interval || 1000
  if (getToken() && !isToken) {
    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
  }
@@ -57,6 +55,7 @@ service.interceptors.request.use(config => {
      const s_url = sessionObj.url                  // 请求地址
      const s_data = sessionObj.data                // 请求数据
      const s_time = sessionObj.time                // 请求时间
+      const interval = 1000                         // 间隔时间(ms)，小于此时间视为重复提交
      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
        const message = '数据正在处理，请勿重复提交'
        console.warn(`[${s_url}]: ` + message)
@@ -116,7 +115,7 @@ service.interceptors.response.use(res => {
    } else if (message.includes("timeout")) {
      message = "系统接口请求超时"
    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.slice(-3) + "异常"
+      message = "系统接口" + message.substr(message.length - 3) + "异常"
    }
    Message({ message: message, type: 'error', duration: 5 * 1000 })
    return Promise.reject(error)
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -108,37 +108,6 @@
            <span>更新日志</span>
          </div>
          <el-collapse accordion>
-            <el-collapse-item title="v3.6.7 - 2025-12-22">
-              <ol>
-                <li>支持防盗链功能</li>
-                <li>菜单导航设置支持纯顶部</li>
-                <li>用户头像更换后移除旧头像文件</li>
-                <li>支持Excel导出对象的多个子列表</li>
-                <li>升级druid到最新版本1.2.27</li>
-                <li>升级fastjson到最新版2.0.60</li>
-                <li>升级tomcat到最新版本9.0.112</li>
-                <li>升级commons.io到最新版本2.21.0</li>
-                <li>用户导入添加验证提示</li>
-                <li>显示列信息支持对象格式</li>
-                <li>网页标题设置新增SET_TITLE方法</li>
-                <li>自动识别json对象白名单配置范围缩小</li>
-                <li>登录/注册页面底部版权信息修改为读取配置</li>
-                <li>修复用户归属部门无法修改为空问题</li>
-                <li>修复固定头部时出现的导航栏偏移问题</li>
-                <li>修复v3时间控件between选择后清空报错问题</li>
-                <li>修复comboReadDict属性下多个sheet出现的报错</li>
-                <li>修复表单构建移除所有控件后切换路由回来空白问题</li>
-                <li>优化布局设置显示</li>
-                <li>优化字典组件值宽松匹配</li>
-                <li>优化生成代码下载的zip文件名</li>
-                <li>优化日志记录参数拼装提升效率</li>
-                <li>优化导入文件检查标题行不能为空</li>
-                <li>优化表单构建关闭页签销毁复制插件</li>
-                <li>优化Excel统计行数值的单元格样式显示</li>
-                <li>优化数据权限控制逻辑，放开permission限制</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
            <el-collapse-item title="v3.6.6 - 2025-05-30">
              <ol>
                <li>优化菜单搜索查询页</li>
@@ -987,7 +956,7 @@ export default {
  data() {
    return {
      // 版本号
-      version: "3.6.7"
+      version: "3.6.6"
    }
  },
  methods: {
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-visual</artifactId>
-        <version>3.6.7</version>
+        <version>3.6.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
mashuo	4715e84be4	Pre Merge pull request !402 from mashuo/springboot3	2025-12-08 14:57:46 +00:00
mashuo	245e0b76f9	fix: 代码生成javax替换为jakarta	2025-03-31 01:17:21 +00:00