Pre Merge pull request !403 from zhoudev/N/A

update ruoyi-gateway/src/main/resources/bootstrap.yml.
Signed-off-by: zhoudev <15321072+zhoudev@user.noreply.gitee.com>
2026-01-26 19:51:56 +08:00 · 2025-11-13 03:59:02 +00:00 · 2025-04-23 02:56:07 +00:00
52 changed files with 223 additions and 588 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>1.8</java.version>
@@ -24,18 +24,18 @@
        <tobato.version>1.27.2</tobato.version>
        <kaptcha.version>2.3.3</kaptcha.version>
        <pagehelper.boot.version>2.0.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>
        <springdoc.version>1.6.9</springdoc.version>
        <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
        <!-- override dependency version -->
-        <tomcat.version>9.0.112</tomcat.version>
+        <tomcat.version>9.0.108</tomcat.version>
        <logback.version>1.2.13</logback.version>
        <spring-framework.version>5.3.39</spring-framework.version>
    </properties>
--- 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-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/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -87,16 +87,6 @@ public class Constants
     */
    public static final String LOGIN_FAIL = "Error";

-    /**
-     * 所有权限标识
-     */
-    public static final String ALL_PERMISSION = "*:*:*";
-
-    /**
-     * 管理员角色权限标识
-     */
-    public static final String SUPER_ADMIN = "admin";
-
    /**
     * 当前记录起始索引
     */
--- 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
@@ -147,12 +147,12 @@ public class ExcelUtil<T>
    /**
     * 对象的子列表方法
     */
-    private Map<String, Method> subMethods;
+    private Method subMethod;

    /**
     * 对象的子列表属性
     */
-    private Map<String, List<Field>> subFieldsMap;
+    private List<Field> subFields;

    /**
     * 统计列表
@@ -225,10 +225,7 @@ public class ExcelUtil<T>
            int titleLastCol = this.fields.size() - 1;
            if (isSubList())
            {
-                for (List<Field> currentSubFields : subFieldsMap.values())
-                {
-                    titleLastCol = titleLastCol + currentSubFields.size() - 1;
-                }
+                titleLastCol = titleLastCol + subFields.size() - 1;
            }
            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
            titleRow.setHeightInPoints(30);
@@ -248,17 +245,16 @@ public class ExcelUtil<T>
        {
            Row subRow = sheet.createRow(rownum);
            int column = 0;
+            int subFieldSize = subFields != null ? subFields.size() : 0;
            for (Object[] objects : fields)
            {
                Field field = (Field) objects[0];
                Excel attr = (Excel) objects[1];
-                CellStyle cellStyle = styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()));
                if (Collection.class.isAssignableFrom(field.getType()))
                {
                    Cell cell = subRow.createCell(column);
                    cell.setCellValue(attr.name());
-                    cell.setCellStyle(cellStyle);
-                    int subFieldSize = subFieldsMap != null ? subFieldsMap.get(field.getName()).size() : 0;
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
                    if (subFieldSize > 1)
                    {
                        CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
@@ -270,7 +266,7 @@ public class ExcelUtil<T>
                {
                    Cell cell = subRow.createCell(column++);
                    cell.setCellValue(attr.name());
-                    cell.setCellStyle(cellStyle);
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
                }
            }
            rownum++;
@@ -342,11 +338,7 @@ public class ExcelUtil<T>
            Map<String, Integer> cellMap = new HashMap<String, Integer>();
            // 获取表头
            Row heard = sheet.getRow(titleNum);
-            if (heard == null)
-            {
-                throw new UtilException("文件标题行为空，请检查Excel文件格式");
-            }
-            for (int i = 0; i < heard.getLastCellNum(); i++)
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
            {
                Cell cell = heard.getCell(i);
                if (StringUtils.isNotNull(cell))
@@ -354,6 +346,10 @@ public class ExcelUtil<T>
                    String value = this.getCellValue(heard, i).toString();
                    cellMap.put(value, i);
                }
+                else
+                {
+                    cellMap.put(null, i);
+                }
            }
            // 有数据时才处理 得到类的所有field.
            List<Object[]> fields = this.getFields();
@@ -566,8 +562,7 @@ public class ExcelUtil<T>
                Excel excel = (Excel) os[1];
                if (Collection.class.isAssignableFrom(field.getType()))
                {
-                    List<Field> currentSubFields = subFieldsMap.get(field.getName());
-                    for (Field subField : currentSubFields)
+                    for (Field subField : subFields)
                    {
                        Excel subExcel = subField.getAnnotation(Excel.class);
                        this.createHeadCell(subExcel, row, column++);
@@ -580,7 +575,7 @@ public class ExcelUtil<T>
            }
            if (Type.EXPORT.equals(type))
            {
-                fillExcelData(index);
+                fillExcelData(index, row);
                addStatisticsRow();
            }
        }
@@ -590,9 +585,10 @@ public class ExcelUtil<T>
     * 填充excel数据
     * 
     * @param index 序号
+     * @param row 单元格行
     */
    @SuppressWarnings("unchecked")
-    public void fillExcelData(int index)
+    public void fillExcelData(int index, Row row)
    {
        int startNo = index * sheetSize;
        int endNo = Math.min(startNo + sheetSize, list.size());
@@ -600,7 +596,7 @@ public class ExcelUtil<T>

        for (int i = startNo; i < endNo; i++)
        {
-            Row row = sheet.createRow(currentRowNum);
+            row = sheet.createRow(currentRowNum);
            T vo = (T) list.get(i);
            int column = 0;
            int maxSubListSize = getCurrentMaxSubListSize(vo);
@@ -613,7 +609,6 @@ public class ExcelUtil<T>
                    try
                    {
                        Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);
-                        List<Field> currentSubFields = subFieldsMap.get(field.getName());
                        if (subList != null && !subList.isEmpty())
                        {
                            int subIndex = 0;
@@ -626,15 +621,15 @@ public class ExcelUtil<T>
                                }

                                int subColumn = column;
-                                for (Field subField : currentSubFields)
+                                for (Field subField : subFields)
                                {
                                    Excel subExcel = subField.getAnnotation(Excel.class);
                                    addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
                                }
                                subIndex++;
                            }
+                            column += subFields.size();
                        }
-                        column += currentSubFields.size();
                    }
                    catch (Exception e)
                    {
@@ -987,7 +982,7 @@ public class ExcelUtil<T>
            {
                // 创建cell
                cell = row.createCell(column);
-                if (isSubListValue(vo) && getListCellValue(vo) > 1 && attr.needMerge())
+                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
                {
                    if (subMergedLastRowNum >= subMergedFirstRowNum)
                    {
@@ -1351,8 +1346,6 @@ public class ExcelUtil<T>
    {
        List<Object[]> fields = new ArrayList<Object[]>();
        List<Field> tempFields = new ArrayList<>();
-        subFieldsMap = new HashMap<>();
-        subMethods = new HashMap<>();
        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
        if (StringUtils.isNotEmpty(includeFields))
@@ -1400,11 +1393,10 @@ public class ExcelUtil<T>
            }
            if (Collection.class.isAssignableFrom(field.getType()))
            {
-                String fieldName = field.getName();
-                subMethods.put(fieldName, getSubMethod(fieldName, clazz));
+                subMethod = getSubMethod(field.getName(), clazz);
                ParameterizedType pt = (ParameterizedType) field.getGenericType();
                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
-                subFieldsMap.put(fieldName, FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class));
+                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
            }
        }

@@ -1599,7 +1591,7 @@ public class ExcelUtil<T>
     */
    public boolean isSubList()
    {
-        return !StringUtils.isEmpty(subFieldsMap);
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0;
    }

    /**
@@ -1607,32 +1599,24 @@ public class ExcelUtil<T>
     */
    public boolean isSubListValue(T vo)
    {
-        return !StringUtils.isEmpty(subFieldsMap) && getListCellValue(vo) > 0;
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
    }

    /**
     * 获取集合的值
     */
-    public int getListCellValue(Object obj)
+    public Collection<?> getListCellValue(Object obj)
    {
-        Collection<?> value;
-        int max = 0;
+        Object value;
        try
        {
-            for (String s : subMethods.keySet())
-            {
-                value = (Collection<?>) subMethods.get(s).invoke(obj);
-                if (value.size() > max)
-                {
-                    max = value.size();
-                }
-            }
+            value = subMethod.invoke(obj, new Object[] {});
        }
        catch (Exception e)
        {
-            return 0;
+            return new ArrayList<Object>();
        }
-        return max;
+        return (Collection<?>) value;
    }

    /**
--- 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-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
@@ -94,7 +94,7 @@ public class DataScopeAspect
        List<String> conditions = new ArrayList<String>();
        List<String> scopeCustomIds = new ArrayList<String>();
        user.getRoles().forEach(role -> {
-            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
+            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
            {
                scopeCustomIds.add(Convert.toStr(role.getRoleId()));
            }
@@ -107,7 +107,7 @@ public class DataScopeAspect
            {
                continue;
            }
-            if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+            if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
            {
                continue;
            }
--- 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-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
@@ -48,9 +48,6 @@ public class LogAspect
    /** 计算操作消耗时间 */
    private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");

-    /** 参数最大长度限制 */
-    private static final int PARAM_MAX_LENGTH = 2000;
-
    @Autowired
    private AsyncLogService asyncLogService;

@@ -169,16 +166,16 @@ public class LogAspect
     */
    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception
    {
-        String requestMethod = operLog.getRequestMethod();
        Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
+        String requestMethod = operLog.getRequestMethod();
        if (StringUtils.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name()))
        {
            String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
-            operLog.setOperParam(params);
+            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
        }
        else
        {
-            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, PARAM_MAX_LENGTH));
+            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000));
        }
    }

@@ -187,7 +184,7 @@ public class LogAspect
     */
    private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames)
    {
-        StringBuilder params = new StringBuilder();
+        String params = "";
        if (paramsArray != null && paramsArray.length > 0)
        {
            for (Object o : paramsArray)
@@ -197,20 +194,15 @@ public class LogAspect
                    try
                    {
                        String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
-                        params.append(jsonObj).append(" ");
-                        if (params.length() >= PARAM_MAX_LENGTH)
-                        {
-                            return StringUtils.substring(params.toString(), 0, PARAM_MAX_LENGTH);
-                        }
+                        params += jsonObj.toString() + " ";
                    }
                    catch (Exception e)
                    {
-                        log.error("请求参数拼装异常 msg:{}, 参数:{}", e.getMessage(), paramsArray, e);
                    }
                }
            }
        }
-        return params.toString();
+        return params.trim();
    }

    /**
--- 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-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-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
    nacos:
      discovery:
        # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: nacos:8848
      config:
        # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: nacos:8848
        # 配置文件格式
        file-extension: yml
        # 共享配置
@@ -33,7 +33,7 @@ spring:
      datasource:
        ds1:
          nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: nacos:8848
            dataId: sentinel-ruoyi-gateway
            groupId: DEFAULT_GROUP
            data-type: json
--- 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-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -334,7 +334,7 @@ function getList() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
  }
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
@@ -415,7 +415,7 @@ function getList() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
  }
--- 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/service/impl/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -6,7 +6,6 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.domain.SysRole;
@@ -42,7 +41,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService
        // 管理员拥有所有权限
        if (user.isAdmin())
        {
-            roles.add(Constants.SUPER_ADMIN);
+            roles.add("admin");
        }
        else
        {
@@ -64,7 +63,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService
        // 管理员拥有所有权限
        if (user.isAdmin())
        {
-            perms.add(Constants.ALL_PERMISSION);
+            perms.add("*:*:*");
        }
        else
        {
--- 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
--- 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,
@@ -23,9 +23,6 @@ const mutations = {
    if (state.hasOwnProperty(key)) {
      state[key] = value
    }
-  },
-  SET_TITLE: (state, title) => {
-    state.title = title
  }
 }

@@ -36,7 +33,7 @@ const actions = {
  },
  // 设置网页标题
  setTitle({ commit }, title) {
-    commit('SET_TITLE', title)
+    state.title = title
    useDynamicTitle()
  }
 }
--- a/ruoyi-ui/src/utils/generator/drawingDefault.js
+++ b/ruoyi-ui/src/utils/generator/drawingDefault.js
@@ -1,37 +1,29 @@
-export const drawingDefaultValue = []
-
-export function initDrawingDefaultValue() {
-  if (drawingDefaultValue.length === 0) {
-    drawingDefaultValue.push({
-      layout: 'colFormItem',
-      tagIcon: 'input',
-      label: '手机号',
-      vModel: 'mobile',
-      formId: 6,
-      tag: 'el-input',
-      placeholder: '请输入手机号',
-      defaultValue: '',
-      span: 24,
-      style: {width: '100%'},
-      clearable: true,
-      prepend: '',
-      append: '',
-      'prefix-icon': 'el-icon-mobile',
-      'suffix-icon': '',
-      maxlength: 11,
-      'show-word-limit': true,
-      readonly: false,
-      disabled: false,
-      required: true,
-      changeTag: true,
-      regList: [{
-        pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
-        message: '手机号格式错误'
-      }]
-    })
+export default [
+  {
+    layout: 'colFormItem',
+    tagIcon: 'input',
+    label: '手机号',
+    vModel: 'mobile',
+    formId: 6,
+    tag: 'el-input',
+    placeholder: '请输入手机号',
+    defaultValue: '',
+    span: 24,
+    style: { width: '100%' },
+    clearable: true,
+    prepend: '',
+    append: '',
+    'prefix-icon': 'el-icon-mobile',
+    'suffix-icon': '',
+    maxlength: 11,
+    'show-word-limit': true,
+    readonly: false,
+    disabled: false,
+    required: true,
+    changeTag: true,
+    regList: [{
+      pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
+      message: '手机号格式错误'
+    }]
  }
-}
-
-export function cleanDrawingDefaultValue() {
-  drawingDefaultValue.splice(0, drawingDefaultValue.length)
-}
+]
--- 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-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -56,7 +56,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>{{ footerContent }}</span>
+      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
    </div>
  </div>
 </template>
@@ -65,14 +65,12 @@
 import { getCodeImg } from "@/api/login"
 import Cookies from "js-cookie"
 import { encrypt, decrypt } from '@/utils/jsencrypt'
-import defaultSettings from '@/settings'

 export default {
  name: "Login",
  data() {
    return {
      title: process.env.VUE_APP_TITLE,
-      footerContent: defaultSettings.footerContent,
      codeUrl: "",
      loginForm: {
        username: "admin",
@@ -158,7 +156,7 @@ export default {
 }
 </script>

-<style rel="stylesheet/scss" lang="scss" scoped>
+<style rel="stylesheet/scss" lang="scss">
 .login {
  display: flex;
  justify-content: center;
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -61,14 +61,13 @@
    </el-form>
    <!--  底部  -->
    <div class="el-register-footer">
-      <span>{{ footerContent }}</span>
+      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
    </div>
  </div>
 </template>

 <script>
 import { getCodeImg, register } from "@/api/login"
-import defaultSettings from '@/settings'

 export default {
  name: "Register",
@@ -82,7 +81,6 @@ export default {
    }
    return {
      title: process.env.VUE_APP_TITLE,
-      footerContent: defaultSettings.footerContent,
      codeUrl: "",
      registerForm: {
        username: "",
@@ -149,7 +147,7 @@ export default {
 }
 </script>

-<style rel="stylesheet/scss" lang="scss" scoped>
+<style rel="stylesheet/scss" lang="scss">
 .register {
  display: flex;
  justify-content: center;
--- a/ruoyi-ui/src/views/tool/build/index.vue
+++ b/ruoyi-ui/src/views/tool/build/index.vue
@@ -146,14 +146,13 @@ import { beautifierConf, titleCase } from '@/utils/index'
 import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
-import { drawingDefaultValue, initDrawingDefaultValue, cleanDrawingDefaultValue } from '@/utils/generator/drawingDefault'
+import drawingDefault from '@/utils/generator/drawingDefault'
 import logo from '@/assets/logo/logo.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'

 let oldActiveId
 let tempActiveData
-let clipboard = null

 export default {
  components: {
@@ -172,20 +171,17 @@ export default {
      selectComponents,
      layoutComponents,
      labelWidth: 100,
-      drawingList: drawingDefaultValue,
+      drawingList: drawingDefault,
      drawingData: {},
-      activeId: drawingDefaultValue[0].formId,
+      activeId: drawingDefault[0].formId,
      drawerVisible: false,
      formData: {},
      dialogVisible: false,
      generateConf: null,
      showFileName: false,
-      activeData: drawingDefaultValue[0]
+      activeData: drawingDefault[0]
    }
  },
-  beforeCreate() {
-    initDrawingDefaultValue()
-  },
  created() {
    // 防止 firefox 下 拖拽 会新打卡一个选项卡
    document.body.ondrop = event => {
@@ -212,7 +208,7 @@ export default {
    }
  },
  mounted() {
-    clipboard = new ClipboardJS('#copyNode', {
+    const clipboard = new ClipboardJS('#copyNode', {
      text: trigger => {
        const codeStr = this.generateCode()
        this.$notify({
@@ -227,9 +223,6 @@ export default {
      this.$message.error('代码复制失败')
    })
  },
-  beforeDestroy() {
-    clipboard.destroy()
-  },
  methods: {
    activeFormItem(element) {
      this.activeData = element
@@ -291,7 +284,6 @@ export default {
      this.$confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(
        () => {
          this.drawingList = []
-          cleanDrawingDefaultValue()
        }
      )
    },
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -253,8 +253,7 @@ export default {
          this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath)
        })
      } else {
-        const zipName = Array.isArray(tableNames) ? "ruoyi.zip" : tableNames + ".zip"
-        this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, zipName)
+        this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip")
      }
    },
    /** 同步数据库操作 */
--- 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
zhoudev	ae2e388d38	Pre Merge pull request !403 from zhoudev/N/A	2025-11-13 03:59:02 +00:00
zhoudev	7b9e9d1ea4	update ruoyi-gateway/src/main/resources/bootstrap.yml. Signed-off-by: zhoudev <15321072+zhoudev@user.noreply.gitee.com>	2025-04-23 02:56:07 +00:00