!451 update docker image version for springboot3 branch

Merge pull request !451 from magic/fix/docker-sp3

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.8</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.7</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.8-brightgreen.svg"></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/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 
@@ -13,8 +13,8 @@
 
 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
 
-* 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。
-* 后端采用Spring Boot、Spring Cloud & Alibaba。
+* 本仓库为RuoYi-Cloud的Spring Boot 3 的版本，保持同步更新。
+* 后端采用Spring Boot3、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
 * 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
@@ -23,11 +23,11 @@
 
 RuoYi-Cloud 后端项目提供 Spring Boot 2.x / 3.x / 4.x 多版本分支的并行维护。
 
-| 名称              | 说明                                 | 地址                                                      |
-| :---------------- | :----------------------------------- | :-------------------------------------------------------- |
-| master 默认分支   | Spring Boot 4.x (JDK 17+、Nacos 3.x) | https://gitee.com/y_project/RuoYi-Cloud                   |
-| springboot3 分支  | Spring Boot 3.x (JDK 17+、Nacos 3.x) | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot3  |
-| springboot2 分支  | Spring Boot 2.x (JDK 8+、 Nacos 2.x) | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot2  |
+| 名称              | 说明                      | 地址                                                      |
+| :---------------- | :------------------------ | :-------------------------------------------------------- |
+| master 默认分支   | Spring Boot 4.x (JDK 17+) | https://gitee.com/y_project/RuoYi-Cloud                   |
+| springboot3 分支  | Spring Boot 3.x (JDK 17+) | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot3  |
+| springboot2 分支  | Spring Boot 2.x (JDK 8+)  | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot2  |  
 
 RuoYi-Cloud 前端项目提供 Vue 2.x / 3.x / JavaScript TypeScript 版本均可混用搭配
 

docker/copy.sh

@@ -9,8 +9,8 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20260321.sql ./mysql/db
-cp ../sql/ry_config_20260311.sql ./mysql/db
+cp ../sql/ry_20250523.sql ./mysql/db
+cp ../sql/ry_config_20250902.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

pom.xml

@@ -6,25 +6,25 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.6.8</version>
+    <version>3.6.7</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
     <properties>
-        <ruoyi.version>3.6.8</ruoyi.version>
+        <ruoyi.version>3.6.7</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>4.0.3</spring-boot.version>
-        <spring-cloud.version>2025.1.0</spring-cloud.version>
-        <spring-cloud-alibaba.version>2025.1.0.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>4.0.2</spring-boot-admin.version>
-        <mybatis-spring-boot.version>4.0.1</mybatis-spring-boot.version>
+        <spring-boot.version>3.5.11</spring-boot.version>
+        <spring-cloud.version>2025.0.1</spring-cloud.version>
+        <spring-cloud-alibaba.version>2025.0.0.0</spring-cloud-alibaba.version>
+        <spring-boot-admin.version>3.5.8</spring-boot-admin.version>
+        <mybatis-spring.version>3.0.5</mybatis-spring.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
-        <druid.version>1.2.28</druid.version>
+        <druid.version>1.2.27</druid.version>
         <dynamic-ds.version>4.5.0</dynamic-ds.version>
         <commons.io.version>2.21.0</commons.io.version>
         <velocity.version>2.3</velocity.version>
@@ -32,7 +32,7 @@
         <jjwt.version>0.9.1</jjwt.version>
         <minio.version>8.2.2</minio.version>
         <poi.version>4.1.2</poi.version>
-        <springdoc.version>3.0.2</springdoc.version>
+        <springdoc.version>2.8.16</springdoc.version>
         <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
     </properties>
 
@@ -95,9 +95,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${mybatis-spring-boot.version}</version>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis-spring</artifactId>
+                <version>${mybatis-spring.version}</version>
             </dependency>
 
             <!-- io常用工具类 -->

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -37,7 +37,7 @@
         <!-- SpringBoot Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webmvc</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         
         <!-- SpringBoot Actuator -->

ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -2,7 +2,7 @@ package com.ruoyi.auth;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 
 /**

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
-import com.ruoyi.auth.form.UnLockBody;
 import com.ruoyi.auth.service.SysLoginService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.JwtUtils;
@@ -76,14 +75,4 @@ public class TokenController
         sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
         return R.ok();
     }
-
-    /**
-     * 解锁屏幕
-     */
-    @PostMapping("/unlockscreen")
-    public R<?> unlockScreen(@RequestBody UnLockBody unLockBody)
-    {
-        sysLoginService.unlock(unLockBody.getPassword());
-        return R.ok();
-    }
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/form/UnLockBody.java

@@ -1,24 +0,0 @@
-package com.ruoyi.auth.form;
-
-/**
- * 系统解锁对象
- * 
- * @author ruoyi
- */
-public class UnLockBody
-{
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-}

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -113,40 +113,11 @@ public class SysLoginService
         remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER);
     }
 
-    /**
-     * 退出
-     */
     public void logout(String loginName)
     {
         recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
     }
 
-    /**
-     * 解锁
-     */
-    public void unlock(String password)
-    {
-        String username = SecurityUtils.getUsername();
-        // 或密码为空 错误
-        if (StringUtils.isEmpty(password))
-        {
-            throw new ServiceException("密码不能为空");
-        }
-        // 查询用户信息
-        R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
-
-        if (R.FAIL == userResult.getCode())
-        {
-            throw new ServiceException(userResult.getMsg());
-        }
-
-        SysUser user = userResult.getData().getSysUser();
-        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
-        {
-            throw new ServiceException("密码错误，请重新输入");
-        }
-    }
-
     /**
      * 注册
      */

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -55,8 +55,8 @@
 
         <!-- Mybatis Spring -->
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
         </dependency>
 
         <!-- Hibernate Validator -->
@@ -68,7 +68,7 @@
         <!-- Spring Aop -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aspectj</artifactId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
         <!-- Jackson -->

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java

@@ -1,12 +1,8 @@
 package com.ruoyi.common.core.utils;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import org.apache.commons.lang3.Strings;
 import org.springframework.util.AntPathMatcher;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.text.StrFormatter;
@@ -371,87 +367,12 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
     }
 
-    /**
-     * 字符串转set
-     * 
-     * @param str 字符串
-     * @param sep 分隔符
-     * @return set集合
-     */
-    public static final Set<String> str2Set(String str, String sep)
-    {
-        return new HashSet<String>(str2List(str, sep, true, false));
-    }
-
-    /**
-     * 字符串转list
-     * 
-     * @param str 字符串
-     * @param sep 分隔符
-     * @return list集合
-     */
-    public static final List<String> str2List(String str, String sep)
-    {
-        return str2List(str, sep, true, false);
-    }
-
-    /**
-     * 字符串转list
-     * 
-     * @param str 字符串
-     * @param sep 分隔符
-     * @param filterBlank 过滤纯空白
-     * @param trim 去掉首尾空白
-     * @return list集合
-     */
-    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
-    {
-        List<String> list = new ArrayList<String>();
-        if (StringUtils.isEmpty(str))
-        {
-            return list;
-        }
-
-        // 过滤空白字符串
-        if (filterBlank && StringUtils.isBlank(str))
-        {
-            return list;
-        }
-        String[] split = str.split(sep);
-        for (String string : split)
-        {
-            if (filterBlank && StringUtils.isBlank(string))
-            {
-                continue;
-            }
-            if (trim)
-            {
-                string = string.trim();
-            }
-            list.add(string);
-        }
-
-        return list;
-    }
-
-    /**
-     * 检查子字符串是否存在
-     *
-     * @param seq 检查的字符串
-     * @param searchSeq 查找的字符串
-     * @return 结果
-     */
-    public static boolean contains(final CharSequence seq, final CharSequence searchSeq)
-    {
-        return Strings.CS.contains(seq, searchSeq);
-    }
-
     /**
      * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
      *
      * @param collection 给定的集合
      * @param array 给定的数组
-     * @return 结果
+     * @return boolean 结果
      */
     public static boolean containsAny(Collection<String> collection, String... array)
     {
@@ -472,198 +393,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
     }
 
-    /**
-     * 判断是否包含给定数组中的任意一个。
-     *
-     * @param cs 要判断的字符串
-     * @param searchCharSequences 要判断的数组
-     * @return 结果
-     */
-    public static boolean containsAny(final CharSequence cs, final CharSequence... searchCharSequences)
-    {
-        return Strings.CS.containsAny(cs, searchCharSequences);
-    }
-
-    /**
-     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
-     *
-     * @param cs 指定字符串
-     * @param searchCharSequences 需要检查的字符串数组
-     * @return 是否包含任意一个字符串
-     */
-    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences)
-    {
-        if (isEmpty(cs) || isEmpty(searchCharSequences))
-        {
-            return false;
-        }
-        for (CharSequence testStr : searchCharSequences)
-        {
-            if (containsIgnoreCase(cs, testStr))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 检查是否包含要搜索的字符串，忽略大小写
-     *
-     * @param str 要检查的字符串
-     * @param searchStr 要查找的字符串
-     * @return 如果包含要搜索的字符串（忽略大小写）则返回true，如果不包含或返回false
-     */
-    public static boolean containsIgnoreCase(final CharSequence str, final CharSequence searchStr)
-    {
-        return Strings.CI.contains(str, searchStr);
-    }
-
-    /**
-     * 检查字符串是否以任意前缀开始
-     *
-     * @param sequence 要检查的字符串
-     * @param searchStrings 区分大小写的字符串前缀数组
-     * @return 结果
-     */
-    public static boolean startsWithAny(final CharSequence sequence, final CharSequence... searchStrings)
-    {
-        return Strings.CS.startsWithAny(sequence, searchStrings);
-    }
-
-    /**
-     * 不区分大小写地检查一个字符串是否以指定前缀开头。
-     *
-     * @param str 待检查的字符串
-     * @param 要查找的前缀
-     * @return 结果
-     */
-    public static boolean startsWithIgnoreCase(final CharSequence str, final CharSequence prefix)
-    {
-        return Strings.CI.startsWith(str, prefix);
-    }
-
-    /**
-     * 比较两个字符串是否相同
-     *
-     * @param cs1 第一个字符串
-     * @param cs2 第二个字符串
-     * @return 如果给定对象与字符串相等，则返回 true；否则返回 false
-     */
-    public static boolean equals(final CharSequence cs1, final CharSequence cs2)
-    {
-        return Strings.CS.equals(cs1, cs2);
-    }
-
-    /**
-     * 替换字符串中所有匹配的字符
-     *
-     * @param text 要搜索和替换的文本
-     * @param searchString 要搜索的字符串
-     * @param replacement  用于替换的字符串
-     * @return 处理完所有替换后的文本
-     */
-    public static String replace(final String text, final String searchString, final String replacement)
-    {
-        return Strings.CS.replace(text, searchString, replacement);
-    }
-
-    /**
-     * 仅当子字符串位于源字符串末尾时才将其移除，否则返回源字符串。
-     * @param str 要搜索的源字符串
-     * @param remove 要搜索并移除的字符串
-     * @return 如果找到并移除了字符串，则返回移除后的子字符串
-     */
-    public static String removeEnd(final String str, final String remove)
-    {
-        return Strings.CS.removeEnd(str, remove);
-    }
-
-    /**
-     * 查找字符串首次出现位置的索引
-     *
-     * @param seq 要检查的字符串
-     * @param searchSeq 要查找的字符串
-     * @return 返回指定字符在字符串中第一次出现处的索引，如果此字符串中没有这样的字符，则返回 -1
-     */
-    public static int indexOf(final CharSequence seq, final CharSequence searchSeq)
-    {
-        return Strings.CS.indexOf(seq, searchSeq);
-    }
-
-    /**
-     * 检查字符串是否以指定的后缀结尾
-     *
-     * @param str 要检查的字符
-     * @param suffix 要检查的后缀
-     * @return 若参数与该字符串末尾相符 true;否则 false
-     */
-    public static boolean endsWith(final CharSequence str, final CharSequence suffix)
-    {
-        return Strings.CS.endsWith(str, suffix);
-    }
-
-    /**
-     * 将给定的字符串与数组进行比较
-     *
-     * @param string 要比较的字符串
-     * @param searchStrings 字符串数组
-     * @return 如果字符串等于（区分大小写）{@code searchStrings}中的任意其他元素，则返回true；如果{@code searchStrings}为null或不包含匹配项，则返回false
-     */
-    public static boolean equalsAny(final CharSequence string, final CharSequence... searchStrings)
-    {
-        return Strings.CS.equalsAny(string, searchStrings);
-    }
-
-    /**
-     * 检查一个字符串是否以任意提供的区分大小写的后缀结尾。
-     *
-     * @param sequence 要检查的字符串
-     * @param searchStrings 要查找的区分大小写的字符串数组
-     * @return 如果输入参数{@code sequence}为null且未提供任何{@code searchStrings}，或者输入{@code sequence}以任意提供的区分大小写的{@code searchStrings}结尾，则返回{@code true}。
-     */
-    public static boolean endsWithAny(final CharSequence sequence, final CharSequence... searchStrings)
-    {
-        return Strings.CS.endsWithAny(sequence, searchStrings);
-    }
-
-    /**
-     * 不区分大小写地检查字符序列是否以指定的后缀结尾
-     *
-     * @param str 要检查的字符序列
-     * @param suffix 要查找的后缀
-     * @return 如果字符序列以该后缀结尾（不区分大小写），或两者均为{@code null}，则返回{@code true}
-     */
-    public static boolean endsWithIgnoreCase(final CharSequence str, final CharSequence suffix)
-    {
-        return Strings.CI.endsWith(str, suffix);
-    }
-
-    /**
-     * 指定范围内查找字符串,忽略大小写
-     *
-     * @param str 要检查的字符串
-     * @param searchStr 要查找的字符串
-     * @return 搜索字符串的第一个索引，如果未找到匹配项则返回 -1
-     */
-    public static int indexOfIgnoreCase(final CharSequence str, final CharSequence searchStr)
-    {
-        return Strings.CI.indexOf(str, searchStr);
-    }
-
-    /**
-     * Compares given {@code string} to a CharSequences vararg of {@code searchStrings},
-     * returning {@code true} if the {@code string} is equal to any of the {@code searchStrings}, ignoring case.
-     *
-     * @param string to compare, may be {@code null}.
-     * @param searchStrings a vararg of strings, may be {@code null}.
-     * @return {@code true} if the string is equal (case-insensitive) to any other element of {@code searchStrings};
-     */
-    public static boolean equalsAnyIgnoreCase(final CharSequence string, final CharSequence... searchStrings)
-    {
-        return Strings.CI.equalsAny(string, searchStrings);
-    }
-
     /**
      * 驼峰转下划线命名
      */
@@ -735,22 +464,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return false;
     }
 
-    /**
-     * 删除最后一个字符串
-     *
-     * @param str 输入字符串
-     * @param spit 以什么类型结尾的
-     * @return 截取后的字符串
-     */
-    public static String lastStringDel(String str, String spit)
-    {
-        if (!StringUtils.isEmpty(str) && str.endsWith(spit))
-        {
-            return str.subSequence(0, str.length() - 1).toString();
-        }
-        return str;
-    }
-
     /**
      * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
      * 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java

@@ -7,13 +7,13 @@ import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Date;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java

@@ -7,17 +7,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.PageUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.sql.SqlUtil;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.core.web.page.TableSupport;
 
 /**
  * web层通用数据处理
@@ -53,19 +48,6 @@ public class BaseController
         PageUtils.startPage();
     }
 
-    /**
-     * 设置请求排序数据
-     */
-    protected void startOrderBy()
-    {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
-        {
-            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-            PageHelper.orderBy(orderBy);
-        }
-    }
-
     /**
      * 清理分页的线程变量
      */

ruoyi-common/ruoyi-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -20,21 +20,15 @@
         <!-- Druid -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-4-starter</artifactId>
+            <artifactId>druid-spring-boot-3-starter</artifactId>
             <version>${druid.version}</version>
         </dependency>
 
         <!-- Dynamic DataSource -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot4-starter</artifactId>
+            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
             <version>${dynamic-ds.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>mybatis-spring</artifactId>
-                    <groupId>org.mybatis</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
     </dependencies>

ruoyi-common/ruoyi-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java

@@ -1,10 +1,11 @@
 package com.ruoyi.common.redis.configure;
 
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -14,15 +15,15 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
  * 
  * @author ruoyi
  */
-@SuppressWarnings("deprecation")
 @Configuration
 @EnableCaching
+@AutoConfigureBefore(RedisAutoConfiguration.class)
+@SuppressWarnings("deprecation")
 public class RedisConfig extends CachingConfigurerSupport
 {
-    @Bean(name = "ruoyiRedisTemplate")
-    @Primary
+    @Bean
     @SuppressWarnings(value = { "unchecked", "rawtypes" })
-    public RedisTemplate<Object, Object> ruoyiRedisTemplate(RedisConnectionFactory connectionFactory)
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
     {
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);

ruoyi-common/ruoyi-common-seata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java

@@ -1,7 +1,6 @@
 package com.ruoyi.common.security.annotation;
 
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.core.annotation.AliasFor;
 import java.lang.annotation.*;
 
 /**
@@ -18,7 +17,6 @@ public @interface EnableRyFeignClients
 {
     String[] value() default {};
 
-    @AliasFor(annotation = EnableFeignClients.class, attribute = "basePackages")
     String[] basePackages() default { "com.ruoyi" };
 
     Class<?>[] basePackageClasses() default {};

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java

@@ -1,8 +1,7 @@
 package com.ruoyi.common.security.config;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
 import java.util.TimeZone;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -16,11 +15,8 @@ public class ApplicationConfig
      * 时区配置
      */
     @Bean
-    public ObjectMapper objectMapper()
+    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
     {
-        ObjectMapper objectMapper = JsonMapper.builder().build();
-        objectMapper.findAndRegisterModules();
-        objectMapper.setTimeZone(TimeZone.getDefault());
-        return objectMapper;
+        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
     }
 }

ruoyi-common/ruoyi-common-sensitive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -20,7 +20,7 @@
         <!-- SpringBoot Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webmvc</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <!-- SpringDoc webmvc -->

ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SpringDocAutoConfiguration.java

@@ -2,6 +2,8 @@ package com.ruoyi.common.swagger.config;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.springdoc.core.configuration.SpringDocConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -19,6 +21,7 @@ import io.swagger.v3.oas.models.servers.Server;
  *
  * @author ruoyi
  */
+@AutoConfiguration(before = SpringDocConfiguration.class)
 @EnableConfigurationProperties(SpringDocProperties.class)
 @ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true)
 public class SpringDocAutoConfiguration

ruoyi-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java

@@ -2,7 +2,7 @@ package com.ruoyi.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
 /**
  * 网关启动程序

ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java

@@ -3,12 +3,12 @@ package com.ruoyi.gateway.handler;
 import org.springframework.cloud.gateway.support.NotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebExceptionHandler;
 import com.ruoyi.common.core.utils.ServletUtils;
 import reactor.core.publisher.Mono;
 
@@ -19,7 +19,7 @@ import reactor.core.publisher.Mono;
  */
 @Order(-1)
 @Configuration
-public class GatewayExceptionHandler implements WebExceptionHandler
+public class GatewayExceptionHandler implements ErrorWebExceptionHandler
 {
     private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class);
 

ruoyi-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,7 +44,7 @@
         <!-- SpringBoot Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webmvc</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         
         <!-- Minio -->

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java

@@ -2,7 +2,7 @@ package com.ruoyi.file;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
 /**
  * 文件服务

ruoyi-modules/ruoyi-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -4,8 +4,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -230,7 +228,11 @@ public class GenTableServiceImpl implements IGenTableService
     @Override
     public byte[] downloadCode(String tableName)
     {
-        return downloadCode(new String[] { tableName });
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        generatorCode(tableName, zip);
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
     }
 
     /**
@@ -341,14 +343,9 @@ public class GenTableServiceImpl implements IGenTableService
     {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
-        Map<String, StringBuffer> typeFiles = new HashMap<>();
         for (String tableName : tableNames)
         {
-            generatorCode(tableName, zip, typeFiles);
-        }
-        for (Map.Entry<String, StringBuffer> entry : typeFiles.entrySet())
-        {
-            writeToZip(zip, entry.getKey(), entry.getValue().toString());
+            generatorCode(tableName, zip);
         }
         IOUtils.closeQuietly(zip);
         return outputStream.toByteArray();
@@ -357,7 +354,7 @@ public class GenTableServiceImpl implements IGenTableService
     /**
      * 查询表信息并生成代码
      */
-    private void generatorCode(String tableName, ZipOutputStream zip, Map<String, StringBuffer> typeFiles)
+    private void generatorCode(String tableName, ZipOutputStream zip)
     {
         // 查询表信息
         GenTable table = genTableMapper.selectGenTableByName(tableName);
@@ -378,49 +375,22 @@ public class GenTableServiceImpl implements IGenTableService
             StringWriter sw = new StringWriter();
             Template tpl = Velocity.getTemplate(template, Constants.UTF8);
             tpl.merge(context, sw);
-            String fileName = VelocityUtils.getFileName(template, table);
-            // index-bak.ts 模版，追加内容
-            if (fileName.contains("index-bak.ts"))
+            try
             {
-                if (!typeFiles.containsKey(fileName))
-                {
-                    typeFiles.put(fileName, new StringBuffer(sw.toString()));
-                }
-                else
-                {
-                    Arrays.stream(sw.toString().split("\n")).filter(line -> line.startsWith("export * from")).forEach(line -> typeFiles.get(fileName).append("\n").append(line));
-                }
+                // 添加到zip
+                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
+                IOUtils.write(sw.toString(), zip, Constants.UTF8);
+                IOUtils.closeQuietly(sw);
+                zip.flush();
+                zip.closeEntry();
             }
-            else
+            catch (IOException e)
             {
-                // 其他文件正常添加
-                writeToZip(zip, fileName, sw.toString());
+                log.error("渲染模板失败，表名：" + table.getTableName(), e);
             }
         }
     }
 
-    /**
-     * 将字符串内容写入ZIP输出流
-     * 
-     * @param zip ZIP输出流
-     * @param fileName ZIP条目名称（即文件名）
-     * @param content 要写入的内容
-     */
-    private void writeToZip(ZipOutputStream zip, String fileName, String content)
-    {
-        try
-        {
-            zip.putNextEntry(new ZipEntry(fileName));
-            IOUtils.write(content, zip, Constants.UTF8);
-            zip.flush();
-            zip.closeEntry();
-        }
-        catch (IOException e)
-        {
-            log.error("写入ZIP文件失败，文件名: " + fileName, e);
-        }
-    }
-
     /**
      * 修改保存参数校验
      * 

ruoyi-modules/ruoyi-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -43,8 +43,14 @@
         
         <!-- Quartz -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-quartz</artifactId>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.mchange</groupId>
+                    <artifactId>c3p0</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
         <!-- Mysql Connector -->

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java

@@ -3,7 +3,6 @@ package com.ruoyi.job.domain;
 import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 
@@ -45,12 +44,10 @@ public class SysJobLog extends BaseEntity
     private String exceptionInfo;
 
     /** 开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
-    /** 结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
+    /** 停止时间 */
+    private Date stopTime;
 
     public Long getJobLogId()
     {
@@ -132,14 +129,14 @@ public class SysJobLog extends BaseEntity
         this.startTime = startTime;
     }
     
-    public Date getEndTime()
+    public Date getStopTime()
     {
-        return endTime;
+        return stopTime;
     }
 
-    public void setEndTime(Date endTime)
+    public void setStopTime(Date stopTime)
     {
-        this.endTime = endTime;
+        this.stopTime = stopTime;
     }
 
     @Override
@@ -152,7 +149,7 @@ public class SysJobLog extends BaseEntity
             .append("status", getStatus())
             .append("exceptionInfo", getExceptionInfo())
             .append("startTime", getStartTime())
-            .append("stopTime", getEndTime())
+            .append("stopTime", getStopTime())
             .toString();
     }
 }

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java

@@ -76,8 +76,8 @@ public abstract class AbstractQuartzJob implements Job
         sysJobLog.setJobGroup(sysJob.getJobGroup());
         sysJobLog.setInvokeTarget(sysJob.getInvokeTarget());
         sysJobLog.setStartTime(startTime);
-        sysJobLog.setEndTime(new Date());
-        long runMs = sysJobLog.getEndTime().getTime() - sysJobLog.getStartTime().getTime();
+        sysJobLog.setStopTime(new Date());
+        long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
         sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
         if (e != null)
         {

ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml

@@ -12,13 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="jobMessage"     column="job_message"     />
 		<result property="status"         column="status"          />
 		<result property="exceptionInfo"  column="exception_info"  />
-		<result property="startTime"      column="start_time"      />
-		<result property="endTime"        column="end_time"        />
 		<result property="createTime"     column="create_time"     />
 	</resultMap>
 	
 	<sql id="selectJobLogVo">
-        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, start_time, end_time, create_time 
+        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time 
 		from sys_job_log
     </sql>
 	
@@ -80,8 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="jobMessage != null and jobMessage != ''">job_message,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
- 			<if test="startTime != null">start_time,</if>
- 			<if test="endTime != null">end_time,</if>
  			create_time
  		)values(
  			<if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
@@ -91,8 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
- 			<if test="startTime != null">#{startTime},</if>
- 			<if test="endTime != null">#{endTime},</if>
  			sysdate()
  		)
 	</insert>

ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectJobVo">
-        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time, remark  
+        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark 
 		from sys_job
     </sql>
 	

ruoyi-modules/ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 	

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
-import java.util.Map;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -112,20 +111,6 @@ public class SysDeptController extends BaseController
         return toAjax(deptService.updateDept(dept));
     }
 
-    /**
-     * 保存部门排序
-     */
-    @RequiresPermissions("system:dept:edit")
-    @Log(title = "保存部门排序", businessType = BusinessType.UPDATE)
-    @PutMapping("/updateSort")
-    public AjaxResult updateSort(@RequestBody Map<String, String> params)
-    {
-        String[] deptIds = params.get("deptIds").split(",");
-        String[] orderNums = params.get("orderNums").split(",");
-        deptService.updateDeptSort(deptIds, orderNums);
-        return success();
-    }
-
     /**
      * 删除部门
      */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
-import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -134,20 +133,6 @@ public class SysMenuController extends BaseController
         return toAjax(menuService.updateMenu(menu));
     }
 
-    /**
-     * 保存菜单排序
-     */
-    @RequiresPermissions("system:menu:edit")
-    @Log(title = "保存菜单排序", businessType = BusinessType.UPDATE)
-    @PutMapping("/updateSort")
-    public AjaxResult updateSort(@RequestBody Map<String, String> params)
-    {
-        String[] menuIds = params.get("menuIds").split(",");
-        String[] orderNums = params.get("orderNums").split(",");
-        menuService.updateMenuSort(menuIds, orderNums);
-        return success();
-    }
-
     /**
      * 删除菜单
      */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java

@@ -10,9 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -21,7 +19,6 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.domain.SysNotice;
-import com.ruoyi.system.service.ISysNoticeReadService;
 import com.ruoyi.system.service.ISysNoticeService;
 
 /**
@@ -36,9 +33,6 @@ public class SysNoticeController extends BaseController
     @Autowired
     private ISysNoticeService noticeService;
 
-    @Autowired
-    private ISysNoticeReadService noticeReadService;
-
     /**
      * 获取通知公告列表
      */
@@ -85,46 +79,6 @@ public class SysNoticeController extends BaseController
         return toAjax(noticeService.updateNotice(notice));
     }
 
-    /**
-     * 首页顶部公告列表（返回全部正常公告，带当前用户已读标记，最多5条）
-     */
-    @GetMapping("/listTop")
-    @ResponseBody
-    public AjaxResult listTop()
-    {
-        Long userId = SecurityUtils.getUserId();
-        List<SysNotice> list = noticeReadService.selectNoticeListWithReadStatus(userId, 5);
-        long unreadCount = list.stream().filter(n -> !n.getIsRead()).count();
-        AjaxResult result = AjaxResult.success(list);
-        result.put("unreadCount", unreadCount);
-        return result;
-    }
-
-    /**
-     * 标记公告已读
-     */
-    @PostMapping("/markRead")
-    @ResponseBody
-    public AjaxResult markRead(Long noticeId)
-    {
-        Long userId = SecurityUtils.getUserId();
-        noticeReadService.markRead(noticeId, userId);
-        return success();
-    }
-
-    /**
-     * 批量标记已读
-     */
-    @PostMapping("/markReadAll")
-    @ResponseBody
-    public AjaxResult markReadAll(String ids)
-    {
-        Long userId = SecurityUtils.getUserId();
-        Long[] noticeIds = Convert.toLongArray(ids);
-        noticeReadService.markReadBatch(userId, noticeIds);
-        return success();
-    }
-
     /**
      * 删除通知公告
      */
@@ -133,7 +87,6 @@ public class SysNoticeController extends BaseController
     @DeleteMapping("/{noticeIds}")
     public AjaxResult remove(@PathVariable Long[] noticeIds)
     {
-        noticeReadService.deleteByNoticeIds(noticeIds);
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -4,7 +4,6 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
 
@@ -32,10 +31,6 @@ public class SysNotice extends BaseEntity
     /** 公告状态（0正常 1关闭） */
     private String status;
 
-    /** 是否已读 */
-    @JsonProperty("isRead")
-    private boolean isRead;
-
     public Long getNoticeId()
     {
         return noticeId;
@@ -89,16 +84,6 @@ public class SysNotice extends BaseEntity
         return status;
     }
 
-    public boolean getIsRead()
-    {
-        return isRead;
-    }
-
-    public void setIsRead(boolean isRead)
-    {
-        this.isRead = isRead;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNoticeRead.java

@@ -1,76 +0,0 @@
-package com.ruoyi.system.domain;
-
-import java.util.Date;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 公告已读记录表 sys_notice_read
- *
- * @author ruoyi
- */
-public class SysNoticeRead
-{
-    /** 主键 */
-    private Long readId;
-
-    /** 公告ID */
-    private Long noticeId;
-
-    /** 用户ID */
-    private Long userId;
-
-    /** 阅读时间 */
-    private Date readTime;
-
-    public Long getReadId()
-    {
-        return readId;
-    }
-
-    public void setReadId(Long readId)
-    {
-        this.readId = readId;
-    }
-
-    public Long getNoticeId()
-    {
-        return noticeId;
-    }
-
-    public void setNoticeId(Long noticeId)
-    {
-        this.noticeId = noticeId;
-    }
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Date getReadTime()
-    {
-        return readTime;
-    }
-
-    public void setReadTime(Date readTime)
-    {
-        this.readTime = readTime;
-    }
-
-    @Override
-    public String toString()
-    {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("readId", getReadId())
-            .append("noticeId", getNoticeId())
-            .append("userId", getUserId())
-            .append("readTime", getReadTime())
-            .toString();
-    }
-}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -108,13 +108,6 @@ public interface SysDeptMapper
      */
     public int updateDeptChildren(@Param("depts") List<SysDept> depts);
 
-    /**
-     * 保存部门排序
-     *
-     * @param dept 部门信息
-     */
-    public void updateDeptSort(SysDept dept);
-
     /**
      * 删除部门管理信息
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -106,13 +106,6 @@ public interface SysMenuMapper
      */
     public int updateMenu(SysMenu menu);
 
-    /**
-     * 保存菜单排序
-     * 
-     * @param menu 菜单信息
-     */
-    public void updateMenuSort(SysMenu menu);
-
     /**
      * 删除菜单管理信息
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeReadMapper.java

@@ -1,65 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import com.ruoyi.system.domain.SysNoticeRead;
-import com.ruoyi.system.domain.SysNotice;
-
-/**
- * 公告已读记录 数据层
- *
- * @author ruoyi
- */
-public interface SysNoticeReadMapper
-{
-    /**
-     * 新增已读记录（忽略重复）
-     *
-     * @param noticeRead 已读记录
-     * @return 结果
-     */
-    public int insertNoticeRead(SysNoticeRead noticeRead);
-
-    /**
-     * 查询某用户未读公告数量
-     *
-     * @param userId 用户ID
-     * @return 未读数量
-     */
-    public int selectUnreadCount(@Param("userId") Long userId);
-
-    /**
-     * 查询某用户是否已读某公告
-     *
-     * @param noticeId 公告ID
-     * @param userId   用户ID
-     * @return 已读记录数（0未读 1已读）
-     */
-    public int selectIsRead(@Param("noticeId") Long noticeId, @Param("userId") Long userId);
-
-    /**
-     * 批量标记已读
-     *
-     * @param userId    用户ID
-     * @param noticeIds 公告ID数组
-     * @return 结果
-     */
-    public int insertNoticeReadBatch(@Param("userId") Long userId, @Param("noticeIds") Long[] noticeIds);
-
-    /**
-     * 查询带已读状态的公告列表（SQL层限制条数，一次查询完成）
-     *
-     * @param userId 用户ID
-     * @param limit  最多返回条数
-     * @return 带 isRead 标记的公告列表
-     */
-    public List<SysNotice> selectNoticeListWithReadStatus(@Param("userId") Long userId, @Param("limit") int limit);
-
-    /**
-     * 公告删除时清理对应已读记录
-     *
-     * @param noticeIds 公告ID数组
-     * @return 结果
-     */
-    public int deleteByNoticeIds(@Param("noticeIds") Long[] noticeIds);
-}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -114,14 +114,6 @@ public interface ISysDeptService
      */
     public int updateDept(SysDept dept);
 
-    /**
-     * 保存部门排序
-     *
-     * @param deptIds 部门ID数组
-     * @param orderNums 排序数组
-     */
-    public void updateDeptSort(String[] deptIds, String[] orderNums);
-
     /**
      * 删除部门管理信息
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -126,14 +126,6 @@ public interface ISysMenuService
      */
     public int updateMenu(SysMenu menu);
 
-    /**
-     * 保存菜单排序
-     * 
-     * @param menuIds 菜单ID
-     * @param orderNums 排序ID
-     */
-    public void updateMenuSort(String[] menuIds, String[] orderNums);
-
     /**
      * 删除菜单管理信息
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeReadService.java

@@ -1,52 +0,0 @@
-package com.ruoyi.system.service;
-
-import java.util.List;
-import com.ruoyi.system.domain.SysNotice;
-
-/**
- * 公告已读记录 服务层
- *
- * @author ruoyi
- */
-public interface ISysNoticeReadService
-{
-    /**
-     * 标记已读（幂等，重复调用不报错）
-     *
-     * @param noticeId 公告ID
-     * @param userId   用户ID
-     */
-    public void markRead(Long noticeId, Long userId);
-
-    /**
-     * 查询某用户未读公告数量
-     *
-     * @param userId 用户ID
-     * @return 未读数量
-     */
-    public int selectUnreadCount(Long userId);
-
-    /**
-     * 查询公告列表并标记当前用户已读状态（用于首页展示）
-     *
-     * @param userId 用户ID
-     * @param limit  最多返回条数
-     * @return 带 isRead 标记的公告列表
-     */
-    public List<SysNotice> selectNoticeListWithReadStatus(Long userId, int limit);
-
-    /**
-     * 批量标记已读
-     *
-     * @param userId    用户ID
-     * @param noticeIds 公告ID数组
-     */
-    public void markReadBatch(Long userId, Long[] noticeIds);
-
-    /**
-     * 删除公告时清理对应已读记录
-     *
-     * @param noticeIds 公告ID数组
-     */
-    public void deleteByNoticeIds(Long[] noticeIds);
-}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.text.Convert;
@@ -281,32 +280,6 @@ public class SysDeptServiceImpl implements ISysDeptService
         }
     }
 
-    /**
-     * 保存部门排序
-     *
-     * @param deptIds 部门ID数组
-     * @param orderNums 排序数组
-     */
-    @Override
-    @Transactional
-    public void updateDeptSort(String[] deptIds, String[] orderNums)
-    {
-        try
-        {
-            for (int i = 0; i < deptIds.length; i++)
-            {
-                SysDept dept = new SysDept();
-                dept.setDeptId(Convert.toLong(deptIds[i]));
-                dept.setOrderNum(Convert.toInt(orderNums[i]));
-                deptMapper.updateDeptSort(dept);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new ServiceException("保存排序异常，请联系管理员");
-        }
-    }
-
     /**
      * 删除部门管理信息
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -12,11 +12,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysRole;
@@ -324,32 +321,6 @@ public class SysMenuServiceImpl implements ISysMenuService
         return menuMapper.updateMenu(menu);
     }
 
-    /**
-     * 保存菜单排序
-     * 
-     * @param menuIds 菜单ID
-     * @param orderNums 排序ID
-     */
-    @Override
-    @Transactional
-    public void updateMenuSort(String[] menuIds, String[] orderNums)
-    {
-        try
-        {
-            for (int i = 0; i < menuIds.length; i++)
-            {
-                SysMenu menu = new SysMenu();
-                menu.setMenuId(Convert.toLong(menuIds[i]));
-                menu.setOrderNum(Convert.toInt(orderNums[i]));
-                menuMapper.updateMenuSort(menu);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new ServiceException("保存排序异常，请联系管理员");
-        }
-    }
-
     /**
      * 删除菜单管理信息
      * 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeReadServiceImpl.java

@@ -1,73 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.system.domain.SysNoticeRead;
-import com.ruoyi.system.domain.SysNotice;
-import com.ruoyi.system.mapper.SysNoticeReadMapper;
-import com.ruoyi.system.service.ISysNoticeReadService;
-
-/**
- * 公告已读记录 服务层实现
- *
- * @author ruoyi
- */
-@Service
-public class SysNoticeReadServiceImpl implements ISysNoticeReadService
-{
-    @Autowired
-    private SysNoticeReadMapper noticeReadMapper;
-
-    /**
-     * 标记已读
-     */
-    @Override
-    public void markRead(Long noticeId, Long userId)
-    {
-        SysNoticeRead record = new SysNoticeRead();
-        record.setNoticeId(noticeId);
-        record.setUserId(userId);
-        noticeReadMapper.insertNoticeRead(record);
-    }
-
-    /**
-     * 查询某用户未读公告数量
-     */
-    @Override
-    public int selectUnreadCount(Long userId)
-    {
-        return noticeReadMapper.selectUnreadCount(userId);
-    }
-
-    /**
-     * 查询公告列表并标记当前用户已读状态
-     */
-    @Override
-    public List<SysNotice> selectNoticeListWithReadStatus(Long userId, int limit)
-    {
-        return noticeReadMapper.selectNoticeListWithReadStatus(userId, limit);
-    }
-
-    /**
-     * 批量标记已读
-     */
-    @Override
-    public void markReadBatch(Long userId, Long[] noticeIds)
-    {
-        if (noticeIds == null || noticeIds.length == 0)
-        {
-            return;
-        }
-        noticeReadMapper.insertNoticeReadBatch(userId, noticeIds);
-    }
-
-    /**
-     * 删除公告时清理对应已读记录
-     */
-    @Override
-    public void deleteByNoticeIds(Long[] noticeIds)
-    {
-        noticeReadMapper.deleteByNoticeIds(noticeIds);
-    }
-}

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -150,12 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
 	</update>
 	
-	<update id="updateDeptSort" parameterType="SysDept">
-		update sys_dept set order_num = #{orderNum} where dept_id = #{deptId}
-	</update>
-	
 	<delete id="deleteDeptById" parameterType="Long">
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
-</mapper>
+</mapper> 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -204,10 +204,6 @@
 		)
 	</insert>
 	
-	<update id="updateMenuSort" parameterType="SysMenu">
-	    update sys_menu set order_num = #{orderNum} where menu_id = #{menuId}
-	</update>
-
 	<delete id="deleteMenuById" parameterType="Long">
 	    delete from sys_menu where menu_id = #{menuId}
 	</delete>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -40,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND create_by like concat('%', #{createBy}, '%')
 			</if>
 		</where>
-		order by notice_id desc
     </select>
     
     <insert id="insertNotice" parameterType="SysNotice">

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysNoticeReadMapper">
-
-    <resultMap type="SysNoticeRead" id="SysNoticeReadResult">
-        <id     property="readId"   column="read_id"     />
-        <result property="noticeId" column="notice_id"   />
-        <result property="userId"   column="user_id"     />
-        <result property="readTime" column="read_time"   />
-    </resultMap>
-
-    <!-- 新增已读记录 -->
-    <insert id="insertNoticeRead" parameterType="SysNoticeRead">
-        insert ignore into sys_notice_read (notice_id, user_id, read_time)
-        values (#{noticeId}, #{userId}, sysdate())
-    </insert>
-
-    <!-- 查询未读数量：正常状态公告 减去 当前用户已读数 -->
-    <select id="selectUnreadCount" resultType="int">
-        select count(*) from sys_notice n
-        where n.status = '0' and not exists (select 1 from sys_notice_read r where r.notice_id = n.notice_id and r.user_id = #{userId})
-    </select>
-
-    <!-- 查询是否已读 -->
-    <select id="selectIsRead" resultType="int">
-        select count(*) from sys_notice_read where notice_id = #{noticeId} and user_id = #{userId}
-    </select>
-
-    <!-- 查询带已读状态的公告列表（直接在SQL中限制条数） -->
-    <select id="selectNoticeListWithReadStatus" resultType="SysNotice">
-        select
-            n.notice_id    as noticeId,
-            n.notice_title as noticeTitle,
-            n.notice_type  as noticeType,
-            n.status,
-            n.create_by    as createBy,
-            n.create_time  as createTime,
-            case when r.notice_id is not null then true else false end as isRead
-        from sys_notice n
-        left join sys_notice_read r
-            on r.notice_id = n.notice_id and r.user_id = #{userId}
-        where n.status = '0'
-        order by n.notice_id desc
-        limit #{limit}
-    </select>
-
-    <!-- 批量标记已读 -->
-    <insert id="insertNoticeReadBatch">
-        insert ignore into sys_notice_read (notice_id, user_id, read_time)
-        values
-        <foreach collection="noticeIds" item="noticeId" separator=",">
-            (#{noticeId}, #{userId}, sysdate())
-        </foreach>
-    </insert>
-
-    <!-- 删除公告时清理已读记录 -->
-    <delete id="deleteByNoticeIds">
-        delete from sys_notice_read where notice_id in
-        <foreach collection="noticeIds" item="noticeId" open="(" separator="," close=")">
-            #{noticeId}
-        </foreach>
-    </delete>
-
-</mapper>

ruoyi-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "3.6.8",
+  "version": "3.6.7",
   "description": "若依管理系统",
   "author": "若依",
   "license": "MIT",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.30.3",
+    "axios": "0.28.1",
     "clipboard": "2.0.8",
     "core-js": "3.37.1",
     "echarts": "5.4.0",

ruoyi-ui/src/api/login.js

@@ -25,15 +25,6 @@ export function register(data) {
   })
 }
 
-// 解锁屏幕
-export function unlockScreen(password) {
-  return request({
-    url: '/auth/unlockscreen',
-    method: 'post',
-    data: { password }
-  })
-}
-
 // 刷新方法
 export function refreshToken() {
   return request({

ruoyi-ui/src/api/system/dept.js

@@ -43,15 +43,6 @@ export function updateDept(data) {
   })
 }
 
-// 保存部门排序
-export function updateDeptSort(data) {
-  return request({
-    url: '/system/dept/updateSort',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除部门
 export function delDept(deptId) {
   return request({

ruoyi-ui/src/api/system/menu.js

@@ -51,15 +51,6 @@ export function updateMenu(data) {
   })
 }
 
-// 保存菜单排序
-export function updateMenuSort(data) {
-  return request({
-    url: '/system/menu/updateSort',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除菜单
 export function delMenu(menuId) {
   return request({

ruoyi-ui/src/api/system/notice.js

@@ -41,30 +41,4 @@ export function delNotice(noticeId) {
     url: '/system/notice/' + noticeId,
     method: 'delete'
   })
-}
-
-// 首页顶部公告列表（带已读状态）
-export function listNoticeTop() {
-  return request({
-    url: '/system/notice/listTop',
-    method: 'get'
-  })
-}
-
-// 标记公告已读
-export function markNoticeRead(noticeId) {
-  return request({
-    url: '/system/notice/markRead',
-    method: 'post',
-    params: { noticeId }
-  })
-}
-
-// 批量标记已读
-export function markNoticeReadAll(ids) {
-  return request({
-    url: '/system/notice/markReadAll',
-    method: 'post',
-    params: { ids }
-  })
-}
+}

ruoyi-ui/src/assets/icons/svg/bell.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1773923748724" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5930" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 212l48.8 12c101.6 24.8 176 117.6 176 220.8v254.4l18.4 18.4 24.8 25.6h-536l24.8-25.6 18.4-18.4V444.8c0-103.2 73.6-196.8 176-220.8l48.8-12M512 64c-36.8 0-64 30.4-64 68v30.4C320.8 192 223.2 307.2 223.2 444.8v228.8L136 763.2v44.8h752v-44.8l-87.2-89.6V444.8c0-137.6-97.6-252.8-224.8-283.2v-28.8c0-32-17.6-60.8-48-67.2-5.6-1.6-11.2-1.6-16-1.6z m88 808H424c0 49.6 38.4 88 88 88s88-38.4 88-88z" p-id="5931"></path></svg>

ruoyi-ui/src/assets/styles/element-ui.scss

@@ -82,11 +82,3 @@
 .el-range-separator {
   box-sizing: content-box;
 }
-
-.el-menu--collapse
-  > div
-  > .el-submenu
-  > .el-submenu__title
-  .el-submenu__icon-arrow {
-  display: none;
-}

ruoyi-ui/src/assets/styles/element-variables.scss

@@ -17,7 +17,7 @@ $--button-font-weight: 400;
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;
 
-$--table-border: 1px solid #dfe6ec;
+$--table-border:1px solid#dfe6ec;
 
 /* icon font path, required */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';

ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -81,10 +81,6 @@
   margin-top: 6vh !important;
 }
 
-.el-dialog__body {
-  padding: 8px 20px !important;
-}
-
 .el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
   overflow: auto;
   overflow-x: hidden;
@@ -232,120 +228,6 @@
   color: #FFFFFF;
 }
 
-/** 详细卡片样式 */
-.detail-wrap { padding: 0 4px; }
-
-.detail-card {
-  border: 1px solid #ebeef5;
-  border-radius: 6px;
-  margin-bottom: 14px;
-  overflow: hidden;
-}
-
-.detail-card-title {
-  background: #f7f9fb;
-  padding: 8px 16px;
-  font-size: 13px;
-  font-weight: 600;
-  color: #333;
-  border-bottom: 1px solid #ebeef5;
-}
-.detail-card-title i { margin-right: 5px; color: #409EFF; }
-
-.detail-row { padding: 0 8px; }
-
-.detail-item {
-  display: flex;
-  align-items: flex-start;
-  padding: 10px 8px;
-  font-size: 13px;
-  border-bottom: 1px solid #f5f7fa;
-}
-.detail-item:last-child { border-bottom: none; }
-
-.detail-label {
-  flex-shrink: 0;
-  width: 72px;
-  color: #909399;
-  margin-right: 12px;
-}
-.detail-value { color: #303133; flex: 1; word-break: break-all; }
-.detail-location { color: #999; font-size: 12px; }
-
-.method-tag {
-  display: inline-block;
-  padding: 1px 7px;
-  border-radius: 3px;
-  font-size: 11px;
-  font-weight: 700;
-  margin-right: 6px;
-  vertical-align: middle;
-}
-.mono { font-family: Consolas, 'SFMono-Regular', monospace; font-size: 12px; }
-.code-body { padding: 14px; }
-.code-wrap {
-  background: #f7f9fb;
-  border: 1px solid #e8ecf0;
-  border-radius: 4px;
-  overflow: hidden;
-  max-height: 260px;
-  position: relative;
-}
-.code-action {
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  z-index: 10;
-  margin: 0;
-  padding: 0;
-}
-.code-action .el-button { 
-  height: 24px; 
-  font-size: 12px; 
-  padding: 4px 8px; 
-  background: rgba(255, 255, 255, 0.9);
-  border: 1px solid #dcdcdc;
-}
-.code-action .el-button:hover { 
-  background: #ffffff;
-  border-color: #409EFF;
-}
-.code-pre {
-  margin: 0;
-  padding: 12px 14px;
-  font-size: 12px;
-  line-height: 1.6;
-  font-family: Consolas, 'SFMono-Regular', monospace;
-  color: #444;
-  white-space: pre-wrap;
-  word-break: break-all;
-  overflow: auto;
-  max-height: 240px;
-  display: block;
-}
-
-/* error */
-.error-title { color: #c0392b !important; }
-.error-title i { color: #c0392b !important; }
-.error-body { padding: 12px 16px; }
-.error-msg {
-  background: #fff8f8;
-  border-left: 3px solid #e74c3c;
-  border-radius: 3px;
-  padding: 8px 12px;
-  color: #c0392b;
-  font-size: 12px;
-  line-height: 1.7;
-  word-break: break-all;
-  white-space: pre-wrap;
-}
-
-/* http method */
-.method-GET    { background: #e8f5e9; color: #27ae60; }
-.method-POST   { background: #e3f2fd; color: #1565c0; }
-.method-PUT    { background: #fff3e0; color: #e65100; }
-.method-DELETE { background: #ffebee; color: #c62828; }
-
 /* text color */
 .text-navy {
   color: #1ab394;

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -74,8 +74,6 @@
       overflow: hidden !important;
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
-      height: 44px !important;
-      line-height: 44px !important;
     }
 
     // menu hover
@@ -107,96 +105,6 @@
         background-color: $base-sub-menu-hover !important;
       }
     }
-
-    // theme-dark 深色主题
-    &.theme-dark {
-      box-shadow: 2px 0 8px rgba(0, 0, 0, 0.4);
-      border-right: none;
-
-      .el-menu-item.is-active {
-        position: relative;
-
-        &::before {
-          content: '';
-          position: absolute;
-          inset: 0;
-          background-color: var(--current-color-dark-bg, rgba(64, 158, 255, 0.2));
-          border-right: 3px solid var(--current-color, #409eff);
-          pointer-events: none;
-          z-index: 1;
-        }
-      }
-
-      .el-submenu.is-active > .el-submenu__title {
-        color: var(--current-color, #409eff) !important;
-      }
-
-      .el-menu-item:not(.is-active),
-      .submenu-title-noDropdown,
-      .el-submenu__title {
-        position: relative;
-
-        &::before {
-          content: '';
-          position: absolute;
-          inset: 0;
-          background-color: transparent;
-          pointer-events: none;
-          z-index: 1;
-          transition: background-color 0.2s;
-        }
-
-        &:hover::before {
-          background-color: var(--current-color-dark-bg, rgba(64, 158, 255, 0.2));
-        }
-      }
-    }
-    
-    // theme-light 浅色主题
-    &.theme-light {
-      border-right: 1px solid #e8eaf0;
-      box-shadow: none;
-
-      .el-menu-item,
-      .el-submenu__title {
-        color: rgba(0, 0, 0, 0.65);
-      }
-
-      .el-menu-item.is-active {
-        color: var(--current-color, #409eff) !important;
-        position: relative;
-
-        &::before {
-          content: '';
-          position: absolute;
-          inset: 0;
-          background-color: var(--current-color-light, #ecf5ff);
-          border-right: 3px solid var(--current-color, #409eff);
-          pointer-events: none;
-          z-index: 1;
-        }
-      }
-
-      .el-submenu.is-active > .el-submenu__title {
-        color: var(--current-color, #409eff) !important;
-      }
-
-      .el-menu-item:not(.is-active):hover,
-      .submenu-title-noDropdown:hover,
-      .el-submenu__title:hover {
-        background-color: #f5f7fa !important;
-        color: rgba(0, 0, 0, 0.85) !important;
-      }
-
-      .nest-menu .el-submenu > .el-submenu__title,
-      .el-submenu .el-menu-item {
-        background-color: #fafafa !important;
-
-        &:hover {
-          background-color: #f0f5ff !important;
-        }
-      }
-    }
   }
 
   .hideSidebar {

ruoyi-ui/src/assets/styles/variables.scss

@@ -9,17 +9,32 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color: #bfcbd9;
-$base-menu-color-active: #ffffff;
-$base-menu-background: #1a1f2e;
+$base-menu-color:#bfcbd9;
+$base-menu-color-active:#f4f4f5;
+$base-menu-background:#304156;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background: #141824;
-$base-sub-menu-hover: rgba(255,255,255,.06);
+$base-sub-menu-background:#1f2d3d;
+$base-sub-menu-hover:#001528;
+
+// 自定义暗色菜单风格
+/**
+$base-menu-color:hsla(0,0%,100%,.65);
+$base-menu-color-active:#fff;
+$base-menu-background:#001529;
+$base-logo-title-color: #ffffff;
+
+$base-menu-light-color:rgba(0,0,0,.70);
+$base-menu-light-background:#ffffff;
+$base-logo-light-title-color: #001529;
+
+$base-sub-menu-background:#000c17;
+$base-sub-menu-hover:#001528;
+*/
 
 $base-sidebar-width: 200px;
 

ruoyi-ui/src/components/HeaderSearch/index.vue

@@ -5,7 +5,6 @@
       :visible.sync="show"
       width="600px"
       @close="close"
-      @opened="onDialogOpened"
       :show-close="false"
       append-to-body
     >
@@ -22,54 +21,24 @@
         @keydown.down.native="navigateResult('down')"
       >
       </el-input>
-
-      <div class="result-count" v-if="search && options.length > 0">
-        找到 <strong>{{ options.length }}</strong> 个结果
-      </div>
-
       <el-scrollbar wrap-class="right-scrollbar-wrapper">
         <div class="result-wrap">
-          <template v-if="options.length > 0">
-            <div
-              class="search-item"
-              v-for="(item, index) in options"
-              :key="item.path"
-              :class="{ 'is-active': index === activeIndex }"
-              :style="activeStyle(index)"
-              @mouseenter="activeIndex = index"
-              @mouseleave="activeIndex = -1"
-            >
-              <div class="left">
-                <svg-icon class="menu-icon" :icon-class="item.icon" />
-              </div>
-              <div class="search-info" @click="change(item)">
-                <div class="menu-title" v-html="highlightText(item.title.join(' / '))"></div>
-                <div class="menu-path" v-html="highlightText(item.path)"></div>
-              </div>
-              <svg-icon icon-class="enter" v-show="index === activeIndex" />
+          <div class="search-item" v-for="(item, index) in options" :key="item.path" :style="activeStyle(index)" @mouseenter="activeIndex = index" @mouseleave="activeIndex = -1">
+            <div class="left">
+              <svg-icon class="menu-icon" :icon-class="item.icon" />
             </div>
-          </template>
-
-          <div class="empty-state" v-else-if="search && options.length === 0">
-            <i class="el-icon-search empty-icon"></i>
-            <p class="empty-text">未找到 "<strong>{{ search }}</strong>" 相关菜单</p>
-            <p class="empty-tip">试试其他关键词或路径</p>
+            <div class="search-info" @click="change(item)">
+              <div class="menu-title">
+                {{ item.title.join(" / ") }}
+              </div>
+              <div class="menu-path">
+                {{ item.path }}
+              </div>
+            </div>
+            <svg-icon icon-class="enter" v-show="index === activeIndex"/>
           </div>
-
-        </div>
+       </div>
       </el-scrollbar>
-
-      <div class="search-footer">
-        <span class="shortcut-item">
-          <kbd>↑</kbd><kbd>↓</kbd> 切换
-        </span>
-        <span class="shortcut-item">
-          <kbd>↵</kbd> 选择
-        </span>
-        <span class="shortcut-item">
-          <kbd>Esc</kbd> 关闭
-        </span>
-      </div>
     </el-dialog>
   </div>
 </template>
@@ -114,37 +83,33 @@ export default {
     click() {
       this.show = !this.show
       if (this.show) {
+        this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
         this.options = this.searchPool
       }
     },
-    onDialogOpened() {
-      this.$nextTick(() => {
-        this.$refs.headerSearchSelectRef && this.$refs.headerSearchSelectRef.focus()
-      })
-    },
     close() {
-      this.$refs.headerSearchSelectRef && this.$refs.headerSearchSelectRef.blur()
+      this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
       this.search = ''
-      this.options = this.searchPool
+      this.options = []
       this.show = false
       this.activeIndex = -1
     },
     change(val) {
-      const p = val.path
+      const path = val.path
       const query = val.query
-      if (isHttp(val.path)) {
+      if(isHttp(val.path)) {
         // http(s):// 路径新窗口打开
-        const pindex = p.indexOf('http')
-        window.open(p.substr(pindex, p.length), '_blank')
+        const pindex = path.indexOf("http")
+        window.open(path.substr(pindex, path.length), "_blank")
       } else {
         if (query) {
-          this.$router.push({ path: p, query: JSON.parse(query) })
+          this.$router.push({ path: path, query: JSON.parse(query) })
         } else {
-          this.$router.push(p)
+          this.$router.push(path)
         }
       }
       this.search = ''
-      this.options = this.searchPool
+      this.options = []
       this.$nextTick(() => {
         this.show = false
       })
@@ -152,7 +117,7 @@ export default {
     initFuse(list) {
       this.fuse = new Fuse(list, {
         shouldSort: true,
-        threshold: 0.2,
+        threshold: 0.4,
         minMatchCharLength: 1,
         keys: [{
           name: 'title',
@@ -163,25 +128,37 @@ export default {
         }]
       })
     },
+    // Filter out the routes that can be displayed in the sidebar
+    // And generate the internationalized title
     generateRoutes(routes, basePath = '/', prefixTitle = []) {
       let res = []
+
       for (const router of routes) {
+        // skip hidden router
         if (router.hidden) { continue }
+
         const data = {
           path: !isHttp(router.path) ? path.resolve(basePath, router.path) : router.path,
           title: [...prefixTitle],
           icon: ''
         }
+
         if (router.meta && router.meta.title) {
           data.title = [...data.title, router.meta.title]
           data.icon = router.meta.icon
+
           if (router.redirect !== 'noRedirect') {
+            // only push the routes with title
+            // special case: need to exclude parent router without redirect
             res.push(data)
           }
         }
+
         if (router.query) {
           data.query = router.query
         }
+
+        // recursive child routes
         if (router.children) {
           const tempRoutes = this.generateRoutes(router.children, data.path, data.title)
           if (tempRoutes.length >= 1) {
@@ -194,18 +171,7 @@ export default {
     querySearch(query) {
       this.activeIndex = -1
       if (query !== '') {
-        const q = query.toLowerCase()
-        const pathMatches = this.searchPool.filter(item =>
-          item.path.toLowerCase().includes(q)
-        )
-        const fuseMatches = this.fuse.search(query).map(item => item.item)
-        const merged = [...pathMatches]
-        fuseMatches.forEach(item => {
-          if (!merged.find(m => m.path === item.path)) {
-            merged.push(item)
-          }
-        })
-        this.options = merged
+        this.options = this.fuse.search(query).map((item) => item.item) ?? this.searchPool
       } else {
         this.options = this.searchPool
       }
@@ -213,14 +179,14 @@ export default {
     activeStyle(index) {
       if (index !== this.activeIndex) return {}
       return {
-        'background-color': this.theme,
-        'color': '#fff'
+        "background-color": this.theme,
+        "color": "#fff"
       }
     },
     navigateResult(direction) {
-      if (direction === 'up') {
+      if (direction === "up") {
         this.activeIndex = this.activeIndex <= 0 ? this.options.length - 1 : this.activeIndex - 1
-      } else if (direction === 'down') {
+      } else if (direction === "down") {
         this.activeIndex = this.activeIndex >= this.options.length - 1 ? 0 : this.activeIndex + 1
       }
     },
@@ -228,16 +194,6 @@ export default {
       if (this.options.length > 0 && this.activeIndex >= 0) {
         this.change(this.options[this.activeIndex])
       }
-    },
-    highlightText(text) {
-      if (!text) return ''
-      if (!this.search) return text
-      const keyword = this.escapeRegExp(this.search)
-      const reg = new RegExp(`(${keyword})`, 'gi')
-      return text.replace(reg, '<span class="highlight">$1</span>')
-    },
-    escapeRegExp(str) {
-      return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
     }
   }
 }
@@ -246,17 +202,7 @@ export default {
 <style lang='scss' scoped>
 ::v-deep {
   .el-dialog__header {
-    padding: 6px !important;
-  }
-
-  .highlight {
-    color: red;
-    font-weight: 600;
-  }
-
-  .is-active .highlight {
-    color: rgba(255, 255, 255, 0.9);
-    font-weight: 600;
+    padding: 0 !important;
   }
 }
 
@@ -268,33 +214,19 @@ export default {
   }
 }
 
-.result-count {
-  padding: 6px 16px 0;
-  font-size: 12px;
-  color: #aaa;
-
-  strong {
-    color: red;
-    font-weight: 600;
-  }
-}
-
 .result-wrap {
   height: 280px;
-  margin: 4px 0;
+  margin: 6px 0;
 
   .search-item {
     display: flex;
     height: 48px;
     align-items: center;
     padding-right: 10px;
-    border-radius: 4px;
-    transition: background 0.15s;
 
     .left {
       width: 60px;
       text-align: center;
-      flex-shrink: 0;
 
       .menu-icon {
         width: 18px;
@@ -310,16 +242,11 @@ export default {
       flex-direction: column;
       justify-content: flex-start;
       flex: 1;
-      overflow: hidden;
 
       .menu-title,
       .menu-path {
         height: 20px;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
       }
-
       .menu-path {
         color: #ccc;
         font-size: 10px;
@@ -330,68 +257,6 @@ export default {
   .search-item:hover {
     cursor: pointer;
   }
-
-  .empty-state {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-
-    .empty-icon {
-      font-size: 42px;
-      color: #e0e0e0;
-      margin-bottom: 14px;
-    }
-
-    .empty-text {
-      font-size: 14px;
-      color: #999;
-      margin: 0 0 6px;
-
-      strong {
-        color: #666;
-      }
-    }
-
-    .empty-tip {
-      font-size: 12px;
-      color: #bbb;
-      margin: 0;
-    }
-  }
 }
+</style>
 
-.search-footer {
-  display: flex;
-  align-items: center;
-  gap: 28px;
-  padding: 10px 20px;
-  border-top: 1px solid #f0f0f0;
-  color: #999;
-  font-size: 12px;
-
-  .shortcut-item {
-    display: flex;
-    align-items: center;
-    gap: 5px;
-  }
-
-  kbd {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    min-width: 20px;
-    height: 20px;
-    padding: 0 5px;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    background: #f7f7f7;
-    color: #555;
-    font-size: 11px;
-    font-family: inherit;
-    line-height: 1;
-    box-shadow: 0 1px 0 #ccc;
-  }
-}
-</style>

ruoyi-ui/src/components/RightToolbar/index.vue

@@ -123,34 +123,7 @@ export default {
   methods: {
     // 搜索
     toggleSearch() {
-      let el = this.$el
-      let formEl = null
-      while ((el = el.parentElement) && el !== document.body) {
-        if ((formEl = el.querySelector('.el-form'))) break
-      }
-      if (!formEl) return this.$emit('update:showSearch', !this.showSearch)
-      this._animateSearch(formEl, this.showSearch)
-    },
-    // 搜索栏动画
-    _animateSearch(el, isHide) {
-      const DURATION = 260
-      const TRANSITION = 'max-height 0.25s ease, opacity 0.2s ease'
-      const clear = () => Object.assign(el.style, { transition: '', maxHeight: '', opacity: '', overflow: '' })
-      Object.assign(el.style, { overflow: 'hidden', transition: '' })
-      if (isHide) {
-        Object.assign(el.style, { maxHeight: el.scrollHeight + 'px', opacity: '1', transition: TRANSITION })
-        requestAnimationFrame(() => Object.assign(el.style, { maxHeight: '0', opacity: '0' }))
-        setTimeout(() => { this.$emit('update:showSearch', false); clear() }, DURATION)
-      } else {
-        this.$emit('update:showSearch', true)
-        this.$nextTick(() => {
-          Object.assign(el.style, { maxHeight: '0', opacity: '0' })
-          requestAnimationFrame(() => requestAnimationFrame(() => {
-            Object.assign(el.style, { transition: TRANSITION, maxHeight: el.scrollHeight + 'px', opacity: '1' })
-          }))
-          setTimeout(clear, DURATION)
-        })
-      }
+      this.$emit("update:showSearch", !this.showSearch)
     },
     // 刷新
     refresh() {

ruoyi-ui/src/components/ThemePicker/index.vue

@@ -1,170 +1,170 @@
-<template>
-  <el-color-picker
-    v-model="theme"
-    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
-    class="theme-picker"
-    popper-class="theme-picker-dropdown"
-  />
-</template>
-
-<script>
-const ORIGINAL_THEME = '#409EFF' // default color
-
-export default {
-  data() {
-    return {
-      chalk: '', // content of theme-chalk css
-      theme: ''
-    }
-  },
-  computed: {
-    defaultTheme() {
-      return this.$store.state.settings.theme
-    }
-  },
-  watch: {
-    defaultTheme: {
-      handler: function(val, oldVal) {
-        this.theme = val
-      },
-      immediate: true
-    },
-    async theme(val) {
-      await this.setTheme(val)
-    }
-  },
-  created() {
-    if(this.defaultTheme !== ORIGINAL_THEME) {
-      this.setTheme(this.defaultTheme)
-    }
-  },
-  methods: {
-    async setTheme(val) {
-      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
-      if (typeof val !== 'string') return
-      const themeCluster = this.getThemeCluster(val.replace('#', ''))
-      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-
-      const getHandler = (variable, id) => {
-        return () => {
-          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
-          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
-
-          let styleTag = document.getElementById(id)
-          if (!styleTag) {
-            styleTag = document.createElement('style')
-            styleTag.setAttribute('id', id)
-            document.head.appendChild(styleTag)
-          }
-          styleTag.innerText = newStyle
-        }
-      }
-
-      if (!this.chalk) {
-        const url = `/styles/theme-chalk/index.css`
-        await this.getCSSString(url, 'chalk')
-      }
-
-      const chalkHandler = getHandler('chalk', 'chalk-style')
-      chalkHandler()
-
-      const styles = [].slice.call(document.querySelectorAll('style'))
-        .filter(style => {
-          const text = style.innerText
-          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
-        })
-      styles.forEach(style => {
-        const { innerText } = style
-        if (typeof innerText !== 'string') return
-        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
-      })
-
-      this.$emit('change', val)
-    },
-
-    updateStyle(style, oldCluster, newCluster) {
-      let newStyle = style
-      oldCluster.forEach((color, index) => {
-        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
-      })
-      return newStyle
-    },
-
-    getCSSString(url, variable) {
-      return new Promise(resolve => {
-        const xhr = new XMLHttpRequest()
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState === 4 && xhr.status === 200) {
-            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
-            resolve()
-          }
-        }
-        xhr.open('GET', url)
-        xhr.send()
-      })
-    },
-
-    getThemeCluster(theme) {
-      const tintColor = (color, tint) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        if (tint === 0) { // when primary color is in its rgb space
-          return [red, green, blue].join(',')
-        } else {
-          red += Math.round(tint * (255 - red))
-          green += Math.round(tint * (255 - green))
-          blue += Math.round(tint * (255 - blue))
-
-          red = red.toString(16)
-          green = green.toString(16)
-          blue = blue.toString(16)
-
-          return `#${red}${green}${blue}`
-        }
-      }
-
-      const shadeColor = (color, shade) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        red = Math.round((1 - shade) * red)
-        green = Math.round((1 - shade) * green)
-        blue = Math.round((1 - shade) * blue)
-
-        red = red.toString(16)
-        green = green.toString(16)
-        blue = blue.toString(16)
-
-        return `#${red}${green}${blue}`
-      }
-
-      const clusters = [theme]
-      for (let i = 0; i <= 9; i++) {
-        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
-      }
-      clusters.push(shadeColor(theme, 0.1))
-      return clusters
-    }
-  }
-}
-</script>
-
-<style>
-.theme-message,
-.theme-picker-dropdown {
-  z-index: 99999 !important;
-}
-
-.theme-picker .el-color-picker__trigger {
-  height: 26px !important;
-  width: 26px !important;
-  padding: 2px;
-}
-
-.theme-picker-dropdown .el-color-dropdown__link-btn {
-  display: none;
-}
-</style>
+<template>
+  <el-color-picker
+    v-model="theme"
+    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
+    class="theme-picker"
+    popper-class="theme-picker-dropdown"
+  />
+</template>
+
+<script>
+const ORIGINAL_THEME = '#409EFF' // default color
+
+export default {
+  data() {
+    return {
+      chalk: '', // content of theme-chalk css
+      theme: ''
+    }
+  },
+  computed: {
+    defaultTheme() {
+      return this.$store.state.settings.theme
+    }
+  },
+  watch: {
+    defaultTheme: {
+      handler: function(val, oldVal) {
+        this.theme = val
+      },
+      immediate: true
+    },
+    async theme(val) {
+      await this.setTheme(val)
+    }
+  },
+  created() {
+    if(this.defaultTheme !== ORIGINAL_THEME) {
+      this.setTheme(this.defaultTheme)
+    }
+  },
+  methods: {
+    async setTheme(val) {
+      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
+      if (typeof val !== 'string') return
+      const themeCluster = this.getThemeCluster(val.replace('#', ''))
+      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
+
+      const getHandler = (variable, id) => {
+        return () => {
+          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
+          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
+
+          let styleTag = document.getElementById(id)
+          if (!styleTag) {
+            styleTag = document.createElement('style')
+            styleTag.setAttribute('id', id)
+            document.head.appendChild(styleTag)
+          }
+          styleTag.innerText = newStyle
+        }
+      }
+
+      if (!this.chalk) {
+        const url = `/styles/theme-chalk/index.css`
+        await this.getCSSString(url, 'chalk')
+      }
+
+      const chalkHandler = getHandler('chalk', 'chalk-style')
+      chalkHandler()
+
+      const styles = [].slice.call(document.querySelectorAll('style'))
+        .filter(style => {
+          const text = style.innerText
+          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+        })
+      styles.forEach(style => {
+        const { innerText } = style
+        if (typeof innerText !== 'string') return
+        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
+      })
+
+      this.$emit('change', val)
+    },
+
+    updateStyle(style, oldCluster, newCluster) {
+      let newStyle = style
+      oldCluster.forEach((color, index) => {
+        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
+      })
+      return newStyle
+    },
+
+    getCSSString(url, variable) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest()
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+            resolve()
+          }
+        }
+        xhr.open('GET', url)
+        xhr.send()
+      })
+    },
+
+    getThemeCluster(theme) {
+      const tintColor = (color, tint) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        if (tint === 0) { // when primary color is in its rgb space
+          return [red, green, blue].join(',')
+        } else {
+          red += Math.round(tint * (255 - red))
+          green += Math.round(tint * (255 - green))
+          blue += Math.round(tint * (255 - blue))
+
+          red = red.toString(16)
+          green = green.toString(16)
+          blue = blue.toString(16)
+
+          return `#${red}${green}${blue}`
+        }
+      }
+
+      const shadeColor = (color, shade) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        red = Math.round((1 - shade) * red)
+        green = Math.round((1 - shade) * green)
+        blue = Math.round((1 - shade) * blue)
+
+        red = red.toString(16)
+        green = green.toString(16)
+        blue = blue.toString(16)
+
+        return `#${red}${green}${blue}`
+      }
+
+      const clusters = [theme]
+      for (let i = 0; i <= 9; i++) {
+        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+      }
+      clusters.push(shadeColor(theme, 0.1))
+      return clusters
+    }
+  }
+}
+</script>
+
+<style>
+.theme-message,
+.theme-picker-dropdown {
+  z-index: 99999 !important;
+}
+
+.theme-picker .el-color-picker__trigger {
+  height: 26px !important;
+  width: 26px !important;
+  padding: 2px;
+}
+
+.theme-picker-dropdown .el-color-dropdown__link-btn {
+  display: none;
+}
+</style>

ruoyi-ui/src/layout/components/AppMain.vue

@@ -51,14 +51,6 @@ export default {
   width: 100%;
   position: relative;
   overflow: hidden;
-
-  &:fullscreen,
-  &:-webkit-full-screen,
-  &:-moz-full-screen,
-  &:-ms-fullscreen {
-    background: #fff;
-    overflow-y: auto;
-  }
 }
 
 .fixed-header + .app-main {
@@ -137,4 +129,4 @@ export default {
   background-color: #c0c0c0;
   border-radius: 3px;
 }
-</style>
+</style>

ruoyi-ui/src/layout/components/HeaderNotice/index.vue

@@ -1,229 +0,0 @@
-<template>
-  <div>
-    <el-popover ref="noticePopover" placement="bottom-end" width="320" trigger="manual" :value="noticeVisible" popper-class="notice-popover">
-      <div class="notice-header">
-        <span class="notice-title">通知公告</span>
-        <span class="notice-mark-all" @click="markAllRead">全部已读</span>
-      </div>
-      <div v-if="noticeLoading" class="notice-loading"><i class="el-icon-loading"></i> 加载中...</div>
-      <div v-else-if="noticeList.length === 0" class="notice-empty"><i class="el-icon-inbox"></i><br>暂无公告</div>
-      <div v-else>
-        <div v-for="item in noticeList" :key="item.noticeId" class="notice-item" :class="{ 'is-read': item.isRead }" @click="previewNotice(item)">
-          <el-tag size="mini" :type="item.noticeType === '1' ? 'warning' : 'success'" class="notice-tag">
-            {{ item.noticeType === '1' ? '通知' : '公告' }}
-          </el-tag>
-          <span class="notice-item-title">{{ item.noticeTitle }}</span>
-          <span class="notice-item-date">{{ item.createTime }}</span>
-        </div>
-      </div>
-    </el-popover>
-
-    <div v-popover:noticePopover class="right-menu-item hover-effect notice-trigger" @mouseenter="onNoticeEnter" @mouseleave="onNoticeLeave">
-      <svg-icon icon-class="bell" />
-      <span v-if="unreadCount > 0" class="notice-badge">{{ unreadCount }}</span>
-    </div>
-
-    <el-dialog :title="previewTitle" :visible.sync="previewVisible" width="680px" append-to-body custom-class="notice-preview-dialog">
-      <div class="notice-preview-meta">
-        <el-tag size="small" :type="previewNoticeType === '1' ? 'warning' : 'success'">
-          {{ previewNoticeType === '1' ? '通知' : '公告' }}
-        </el-tag>
-        <span class="notice-preview-info"><i class="el-icon-user"></i> {{ previewCreateBy }}</span>
-        <span class="notice-preview-info"><i class="el-icon-time"></i> {{ previewCreateTime }}</span>
-      </div>
-      <div class="notice-preview-divider"></div>
-      <div class="notice-preview-content" v-html="previewContent"></div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listNoticeTop, markNoticeRead, markNoticeReadAll, getNotice } from '@/api/system/notice'
-
-export default {
-  name: 'HeaderNotice',
-  data() {
-    return {
-      noticeList: [], // 通知列表
-      unreadCount: 0, // 未读数量
-      noticeLoading: false, // 加载状态
-      noticeVisible: false, // 弹出层显示状态
-      noticeLeaveTimer: null, // 鼠标离开计时器
-      previewVisible: false, // 预览弹窗显示状态
-      previewTitle: '', // 预览弹窗标题
-      previewContent: '', // 预览弹窗内容
-      previewNoticeType: '', // 预览弹窗类型
-      previewCreateBy: '', // 预览弹窗创建人
-      previewCreateTime: '' // 预览弹窗创建时间
-    }
-  },
-  mounted() {
-    this.loadNoticeTop()
-  },
-  methods: {
-    // 鼠标移入铃铛区域
-    onNoticeEnter() {
-      clearTimeout(this.noticeLeaveTimer)
-      this.noticeVisible = true
-      this.$nextTick(() => {
-        const popper = this.$refs.noticePopover.$refs.popper
-        if (popper && !popper._noticeBound) {
-          popper._noticeBound = true
-          popper.addEventListener('mouseenter', () => clearTimeout(this.noticeLeaveTimer))
-          popper.addEventListener('mouseleave', () => {
-            this.noticeLeaveTimer = setTimeout(() => { this.noticeVisible = false }, 100)
-          })
-        }
-      })
-    },
-    // 鼠标离开铃铛区域
-    onNoticeLeave() {
-      this.noticeLeaveTimer = setTimeout(() => { this.noticeVisible = false }, 150)
-    },
-    // 加载顶部公告列表
-    loadNoticeTop() {
-      this.noticeLoading = true
-      listNoticeTop().then(res => {
-        this.noticeList = res.data || []
-        this.unreadCount = res.unreadCount !== undefined ? res.unreadCount : this.noticeList.filter(n => !n.isRead).length
-      }).finally(() => {
-        this.noticeLoading = false
-      })
-    },
-    // 预览公告详情
-    previewNotice(item) {
-      if (!item.isRead) {
-        markNoticeRead(item.noticeId).catch(() => {})
-        item.isRead = true
-        const idx = this.noticeList.indexOf(item)
-        if (idx !== -1) this.$set(this.noticeList, idx, { ...item, isRead: true })
-        this.unreadCount = Math.max(0, this.unreadCount - 1)
-      }
-      getNotice(item.noticeId).then(res => {
-        const notice = res.data
-        this.previewTitle = notice.noticeTitle
-        this.previewContent = notice.noticeContent
-        this.previewNoticeType = notice.noticeType
-        this.previewCreateBy = notice.createBy
-        this.previewCreateTime = notice.createTime
-        this.previewVisible = true
-      })
-    },
-    // 全部已读
-    markAllRead() {
-      const ids = this.noticeList.map(n => n.noticeId).join(',')
-      if (!ids) return
-      markNoticeReadAll(ids).catch(() => {})
-      this.noticeList = this.noticeList.map(n => ({ ...n, isRead: true }))
-      this.unreadCount = 0
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.notice-trigger {
-  position: relative;
-  transform: translateX(-6px);
-  .svg-icon { width: 1.2em; height: 1.2em; vertical-align: -0.2em; }
-  .notice-badge {
-    position: absolute;
-    top: 7px;
-    right: -3px;
-    background: #f56c6c;
-    color: #fff;
-    border-radius: 10px;
-    font-size: 10px;
-    height: 16px;
-    line-height: 16px;
-    padding: 0 4px;
-    min-width: 16px;
-    text-align: center;
-    white-space: nowrap;
-    pointer-events: none;
-  }
-}
-.notice-popover {
-  padding: 0 !important;
-}
-.notice-popover .notice-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 10px 14px;
-  background: #f7f9fb;
-  border-bottom: 1px solid #eee;
-  font-size: 13px;
-  font-weight: 600;
-  color: #333;
-}
-.notice-popover .notice-mark-all {
-  font-size: 12px;
-  color: #409EFF;
-  font-weight: normal;
-  cursor: pointer;
-}
-.notice-popover .notice-mark-all:hover { color: #2b7cc1; }
-.notice-popover .notice-loading,
-.notice-popover .notice-empty {
-  padding: 24px;
-  text-align: center;
-  color: #bbb;
-  font-size: 12px;
-  line-height: 1.8;
-}
-.notice-popover .notice-item {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 10px 14px;
-  border-bottom: 1px solid #f5f5f5;
-  cursor: pointer;
-  transition: background 0.15s;
-}
-.notice-popover .notice-item:last-child { border-bottom: none; }
-.notice-popover .notice-item:hover { background: #f7f9fb; }
-.notice-popover .notice-item.is-read .notice-tag,
-.notice-popover .notice-item.is-read .notice-item-title,
-.notice-popover .notice-item.is-read .notice-item-date { opacity: 0.45; filter: grayscale(1); color: #999; }
-.notice-popover .notice-tag { flex-shrink: 0; }
-.notice-popover .notice-item-title {
-  flex: 1;
-  font-size: 12px;
-  color: #333;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.notice-popover .notice-item-date {
-  flex-shrink: 0;
-  font-size: 11px;
-  color: #bbb;
-}
-::v-deep .notice-preview-dialog {
-  .el-dialog__body { padding: 0 20px 20px; }
-  .notice-preview-meta {
-    display: flex;
-    align-items: center;
-    gap: 14px;
-    padding: 12px 0;
-    font-size: 12px;
-    color: #888;
-    .notice-preview-info { display: flex; align-items: center; gap: 4px; }
-  }
-  .notice-preview-divider {
-    height: 1px;
-    background: linear-gradient(to right, transparent, #e2e8f0, transparent);
-    margin-bottom: 16px;
-  }
-  .notice-preview-content {
-    font-size: 14px;
-    line-height: 1.85;
-    color: #2d3748;
-    word-break: break-word;
-    img { max-width: 100%; border-radius: 4px; }
-    p { margin: 0 0 1em; }
-    a { color: #409EFF; text-decoration: underline; }
-  }
-}
-</style>

ruoyi-ui/src/layout/components/Navbar.vue

@@ -26,10 +26,6 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-        <el-tooltip content="消息通知" effect="dark" placement="bottom">
-          <header-notice id="header-notice" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
@@ -44,9 +40,6 @@
           <el-dropdown-item @click.native="setLayout" v-if="setting">
             <span>布局设置</span>
           </el-dropdown-item>
-          <el-dropdown-item @click.native="lockScreen">
-            <span>锁定屏幕</span>
-          </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
@@ -68,9 +61,9 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
-import HeaderNotice from './HeaderNotice'
 
 export default {
+  emits: ['setLayout'],
   components: {
     Breadcrumb,
     Logo,
@@ -81,8 +74,7 @@ export default {
     SizeSelect,
     Search,
     RuoYiGit,
-    RuoYiDoc,
-    HeaderNotice
+    RuoYiDoc
   },
   computed: {
     ...mapGetters([
@@ -114,12 +106,6 @@ export default {
     setLayout(event) {
       this.$emit('setLayout')
     },
-    lockScreen() {
-      const currentPath = this.$route.fullPath
-      this.$store.dispatch('lock/lockScreen', currentPath).then(() => {
-        this.$router.push('/lock')
-      })
-    },
     logout() {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',
@@ -187,6 +173,11 @@ export default {
     margin-left: 8px;
   }
 
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
+
   .right-menu {
     height: 100%;
     line-height: 50px;

ruoyi-ui/src/layout/components/Settings/index.vue

@@ -65,11 +65,6 @@
           <el-switch v-model="tagsView" class="drawer-switch" />
         </div>
 
-        <div class="drawer-item">
-          <span>持久化标签页</span>
-          <el-switch v-model="tagsViewPersist" :disabled="!tagsView" class="drawer-switch" />
-        </div>
-
         <div class="drawer-item">
           <span>显示页签图标</span>
           <el-switch v-model="tagsIcon" :disabled="!tagsView" class="drawer-switch" />
@@ -130,17 +125,6 @@ export default {
         })
       }
     },
-    tagsViewPersist: {
-      get() {
-        return this.$store.state.settings.tagsViewPersist
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'tagsViewPersist',
-          value: val
-        })
-      }
-    },
     tagsView: {
       get() {
         return this.$store.state.settings.tagsView
@@ -247,16 +231,12 @@ export default {
     },
     saveSetting() {
       this.$modal.loading("正在保存到本地，请稍候...")
-      if (!this.tagsViewPersist) {
-        this.$cache.local.remove('tags-view-visited')
-      }
       this.$cache.local.set(
         "layout-setting",
         `{
             "navType":${this.navType},
             "tagsView":${this.tagsView},
             "tagsIcon":${this.tagsIcon},
-            "tagsViewPersist":${this.tagsViewPersist},
             "fixedHeader":${this.fixedHeader},
             "sidebarLogo":${this.sidebarLogo},
             "dynamicTitle":${this.dynamicTitle},
@@ -269,7 +249,6 @@ export default {
     },
     resetSetting() {
       this.$modal.loading("正在清除设置缓存并刷新，请稍候...")
-      this.$cache.local.remove('tags-view-visited')
       this.$cache.local.remove("layout-setting")
       setTimeout("window.location.reload()", 1000)
     }

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :class="['sidebar-theme-wrapper', {'has-logo':showLogo}, settings.sideTheme]" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
         <logo v-if="showLogo" :collapse="isCollapse" />
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu

ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-const tagAndTagSpacing = 4
+const tagAndTagSpacing = 4 // tagAndTagSpacing
 
 export default {
   name: 'ScrollPane',
@@ -26,44 +26,13 @@ export default {
     this.scrollWrapper.removeEventListener('scroll', this.emitScroll)
   },
   methods: {
-    smoothScrollTo(target) {
-      const $scrollWrapper = this.scrollWrapper
-      const start = $scrollWrapper.scrollLeft
-      const distance = target - start
-      const duration = 300
-      let startTime = null
-
-      function ease(t, b, c, d) {
-        t /= d / 2
-        if (t < 1) return c / 2 * t * t + b
-        t--
-        return -c / 2 * (t * (t - 2) - 1) + b
-      }
-
-      const emit = this.$emit.bind(this)
-      function step(timestamp) {
-        if (!startTime) startTime = timestamp
-        const elapsed = timestamp - startTime
-        $scrollWrapper.scrollLeft = ease(elapsed, start, distance, duration)
-        if (elapsed < duration) {
-          requestAnimationFrame(step)
-        } else {
-          $scrollWrapper.scrollLeft = target
-          emit('updateArrows')
-        }
-      }
-
-      requestAnimationFrame(step)
-    },
     handleScroll(e) {
       const eventDelta = e.wheelDelta || -e.deltaY * 40
       const $scrollWrapper = this.scrollWrapper
       $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
-      this.$emit('updateArrows')
     },
     emitScroll() {
       this.$emit('scroll')
-      this.$emit('updateArrows')
     },
     moveToTarget(currentTag) {
       const $container = this.$refs.scrollContainer.$el
@@ -74,56 +43,34 @@ export default {
       let firstTag = null
       let lastTag = null
 
+      // find first tag and last tag
       if (tagList.length > 0) {
         firstTag = tagList[0]
         lastTag = tagList[tagList.length - 1]
       }
 
       if (firstTag === currentTag) {
-        this.smoothScrollTo(0)
+        $scrollWrapper.scrollLeft = 0
       } else if (lastTag === currentTag) {
-        this.smoothScrollTo($scrollWrapper.scrollWidth - $containerWidth)
+        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
       } else {
+        // find preTag and nextTag
         const currentIndex = tagList.findIndex(item => item === currentTag)
         const prevTag = tagList[currentIndex - 1]
         const nextTag = tagList[currentIndex + 1]
+
+        // the tag's offsetLeft after of nextTag
         const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
+
+        // the tag's offsetLeft before of prevTag
         const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
 
         if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          this.smoothScrollTo(afterNextTagOffsetLeft - $containerWidth)
+          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
         } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          this.smoothScrollTo(beforePrevTagOffsetLeft)
+          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
         }
       }
-    },
-    // 向左滚动固定距离
-    scrollLeft() {
-      const $scrollWrapper = this.scrollWrapper
-      this.smoothScrollTo(Math.max(0, $scrollWrapper.scrollLeft - 200))
-    },
-    // 向右滚动固定距离
-    scrollRight() {
-      const $scrollWrapper = this.scrollWrapper
-      const maxScroll = $scrollWrapper.scrollWidth - $scrollWrapper.clientWidth
-      this.smoothScrollTo(Math.min(maxScroll, $scrollWrapper.scrollLeft + 200))
-    },
-    // 直接平滑滚动到最左端
-    scrollToStart() {
-      this.smoothScrollTo(0)
-    },
-    // 直接平滑滚动到最右端
-    scrollToEnd() {
-      const $scrollWrapper = this.scrollWrapper
-      this.smoothScrollTo($scrollWrapper.scrollWidth - $scrollWrapper.clientWidth)
-    },
-    // 获取是否可以继续向左/右滚动
-    getScrollState() {
-      const $scrollWrapper = this.scrollWrapper
-      return {
-        canLeft: $scrollWrapper.scrollLeft > 0,
-        canRight: $scrollWrapper.scrollLeft < $scrollWrapper.scrollWidth - $scrollWrapper.clientWidth - 1
-      }
     }
   }
 }
@@ -140,9 +87,7 @@ export default {
       bottom: 0px;
     }
     .el-scrollbar__wrap {
-      height: 34px;
-      display: flex;
-      align-items: center;
+      height: 49px;
     }
   }
 }

ruoyi-ui/src/layout/components/TagsView/index.vue

@@ -1,12 +1,6 @@
 <template>
   <div id="tags-view-container" class="tags-view-container">
-    <!-- 左切换箭头 -->
-    <span class="tags-nav-btn tags-nav-btn--left" :class="{ disabled: !canScrollLeft }" @click="scrollLeft">
-      <i class="el-icon-arrow-left" />
-    </span>
-
-    <!-- 标签滚动区 -->
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll" @updateArrows="updateArrowState">
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link
         v-for="tag in visitedViews"
         ref="tag"
@@ -16,45 +10,15 @@
         tag="span"
         class="tags-view-item"
         :style="activeStyle(tag)"
-        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
-        @contextmenu.prevent.native="openMenu(tag, $event)"
+        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
+        @contextmenu.prevent.native="openMenu(tag,$event)"
       >
         <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" />
         {{ tag.title }}
         <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
-
-    <!-- 右切换箭头 -->
-    <span class="tags-nav-btn tags-nav-btn--right" :class="{ disabled: !canScrollRight }" @click="scrollRight">
-      <i class="el-icon-arrow-right" />
-    </span>
-
-    <!-- 下拉操作菜单 -->
-    <el-dropdown class="tags-action-dropdown" trigger="click" placement="bottom-end" @command="handleDropdownCommand">
-      <span class="tags-action-btn">
-        <i class="el-icon-arrow-down" />
-      </span>
-      <el-dropdown-menu slot="dropdown" class="tags-dropdown-menu">
-        <el-dropdown-item v-if="!isAffix(selectedDropdownTag)" command="close" icon="el-icon-close">关闭当前</el-dropdown-item>
-        <el-dropdown-item command="closeOthers" icon="el-icon-circle-close">关闭其他</el-dropdown-item>
-        <el-dropdown-item command="closeLeft" :disabled="isFirstView()" icon="el-icon-back">关闭左侧</el-dropdown-item>
-        <el-dropdown-item command="closeRight" :disabled="isLastView()" icon="el-icon-right">关闭右侧</el-dropdown-item>
-        <el-dropdown-item command="closeAll" icon="el-icon-circle-close">全部关闭</el-dropdown-item>
-        <el-dropdown-item command="fullscreen" divided>
-          <template v-if="!isFullscreen"><i class="el-icon-full-screen"></i>全屏显示</template>
-          <template v-else><i class="el-icon-close"></i>退出全屏</template>
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-
-    <!-- 刷新按钮 -->
-    <span class="tags-action-btn tags-refresh-btn" title="刷新页面" @click="refreshSelectedTag(selectedDropdownTag)">
-      <i class="el-icon-refresh-right" /> 刷新
-    </span>
-
-    <!-- 右键上下文菜单 -->
-    <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
+    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前</li>
       <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
@@ -77,11 +41,7 @@ export default {
       top: 0,
       left: 0,
       selectedTag: {},
-      affixTags: [],
-      canScrollLeft: false,
-      canScrollRight: false,
-      isFullscreen: false,
-      hiddenElements: []
+      affixTags: []
     }
   },
   computed: {
@@ -96,9 +56,6 @@ export default {
     },
     tagsIcon() {
       return this.$store.state.settings.tagsIcon
-    },
-    selectedDropdownTag() {
-      return this.visitedViews.find(v => this.isActive(v)) || {}
     }
   },
   watch: {
@@ -112,30 +69,13 @@ export default {
       } else {
         document.body.removeEventListener('click', this.closeMenu)
       }
-    },
-    visitedViews() {
-      this.$nextTick(() => {
-        this.updateArrowState()
-      })
     }
   },
   mounted() {
     this.initTags()
     this.addTags()
-    window.addEventListener('resize', this.updateArrowState)
-    window.addEventListener('keydown', this.handleKeyDown)
-  },
-  beforeDestroy() {
-    window.removeEventListener('resize', this.updateArrowState)
-    window.removeEventListener('keydown', this.handleKeyDown)
   },
   methods: {
-    handleKeyDown(event) {
-      // 当按下Esc键且处于全屏状态时，退出全屏
-      if (event.key === 'Escape' && this.isFullscreen) {
-        this.toggleFullscreen()
-      }
-    },
     isActive(route) {
       return route.path === this.$route.path
     },
@@ -147,20 +87,18 @@ export default {
       }
     },
     isAffix(tag) {
-      return tag && tag.meta && tag.meta.affix
+      return tag.meta && tag.meta.affix
     },
     isFirstView() {
       try {
-        const tag = this.selectedTag && this.selectedTag.fullPath ? this.selectedTag : this.selectedDropdownTag
-        return tag.fullPath === '/index' || tag.fullPath === this.visitedViews[1].fullPath
+        return this.selectedTag.fullPath === '/index' || this.selectedTag.fullPath === this.visitedViews[1].fullPath
       } catch (err) {
         return false
       }
     },
     isLastView() {
       try {
-        const tag = this.selectedTag && this.selectedTag.fullPath ? this.selectedTag : this.selectedDropdownTag
-        return tag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+        return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
       } catch (err) {
         return false
       }
@@ -187,13 +125,11 @@ export default {
       return tags
     },
     initTags() {
-      if (this.$store.state.settings.tagsViewPersist) {
-        this.$store.dispatch('tagsView/loadPersistedViews')
-      }
       const affixTags = this.affixTags = this.filterAffixTags(this.routes)
       for (const tag of affixTags) {
+        // Must have tag name
         if (tag.name) {
-          this.$store.dispatch('tagsView/addAffixView', tag)
+          this.$store.dispatch('tagsView/addVisitedView', tag)
         }
       }
     },
@@ -209,6 +145,7 @@ export default {
         for (const tag of tags) {
           if (tag.to.path === this.$route.path) {
             this.$refs.scrollPane.moveToTarget(tag)
+            // when query is different then update
             if (tag.to.fullPath !== this.$route.fullPath) {
               this.$store.dispatch('tagsView/updateVisitedView', this.$route)
             }
@@ -217,85 +154,6 @@ export default {
         }
       })
     },
-    scrollLeft() {
-      if (!this.canScrollLeft) return
-      this.$refs.scrollPane.scrollToStart()
-    },
-    scrollRight() {
-      if (!this.canScrollRight) return
-      this.$refs.scrollPane.scrollToEnd()
-    },
-    updateArrowState() {
-      this.$nextTick(() => {
-        if (this.$refs.scrollPane) {
-          const state = this.$refs.scrollPane.getScrollState()
-          this.canScrollLeft = state.canLeft
-          this.canScrollRight = state.canRight
-        }
-      })
-    },
-    toggleFullscreen() {
-      const mainContainer = document.querySelector('.main-container')
-      const navbar = document.querySelector('.navbar')
-      const sidebar = document.querySelector('.sidebar-container')
-      if (!mainContainer) return
-
-      if (!this.isFullscreen) {
-        mainContainer.classList.add('fullscreen-mode')
-        document.body.style.overflow = 'hidden'
-        const elementsToHide = [
-          { el: navbar, originalDisplay: (navbar && navbar.style.display) || '' }, 
-          { el: sidebar, originalDisplay: (sidebar && sidebar.style.display) || '' }
-        ]
-        elementsToHide.forEach(item => {
-          if (item.el && item.el.style.display !== 'none') {
-            item.originalDisplay = item.el.style.display
-            item.el.style.display = 'none'
-            this.hiddenElements.push(item)
-          }
-        })
-        this.isFullscreen = true
-      } else {
-        mainContainer.classList.remove('fullscreen-mode')
-        document.body.style.overflow = ''
-        this.hiddenElements.forEach(item => {
-          if (item.el) {
-            item.el.style.display = item.originalDisplay
-          }
-        })
-        this.hiddenElements = []
-        const btn = document.querySelector('.tags-action-btn')
-        if (btn) btn.blur()
-        this.isFullscreen = false
-      }
-    },
-    handleDropdownCommand(command) {
-      const tag = this.selectedDropdownTag
-      this.selectedTag = tag
-      switch (command) {
-        case 'refresh':
-          this.refreshSelectedTag(tag)
-          break
-        case 'fullscreen':
-          this.toggleFullscreen()
-          break
-        case 'close':
-          this.closeSelectedTag(tag)
-          break
-        case 'closeOthers':
-          this.closeOthersTags()
-          break
-        case 'closeLeft':
-          this.closeLeftTags()
-          break
-        case 'closeRight':
-          this.closeRightTags()
-          break
-        case 'closeAll':
-          this.closeAllTags(tag)
-          break
-      }
-    },
     refreshSelectedTag(view) {
       this.$tab.refreshPage(view)
       if (this.$route.meta.link) {
@@ -324,7 +182,7 @@ export default {
       })
     },
     closeOthersTags() {
-      this.$router.push(this.selectedTag.fullPath).catch(() => {})
+      this.$router.push(this.selectedTag.fullPath).catch(()=>{})
       this.$tab.closeOtherPage(this.selectedTag).then(() => {
         this.moveToCurrentTag()
       })
@@ -342,7 +200,10 @@ export default {
       if (latestView) {
         this.$router.push(latestView.fullPath)
       } else {
-        if (view && view.name === 'Dashboard') {
+        // now the default is to redirect to the home page if there is no tags-view,
+        // you can adjust it according to your needs.
+        if (view.name === 'Dashboard') {
+          // to reload home page
           this.$router.replace({ path: '/redirect' + view.fullPath })
         } else {
           this.$router.push('/')
@@ -350,7 +211,18 @@ export default {
       }
     },
     openMenu(tag, e) {
-      this.left = e.clientX
+      const menuMinWidth = 105
+      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
+      const offsetWidth = this.$el.offsetWidth // container width
+      const maxLeft = offsetWidth - menuMinWidth // left boundary
+      const left = e.clientX - offsetLeft + 15 // 15: margin right
+
+      if (left > maxLeft) {
+        this.left = maxLeft
+      } else {
+        this.left = left
+      }
+
       this.top = e.clientY
       this.visible = true
       this.selectedTag = tag
@@ -360,7 +232,6 @@ export default {
     },
     handleScroll() {
       this.closeMenu()
-      this.updateArrowState()
     }
   }
 }
@@ -372,52 +243,8 @@ export default {
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;
-  display: flex;
-  align-items: center;
-
-  $btn-width: 28px;
-  $btn-color: #71717a;
-  $btn-hover-bg: #f0f2f5;
-  $btn-hover-color: #303133;
-  $btn-disabled-color: #c0c4cc;
-  $divider: 1px solid #d8dce5;
-
-  .tags-nav-btn {
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: $btn-width;
-    height: 34px;
-    cursor: pointer;
-    color: $btn-color;
-    font-size: 13px;
-    user-select: none;
-    transition: background 0.15s, color 0.15s;
-
-    &:hover:not(.disabled) {
-      background: $btn-hover-bg;
-      color: $btn-hover-color;
-    }
-
-    &.disabled {
-      color: $btn-disabled-color;
-      cursor: not-allowed;
-    }
-
-    &--left {
-      border-right: $divider;
-    }
-
-    &--right {
-      border-left: $divider;
-    }
-  }
-
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
   .tags-view-wrapper {
-    flex: 1;
-    min-width: 0;
-
     .tags-view-item {
       display: inline-block;
       position: relative;
@@ -430,10 +257,9 @@ export default {
       padding: 0 8px;
       font-size: 12px;
       margin-left: 5px;
-      border-radius: 3px;
-
+      margin-top: 4px;
       &:first-of-type {
-        margin-left: 6px;
+        margin-left: 15px;
       }
       &:last-of-type {
         margin-right: 15px;
@@ -460,40 +286,11 @@ export default {
     content: none !important;
   }
 
-  .tags-action-dropdown {
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-  }
-
-  .tags-action-btn {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: $btn-width;
-    height: 34px;
-    cursor: pointer;
-    color: $btn-color;
-    font-size: 13px;
-    border-left: $divider;
-    user-select: none;
-    transition: background 0.15s, color 0.15s;
-
-    &:hover {
-      background: $btn-hover-bg;
-      color: $btn-hover-color;
-    }
-  }
-
-  .tags-refresh-btn {
-    width: 60px;
-  }
-
   .contextmenu {
     margin: 0;
     background: #fff;
     z-index: 3000;
-    position: fixed;
+    position: absolute;
     list-style-type: none;
     padding: 5px 0;
     border-radius: 4px;
@@ -501,7 +298,6 @@ export default {
     font-weight: 400;
     color: #333;
     box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-
     li {
       margin: 0;
       padding: 7px 16px;
@@ -515,6 +311,7 @@ export default {
 </style>
 
 <style lang="scss">
+//reset element css of el-icon-close
 .tags-view-wrapper {
   .tags-view-item {
     .el-icon-close {
@@ -537,41 +334,4 @@ export default {
     }
   }
 }
-
-/* 页签全屏模式样式 */
-.main-container.fullscreen-mode {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-  overflow: hidden;
-}
-
-.main-container.fullscreen-mode .fixed-header {
-  display: block !important;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  width: 100% !important;
-  z-index: 1000;
-}
-
-.main-container.fullscreen-mode .fixed-header .navbar {
-  display: none !important;
-}
-
-.main-container.fullscreen-mode .app-main {
-  position: fixed;
-  top: 34px;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  margin: 0 !important;
-  padding: 0 !important;
-  height: calc(100vh - 34px) !important;
-  min-height: calc(100vh - 34px) !important;
-  overflow: auto;
-}
 </style>

ruoyi-ui/src/layout/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme, '--current-color-light': theme + '1a', '--current-color-dark-bg': theme + '33'}">
+  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
     <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">

ruoyi-ui/src/permission.js

@@ -19,19 +19,12 @@ router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
-    const isLock = store.getters.isLock
     /* has token*/
     if (to.path === '/login') {
       next({ path: '/' })
       NProgress.done()
     } else if (isWhiteList(to.path)) {
       next()
-    } else if (isLock && to.path !== '/lock') {
-      next({ path: '/lock' })
-      NProgress.done()
-    } else if (!isLock && to.path === '/lock') {
-      next({ path: '/' })
-      NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true

ruoyi-ui/src/plugins/tab.js

@@ -5,10 +5,6 @@ export default {
   // 刷新当前tab页签
   refreshPage(obj) {
     const { path, query, matched } = router.currentRoute
-    // 防止在重定向过程中重复刷新
-    if (path.startsWith('/redirect/')) {
-      return Promise.resolve()
-    }
     if (obj === undefined) {
       matched.forEach((m) => {
         if (m.components && m.components.default && m.components.default.name) {

ruoyi-ui/src/router/index.js

@@ -74,12 +74,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/lock',
-    component: () => import('@/views/lock'),
-    hidden: true,
-    meta: { title: '锁定屏幕' }
-  },
   {
     path: '/user',
     component: Layout,

ruoyi-ui/src/settings.js

@@ -23,12 +23,7 @@ module.exports = {
    * 是否显示 tagsView
    */
   tagsView: true,
-
-  /**
-   * 持久化标签页
-   */
-  tagsViewPersist: false,
-
+  
   /**
    * 显示页签图标
    */

ruoyi-ui/src/store/getters.js

@@ -3,8 +3,6 @@ const getters = {
   size: state => state.app.size,
   device: state => state.app.device,
   dict: state => state.dict.dict,
-  isLock: state => state.lock.isLock,
-  lockPath: state => state.lock.lockPath,
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,

ruoyi-ui/src/store/index.js

@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import app from './modules/app'
-import lock from './modules/lock'
 import dict from './modules/dict'
 import user from './modules/user'
 import tagsView from './modules/tagsView'
@@ -14,7 +13,6 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   modules: {
     app,
-    lock,
     dict,
     user,
     tagsView,

ruoyi-ui/src/store/modules/lock.js

@@ -1,34 +0,0 @@
-const LOCK_KEY = 'screen-lock'
-const LOCK_PATH_KEY = 'screen-lock-path'
-
-const lock = {
-  namespaced: true,
-  state: {
-    isLock: JSON.parse(localStorage.getItem(LOCK_KEY) || 'false'),
-    lockPath: localStorage.getItem(LOCK_PATH_KEY) || '/index'
-  },
-  mutations: {
-    SET_LOCK(state, status) {
-      state.isLock = status
-      localStorage.setItem(LOCK_KEY, JSON.stringify(status))
-    },
-    SET_LOCK_PATH(state, path) {
-      state.lockPath = path
-      localStorage.setItem(LOCK_PATH_KEY, path)
-    }
-  },
-  actions: {
-    // 锁定屏幕，同时记录当前路径
-    lockScreen({ commit }, currentPath) {
-      commit('SET_LOCK_PATH', currentPath || '/index')
-      commit('SET_LOCK', true)
-    },
-    // 解锁屏幕，清除路径
-    unlockScreen({ commit }) {
-      commit('SET_LOCK', false)
-      commit('SET_LOCK_PATH', '/index')
-    }
-  }
-}
-
-export default lock

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, tagsViewPersist, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings
+const { sideTheme, showSettings, navType, tagsView, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
@@ -11,7 +11,6 @@ const state = {
   showSettings: showSettings,
   navType: storageSetting.navType === undefined ? navType : storageSetting.navType,
   tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
-  tagsViewPersist: storageSetting.tagsViewPersist === undefined ? tagsViewPersist : storageSetting.tagsViewPersist,
   tagsIcon: storageSetting.tagsIcon === undefined ? tagsIcon : storageSetting.tagsIcon,
   fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
   sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,

ruoyi-ui/src/store/modules/tagsView.js

@@ -1,26 +1,3 @@
-import store from '@/store'
-import cache from '@/plugins/cache'
-
-const PERSIST_KEY = 'tags-view-visited'
-
-function isPersistEnabled() {
-  return store.state.settings.tagsViewPersist
-}
-
-function saveVisitedViews(views) {
-  if (!isPersistEnabled()) return
-  const toSave = views.filter(v => !(v.meta && v.meta.affix)).map(v => ({ path: v.path, fullPath: v.fullPath, name: v.name, title: v.title, query: v.query, meta: v.meta }))
-  cache.local.setJSON(PERSIST_KEY, toSave)
-}
-
-function loadVisitedViews() {
-  return cache.local.getJSON(PERSIST_KEY) || []
-}
-
-function clearVisitedViews() {
-  cache.local.remove(PERSIST_KEY)
-}
-
 const state = {
   visitedViews: [],
   cachedViews: [],
@@ -43,15 +20,6 @@ const mutations = {
         title: view.meta.title || 'no-name'
       })
     )
-    saveVisitedViews(state.visitedViews)
-  },
-  ADD_VISITED_VIEW_FIRST: (state, view) => {
-    if (state.visitedViews.some(v => v.path === view.path)) return
-    state.visitedViews.unshift(
-      Object.assign({}, view, {
-        title: view.meta.title || 'no-name'
-      })
-    )
   },
   ADD_CACHED_VIEW: (state, view) => {
     if (state.cachedViews.includes(view.name)) return
@@ -67,7 +35,6 @@ const mutations = {
       }
     }
     state.iframeViews = state.iframeViews.filter(item => item.path !== view.path)
-    saveVisitedViews(state.visitedViews)
   },
   DEL_IFRAME_VIEW: (state, view) => {
     state.iframeViews = state.iframeViews.filter(item => item.path !== view.path)
@@ -82,7 +49,6 @@ const mutations = {
       return v.meta.affix || v.path === view.path
     })
     state.iframeViews = state.iframeViews.filter(item => item.path === view.path)
-    saveVisitedViews(state.visitedViews)
   },
   DEL_OTHERS_CACHED_VIEWS: (state, view) => {
     const index = state.cachedViews.indexOf(view.name)
@@ -97,7 +63,6 @@ const mutations = {
     const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
     state.visitedViews = affixTags
     state.iframeViews = []
-    clearVisitedViews()
   },
   DEL_ALL_CACHED_VIEWS: state => {
     state.cachedViews = []
@@ -129,7 +94,6 @@ const mutations = {
       }
       return false
     })
-    saveVisitedViews(state.visitedViews)
   },
   DEL_LEFT_VIEWS: (state, view) => {
     const index = state.visitedViews.findIndex(v => v.path === view.path)
@@ -150,7 +114,6 @@ const mutations = {
       }
       return false
     })
-    saveVisitedViews(state.visitedViews)
   }
 }
 
@@ -165,9 +128,6 @@ const actions = {
   addVisitedView({ commit }, view) {
     commit('ADD_VISITED_VIEW', view)
   },
-  addAffixView({ commit }, view) {
-    commit('ADD_VISITED_VIEW_FIRST', view)
-  },
   addCachedView({ commit }, view) {
     commit('ADD_CACHED_VIEW', view)
   },
@@ -258,13 +218,6 @@ const actions = {
       resolve([...state.visitedViews])
     })
   },
-  // 恢复持久化的 tags
-  loadPersistedViews({ commit }) {
-    const views = loadVisitedViews()
-    views.forEach(view => {
-      commit('ADD_VISITED_VIEW', view)
-    })
-  },
 }
 
 export default {

ruoyi-ui/src/store/modules/user.js

@@ -1,4 +1,3 @@
-import store from '@/store'
 import router from '@/router'
 import { MessageBox, } from 'element-ui'
 import { login, logout, getInfo, refreshToken } from '@/api/login'
@@ -58,7 +57,6 @@ const user = {
           commit('SET_TOKEN', data.access_token)
           setExpiresIn(data.expires_in)
           commit('SET_EXPIRES_IN', data.expires_in)
-          store.dispatch('lock/unlockScreen')
           resolve()
         }).catch(error => {
           reject(error)

ruoyi-ui/src/views/index.vue

@@ -108,41 +108,6 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
-            <el-collapse-item title="v3.6.8 - 2026-03-30">
-              <ol>
-                <li>新增锁定屏幕功能</li>
-                <li>首页新增通知公告消息提醒</li>
-                <li>添加持久化标签页开关功能</li>
-                <li>菜单搜索支持文本高亮&数量提示</li>
-                <li>添加菜单路由地址和名称的校验规则</li>
-                <li>字典类型列表新增抽屉效果详细信息</li>
-                <li>升级axios到最新版本0.30.3</li>
-                <li>升级spring-cloud到最新版2025.1.0</li>
-                <li>升级spring-cloud-alibaba到最新版2025.1.0.0</li>
-                <li>升级spring-boot-admin到最新版4.0.2</li>
-                <li>升级dynamic-ds到最新版本4.5.0</li>
-                <li>升级springdoc到最新版本3.0.2</li>
-                <li>升级transmittable-thread-local到最新版本2.14.5</li>
-                <li>升级spring-boot到最新版本4.0.3</li>
-                <li>升级druid到最新版本1.2.28</li>
-                <li>升级pagehelper到最新版2.1.1</li>
-                <li>优化操作日志详细页面</li>
-                <li>部门管理支持批量保存排序</li>
-                <li>菜单管理支持批量保存排序</li>
-                <li>菜单管理列表新增类型显示</li>
-                <li>代码生成模板支持TypeScript版本</li>
-                <li>优化菜单主题风格显示</li>
-                <li>优化点击任务名称查看详细</li>
-                <li>优化字典类型属性提醒说明</li>
-                <li>优化防重提交间隔时间可自定义</li>
-                <li>优化页签功能&支持全屏按钮操作</li>
-                <li>优化RightToolbar搜索栏切换动画</li>
-                <li>修复Excel自定义格式样式污染问题</li>
-                <li>优化isAdmin方法统一到SecurityUtils</li>
-                <li>优化定时任务详情页展示&补充执行时间字段</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
             <el-collapse-item title="v3.6.7 - 2025-12-22">
               <ol>
                 <li>支持防盗链功能</li>
@@ -1022,7 +987,7 @@ export default {
   data() {
     return {
       // 版本号
-      version: "3.6.8"
+      version: "3.6.7"
     }
   },
   methods: {

ruoyi-ui/src/views/lock.vue

@@ -1,375 +0,0 @@
-<template>
-  <div class="lock-container">
-    <!-- 动态粒子背景 -->
-    <canvas ref="particleCanvas" class="particle-bg"></canvas>
-
-    <!-- 时钟 -->
-    <div class="lock-time">{{ currentTime }}</div>
-    <div class="lock-date">{{ currentDate }}</div>
-
-    <!-- 锁屏卡片 -->
-    <div class="lock-card">
-      <div class="avatar-wrap">
-        <img :src="avatar" class="lock-avatar" @error="onAvatarError" />
-        <div class="lock-icon">🔒</div>
-      </div>
-      <div class="lock-username">{{ nickName }}</div>
-      <div class="lock-hint">系统已锁定，请输入密码解锁</div>
-
-      <div class="input-wrap" :class="{ shake: isShaking }">
-        <input ref="passwordInput" v-model="password" type="password" placeholder="请输入登录密码" class="lock-input" @keydown.enter="handleUnlock" autocomplete="off" />
-        <button class="unlock-btn" @click="handleUnlock" :disabled="loading">
-          <span v-if="!loading">→</span>
-          <span v-else class="loading-dot">···</span>
-        </button>
-      </div>
-
-      <div v-if="errorMsg" class="error-msg">{{ errorMsg }}</div>
-
-      <div class="lock-footer">
-        <a href="/login" @click.prevent="goLogin">退出重新登录</a>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-import { unlockScreen } from '@/api/login'
-import defAva from '@/assets/images/profile.jpg'
-
-export default {
-  name: 'LockScreen',
-  data() {
-    return {
-      password: '',
-      loading: false,
-      errorMsg: '',
-      isShaking: false,
-      currentTime: '',
-      currentDate: '',
-      timer: null,
-      animationId: null,
-      particles: []
-    }
-  },
-  computed: {
-    ...mapGetters(['avatar', 'nickName'])
-  },
-  mounted() {
-    this.startClock()
-    this.initParticles()
-    this.$nextTick(() => {
-      this.$refs.passwordInput && this.$refs.passwordInput.focus()
-    })
-  },
-  beforeDestroy() {
-    clearInterval(this.timer)
-    cancelAnimationFrame(this.animationId)
-  },
-  methods: {
-    onAvatarError(e) {
-      e.target.src = defAva
-    },
-    startClock() {
-      const update = () => {
-        const now = new Date()
-        const h = String(now.getHours()).padStart(2, '0')
-        const m = String(now.getMinutes()).padStart(2, '0')
-        const s = String(now.getSeconds()).padStart(2, '0')
-        this.currentTime = `${h}:${m}:${s}`
-        const days = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六']
-        this.currentDate = `${now.getFullYear()}年${now.getMonth()+1}月${now.getDate()}日 ${days[now.getDay()]}`
-      }
-      update()
-      this.timer = setInterval(update, 1000)
-    },
-    async handleUnlock() {
-      if (!this.password) {
-        this.showError('请输入密码')
-        return
-      }
-      this.loading = true
-      this.errorMsg = ''
-      try {
-        await unlockScreen(this.password)
-        const lockPath = this.$store.getters.lockPath  // 取锁屏前的路径
-        await this.$store.dispatch('lock/unlockScreen')
-        this.$router.replace(lockPath)
-      } catch (err) {
-        const msg = err.message || err.toString()
-        this.showError(msg)
-        this.password = ''
-        this.$refs.passwordInput && this.$refs.passwordInput.focus()
-      } finally {
-        this.loading = false
-      }
-    },
-    showError(msg) {
-      this.errorMsg = msg
-      this.isShaking = true
-      setTimeout(() => { this.isShaking = false }, 600)
-    },
-    goLogin() {
-      this.$store.dispatch('lock/unlockScreen')
-      this.$store.dispatch('LogOut').then(() => {
-        this.$router.push('/login')
-      })
-    },
-    // 粒子背景
-    initParticles() {
-      const canvas = this.$refs.particleCanvas
-      if (!canvas) return
-      const ctx = canvas.getContext('2d')
-      const resize = () => {
-        canvas.width = window.innerWidth
-        canvas.height = window.innerHeight
-      }
-      resize()
-      window.addEventListener('resize', resize)
-      const count = 80
-      for (let i = 0; i < count; i++) {
-        this.particles.push({
-          x: Math.random() * canvas.width,
-          y: Math.random() * canvas.height,
-          r: Math.random() * 2 + 1,
-          dx: (Math.random() - 0.5) * 0.6,
-          dy: (Math.random() - 0.5) * 0.6,
-          alpha: Math.random() * 0.5 + 0.2
-        })
-      }
-      const draw = () => {
-        ctx.clearRect(0, 0, canvas.width, canvas.height)
-        this.particles.forEach(p => {
-          ctx.beginPath()
-          ctx.arc(p.x, p.y, p.r, 0, Math.PI * 2)
-          ctx.fillStyle = `rgba(255,255,255,${p.alpha})`
-          ctx.fill()
-          p.x += p.dx
-          p.y += p.dy
-          if (p.x < 0 || p.x > canvas.width) p.dx *= -1
-          if (p.y < 0 || p.y > canvas.height) p.dy *= -1
-        })
-        // 连线
-        for (let i = 0; i < this.particles.length; i++) {
-          for (let j = i + 1; j < this.particles.length; j++) {
-            const a = this.particles[i], b = this.particles[j]
-            const dist = Math.hypot(a.x - b.x, a.y - b.y)
-            if (dist < 120) {
-              ctx.beginPath()
-              ctx.moveTo(a.x, a.y)
-              ctx.lineTo(b.x, b.y)
-              ctx.strokeStyle = `rgba(255,255,255,${0.15 * (1 - dist / 120)})`
-              ctx.lineWidth = 0.5
-              ctx.stroke()
-            }
-          }
-        }
-        this.animationId = requestAnimationFrame(draw)
-      }
-      draw()
-    }
-  }
-}
-</script>
-
-<style scoped>
-.lock-container {
-  position: fixed;
-  inset: 0;
-  background: linear-gradient(135deg, #0f0c29, #302b63, #24243e);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  z-index: 9999;
-  font-family: 'PingFang SC', 'Microsoft YaHei', sans-serif;
-  overflow: hidden;
-}
-
-.particle-bg {
-  position: absolute;
-  inset: 0;
-  z-index: 0;
-}
-
-.lock-time {
-  position: relative;
-  z-index: 1;
-  font-size: 72px;
-  font-weight: 200;
-  color: #fff;
-  letter-spacing: 4px;
-  text-shadow: 0 0 40px rgba(255,255,255,0.3);
-  margin-bottom: 8px;
-  font-variant-numeric: tabular-nums;
-}
-
-.lock-date {
-  position: relative;
-  z-index: 1;
-  font-size: 15px;
-  color: rgba(255,255,255,0.6);
-  margin-bottom: 48px;
-  letter-spacing: 2px;
-}
-
-.lock-card {
-  position: relative;
-  z-index: 1;
-  background: rgba(255, 255, 255, 0.08);
-  backdrop-filter: blur(20px);
-  -webkit-backdrop-filter: blur(20px);
-  border: 1px solid rgba(255, 255, 255, 0.15);
-  border-radius: 24px;
-  padding: 40px 48px;
-  width: 360px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  box-shadow: 0 25px 60px rgba(0,0,0,0.4);
-}
-
-.avatar-wrap {
-  position: relative;
-  margin-bottom: 16px;
-}
-
-.lock-avatar {
-  width: 80px;
-  height: 80px;
-  border-radius: 50%;
-  border: 3px solid rgba(255,255,255,0.3);
-  object-fit: cover;
-  display: block;
-}
-
-.lock-icon {
-  position: absolute;
-  bottom: -4px;
-  right: -4px;
-  background: rgba(255,255,255,0.15);
-  border-radius: 50%;
-  width: 26px;
-  height: 26px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 13px;
-  backdrop-filter: blur(8px);
-}
-
-.lock-username {
-  color: #fff;
-  font-size: 18px;
-  font-weight: 600;
-  margin-bottom: 6px;
-  letter-spacing: 1px;
-}
-
-.lock-hint {
-  color: rgba(255,255,255,0.5);
-  font-size: 13px;
-  margin-bottom: 28px;
-}
-
-.input-wrap {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  background: rgba(255,255,255,0.1);
-  border: 1px solid rgba(255,255,255,0.2);
-  border-radius: 50px;
-  padding: 4px 4px 4px 20px;
-  transition: border-color 0.3s;
-}
-
-.input-wrap:focus-within {
-  border-color: rgba(255,255,255,0.6);
-  background: rgba(255,255,255,0.13);
-}
-
-.input-wrap.shake {
-  animation: shake 0.5s ease;
-}
-
-@keyframes shake {
-  0%, 100% { transform: translateX(0); }
-  20% { transform: translateX(-8px); }
-  40% { transform: translateX(8px); }
-  60% { transform: translateX(-6px); }
-  80% { transform: translateX(6px); }
-}
-
-.lock-input {
-  flex: 1;
-  background: transparent;
-  border: none;
-  outline: none;
-  color: #fff;
-  font-size: 15px;
-  padding: 10px 0;
-}
-
-.lock-input::placeholder {
-  color: rgba(255,255,255,0.35);
-}
-
-.unlock-btn {
-  width: 42px;
-  height: 42px;
-  border-radius: 50%;
-  background: linear-gradient(135deg, #667eea, #764ba2);
-  border: none;
-  color: #fff;
-  font-size: 18px;
-  cursor: pointer;
-  transition: transform 0.2s, opacity 0.2s;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-}
-
-.unlock-btn:hover:not(:disabled) {
-  transform: scale(1.08);
-}
-
-.unlock-btn:disabled {
-  opacity: 0.6;
-  cursor: not-allowed;
-}
-
-.loading-dot {
-  font-size: 13px;
-  letter-spacing: 1px;
-}
-
-.error-msg {
-  margin-top: 14px;
-  color: #ff7675;
-  font-size: 13px;
-  text-align: center;
-  animation: fadeIn 0.3s ease;
-}
-
-@keyframes fadeIn {
-  from { opacity: 0; transform: translateY(-4px); }
-  to   { opacity: 1; transform: translateY(0); }
-}
-
-.lock-footer {
-  margin-top: 24px;
-}
-
-.lock-footer a {
-  color: rgba(255,255,255,0.4);
-  font-size: 13px;
-  text-decoration: none;
-  transition: color 0.2s;
-}
-
-.lock-footer a:hover {
-  color: rgba(255,255,255,0.8);
-}
-</style>

ruoyi-ui/src/views/monitor/job/detail.vue

@@ -1,197 +0,0 @@
-<template>
-  <el-dialog :title="type === 'log' ? '调度日志详细' : '任务详细'" :visible.sync="visible" width="780px" append-to-body @close="$emit('update:visible', false)">
-    <div class="detail-wrap">
-
-      <template v-if="type === 'log'">
-        <!-- 基本信息 -->
-        <div class="detail-card">
-          <div class="detail-card-title"><i class="el-icon-info"></i> 基本信息</div>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">日志编号</span><span class="detail-value">{{ form.jobLogId }}</span></div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item">
-                <span class="detail-label">执行状态</span>
-                <el-tag v-if="form.status == 0" type="success" size="small">正常</el-tag>
-                <el-tag v-else type="danger" size="small">失败</el-tag>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">开始时间</span><span class="detail-value">{{ form.startTime }}</span></div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">结束时间</span><span class="detail-value">{{ form.endTime }}</span></div>
-            </el-col>
-          </el-row>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">记录时间</span><span class="detail-value">{{ form.createTime }}</span></div>
-            </el-col>
-            <el-col :span="12" v-if="form.status == 0 && form.startTime && form.endTime">
-              <div class="detail-item"><span class="detail-label">执行耗时</span><span class="detail-value">{{ costTime }} 毫秒</span></div>
-            </el-col>
-          </el-row>
-        </div>
-
-        <!-- 任务信息 -->
-        <div class="detail-card">
-          <div class="detail-card-title"><i class="el-icon-time"></i> 任务信息</div>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">任务名称</span><span class="detail-value">{{ form.jobName }}</span></div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item">
-                <span class="detail-label">任务分组</span>
-                <dict-tag :options="dict.type.sys_job_group" :value="form.jobGroup" />
-              </div>
-            </el-col>
-          </el-row>
-          <el-row class="detail-row">
-            <el-col :span="24">
-              <div class="detail-item"><span class="detail-label">日志信息</span><span class="detail-value">{{ form.jobMessage }}</span></div>
-            </el-col>
-          </el-row>
-        </div>
-
-        <!-- 调用目标 -->
-        <div class="detail-card">
-          <div class="detail-card-title"><i class="el-icon-s-operation"></i> 调用目标</div>
-          <div class="code-body">
-            <div class="code-wrap"><pre class="code-pre">{{ form.invokeTarget || '（无）' }}</pre></div>
-          </div>
-        </div>
-
-        <!-- 异常信息 -->
-        <div class="detail-card" v-if="form.status == 1">
-          <div class="detail-card-title error-title"><i class="el-icon-warning"></i> 异常信息</div>
-          <div class="error-body"><div class="error-msg">{{ form.exceptionInfo }}</div></div>
-        </div>
-
-      </template>
-
-      <template v-else>
-        <!-- 任务配置 -->
-        <div class="detail-card">
-          <div class="detail-card-title"><i class="el-icon-setting"></i> 任务配置</div>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">任务编号</span><span class="detail-value">{{ form.jobId }}</span></div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">任务名称</span><span class="detail-value">{{ form.jobName }}</span></div>
-            </el-col>
-          </el-row>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item">
-                <span class="detail-label">任务分组</span>
-                <dict-tag :options="dict.type.sys_job_group" :value="form.jobGroup" />
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item">
-                <span class="detail-label">执行状态</span>
-                <el-tag v-if="form.status == 0" type="success" size="small">正常</el-tag>
-                <el-tag v-else type="info" size="small">暂停</el-tag>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-
-        <!-- 调度信息 -->
-        <div class="detail-card">
-          <div class="detail-card-title"><i class="el-icon-date"></i> 调度信息</div>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">cron 表达式</span><span class="detail-value mono">{{ form.cronExpression }}</span></div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">下次执行时间</span><span class="detail-value">{{ parseTime(form.nextValidTime) }}</span></div>
-            </el-col>
-          </el-row>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item">
-                <span class="detail-label">执行策略</span>
-                <el-tag v-if="form.misfirePolicy == 0" type="info" size="small">默认策略</el-tag>
-                <el-tag v-else-if="form.misfirePolicy == 1" type="warning" size="small">立即执行</el-tag>
-                <el-tag v-else-if="form.misfirePolicy == 2" type="primary" size="small">执行一次</el-tag>
-                <el-tag v-else-if="form.misfirePolicy == 3" type="danger" size="small">放弃执行</el-tag>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item">
-                <span class="detail-label">并发执行</span>
-                <el-tag v-if="form.concurrent == 0" type="success" size="small">允许</el-tag>
-                <el-tag v-else type="danger" size="small">禁止</el-tag>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-
-        <!-- 执行方法 -->
-        <div class="detail-card">
-          <div class="detail-card-title"><i class="el-icon-s-operation"></i> 执行方法</div>
-          <div class="code-body">
-            <div class="code-wrap"><pre class="code-pre">{{ form.invokeTarget || '（无）' }}</pre></div>
-          </div>
-        </div>
-
-        <!-- 元信息 -->
-        <div class="detail-card">
-          <div class="detail-card-title"><i class="el-icon-document"></i> 元信息</div>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">创建人</span><span class="detail-value">{{ form.createBy || '-' }}</span></div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">创建时间</span><span class="detail-value">{{ form.createTime }}</span></div>
-            </el-col>
-          </el-row>
-          <el-row class="detail-row">
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">更新人</span><span class="detail-value">{{ form.updateBy || '-' }}</span></div>
-            </el-col>
-            <el-col :span="12">
-              <div class="detail-item"><span class="detail-label">更新时间</span><span class="detail-value">{{ form.updateTime || '-' }}</span></div>
-            </el-col>
-          </el-row>
-          <el-row class="detail-row" v-if="form.remark">
-            <el-col :span="24">
-              <div class="detail-item"><span class="detail-label">备注</span><span class="detail-value">{{ form.remark }}</span></div>
-            </el-col>
-          </el-row>
-        </div>
-      </template>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-  dicts: ['sys_job_group'],
-  props: {
-    visible: { type: Boolean, default: false },
-    row: { type: Object, default: () => ({}) },
-    // 'job' 任务详细 | 'log' 调度日志详细
-    type: { type: String, default: 'job' }
-  },
-  computed: {
-    form() { return this.row || {} },
-    costTime() {
-      if (!this.form.startTime || !this.form.endTime) return 0
-      return new Date(this.form.endTime).getTime() - new Date(this.form.startTime).getTime()
-    }
-  }
-}
-</script>
-
-<style scoped>
-.detail-label {
-  width: 80px;
-}
-</style>

ruoyi-ui/src/views/monitor/job/index.vue

@@ -94,11 +94,7 @@
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
-      <el-table-column label="任务名称" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <a class="link-type" style="cursor:pointer" @click="handleView(scope.row)">{{ scope.row.jobName }}</a>
-        </template>
-      </el-table-column>
+      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
       <el-table-column label="任务组名" align="center" prop="jobGroup">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
@@ -137,6 +133,8 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
                 v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
+              <el-dropdown-item command="handleView" icon="el-icon-view"
+                v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item>
               <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
                 v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item>
             </el-dropdown-menu>
@@ -243,17 +241,61 @@
     </el-dialog>
 
     <!-- 任务日志详细 -->
-    <job-detail :visible.sync="openView" :row="form" type="job" />
+    <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="120px" size="mini">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
+            <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item>
+            <el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="下次执行时间：">{{ parseTime(form.nextValidTime) }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务状态：">
+              <div v-if="form.status == 0">正常</div>
+              <div v-else-if="form.status == 1">暂停</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否并发：">
+              <div v-if="form.concurrent == 0">允许</div>
+              <div v-else-if="form.concurrent == 1">禁止</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执行策略：">
+              <div v-if="form.misfirePolicy == 0">默认策略</div>
+              <div v-else-if="form.misfirePolicy == 1">立即执行</div>
+              <div v-else-if="form.misfirePolicy == 2">执行一次</div>
+              <div v-else-if="form.misfirePolicy == 3">放弃执行</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="openView = false">关 闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/job"
-import JobDetail from './detail'
+import { listJob, getJob, delJob, addJob, updateJob, runJob, changeJobStatus } from "@/api/monitor/job";
 import Crontab from '@/components/Crontab'
 
 export default {
-  components: { Crontab, JobDetail },
+  components: { Crontab },
   name: "Job",
   dicts: ['sys_job_group', 'sys_job_status'],
   data() {
@@ -304,29 +346,29 @@ export default {
           { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
         ]
       }
-    }
+    };
   },
   created() {
-    this.getList()
+    this.getList();
   },
   methods: {
     /** 查询定时任务列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       listJob(this.queryParams).then(response => {
-        this.jobList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+        this.jobList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     // 任务组名字典翻译
     jobGroupFormat(row, column) {
-      return this.selectDictLabel(this.dict.type.sys_job_group, row.jobGroup)
+      return this.selectDictLabel(this.dict.type.sys_job_group, row.jobGroup);
     },
     // 取消按钮
     cancel() {
-      this.open = false
-      this.reset()
+      this.open = false;
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -339,96 +381,96 @@ export default {
         misfirePolicy: 1,
         concurrent: 1,
         status: "0"
-      }
-      this.resetForm("form")
+      };
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.jobId)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.jobId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
     },
     // 更多操作触发
     handleCommand(command, row) {
       switch (command) {
         case "handleRun":
-          this.handleRun(row)
-          break
+          this.handleRun(row);
+          break;
         case "handleView":
-          this.handleView(row)
-          break
+          this.handleView(row);
+          break;
         case "handleJobLog":
-          this.handleJobLog(row)
-          break
+          this.handleJobLog(row);
+          break;
         default:
-          break
+          break;
       }
     },
     // 任务状态修改
     handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用"
+      let text = row.status === "0" ? "启用" : "停用";
       this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function() {
-        return changeJobStatus(row.jobId, row.status)
+        return changeJobStatus(row.jobId, row.status);
       }).then(() => {
-        this.$modal.msgSuccess(text + "成功")
+        this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0"
-      })
+        row.status = row.status === "0" ? "1" : "0";
+      });
     },
     /* 立即执行一次 */
     handleRun(row) {
       this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function() {
-        return runJob(row.jobId, row.jobGroup)
+        return runJob(row.jobId, row.jobGroup);
       }).then(() => {
-        this.$modal.msgSuccess("执行成功")
-      }).catch(() => {})
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {});
     },
     /** 任务详细信息 */
     handleView(row) {
       getJob(row.jobId).then(response => {
-        this.form = response.data
-        this.openView = true
-      })
+        this.form = response.data;
+        this.openView = true;
+      });
     },
     /** cron表达式按钮操作 */
     handleShowCron() {
-      this.expression = this.form.cronExpression
-      this.openCron = true
+      this.expression = this.form.cronExpression;
+      this.openCron = true;
     },
     /** 确定后回传值 */
     crontabFill(value) {
-      this.form.cronExpression = value
+      this.form.cronExpression = value;
     },
     /** 任务日志列表查询 */
     handleJobLog(row) {
-      const jobId = row.jobId || 0
+      const jobId = row.jobId || 0;
       this.$router.push('/monitor/job-log/index/' + jobId)
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = "添加任务"
+      this.reset();
+      this.open = true;
+      this.title = "添加任务";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      const jobId = row.jobId || this.ids
+      this.reset();
+      const jobId = row.jobId || this.ids;
       getJob(jobId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = "修改任务"
-      })
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改任务";
+      });
     },
     /** 提交按钮 */
     submitForm: function() {
@@ -436,29 +478,29 @@ export default {
         if (valid) {
           if (this.form.jobId != undefined) {
             updateJob(this.form).then(() => {
-              this.$modal.msgSuccess("修改成功")
-              this.open = false
-              this.getList()
-            })
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
           } else {
             addJob(this.form).then(() => {
-              this.$modal.msgSuccess("新增成功")
-              this.open = false
-              this.getList()
-            })
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const jobIds = row.jobId || this.ids
+      const jobIds = row.jobId || this.ids;
       this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function() {
-        return delJob(jobIds)
+        return delJob(jobIds);
       }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -467,5 +509,5 @@ export default {
       }, `job_${new Date().getTime()}.xlsx`)
     }
   }
-}
+};
 </script>

ruoyi-ui/src/views/monitor/job/log.vue

@@ -143,18 +143,48 @@
       @pagination="getList"
     />
 
-    <job-log-detail :visible.sync="open" :row="form" type="log" />
+    <!-- 调度日志详细 -->
+    <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
+            <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
+            <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="执行状态：">
+              <div v-if="form.status == 0">正常</div>
+              <div v-else-if="form.status == 1">失败</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">关 闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getJob} from "@/api/monitor/job"
-import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog"
-import JobLogDetail from './detail'
+import { getJob} from "@/api/monitor/job";
+import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
 
 export default {
   name: "JobLog",
-  components: { JobLogDetail },
   dicts: ['sys_common_status', 'sys_job_group'],
   data() {
     return {
@@ -184,75 +214,75 @@ export default {
         jobGroup: undefined,
         status: undefined
       }
-    }
+    };
   },
   created() {
-    const jobId = this.$route.params && this.$route.params.jobId
+    const jobId = this.$route.params && this.$route.params.jobId;
     if (jobId !== undefined && jobId != 0) {
       getJob(jobId).then(response => {
-        this.queryParams.jobName = response.data.jobName
-        this.queryParams.jobGroup = response.data.jobGroup
-        this.getList()
-      })
+        this.queryParams.jobName = response.data.jobName;
+        this.queryParams.jobGroup = response.data.jobGroup;
+        this.getList();
+      });
     } else {
-      this.getList()
+      this.getList();
     }
   },
   methods: {
     /** 查询调度日志列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.jobLogList = response.rows
-          this.total = response.total
-          this.loading = false
+          this.jobLogList = response.rows;
+          this.total = response.total;
+          this.loading = false;
         }
-      )
+      );
     },
     // 返回按钮
     handleClose() {
-      const obj = { path: "/monitor/job" }
-      this.$tab.closeOpenPage(obj)
+      const obj = { path: "/monitor/job" };
+      this.$tab.closeOpenPage(obj);
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = []
-      this.resetForm("queryForm")
-      this.handleQuery()
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.jobLogId)
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.jobLogId);
+      this.multiple = !selection.length;
     },
     /** 详细按钮操作 */
     handleView(row) {
-      this.open = true
-      this.form = row
+      this.open = true;
+      this.form = row;
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const jobLogIds = this.ids
+      const jobLogIds = this.ids;
       this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() {
-        return delJobLog(jobLogIds)
+        return delJobLog(jobLogIds);
       }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     /** 清空按钮操作 */
     handleClean() {
       this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() {
-        return cleanJobLog()
+        return cleanJobLog();
       }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess("清空成功")
-      }).catch(() => {})
+        this.getList();
+        this.$modal.msgSuccess("清空成功");
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -261,5 +291,5 @@ export default {
       }, `log_${new Date().getTime()}.xlsx`)
     }
   }
-}
-</script>
+};
+</script>

ruoyi-ui/src/views/system/dept/index.vue

@@ -36,16 +36,6 @@
           v-hasPermi="['system:dept:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-check"
-          size="mini"
-          @click="handleSaveSort"
-          v-hasPermi="['system:dept:edit']"
-        >保存排序</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -67,11 +57,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200">
-        <template slot-scope="scope">
-          <el-input-number v-model="scope.row.orderNum" controls-position="right" :min="0" size="mini" style="width: 88px" />
-        </template>
-      </el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -172,7 +158,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, updateDeptSort, listDeptExcludeChild } from "@/api/system/dept"
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 
@@ -198,8 +184,6 @@ export default {
       isExpandAll: true,
       // 重新渲染表格状态
       refreshTable: true,
-      // 记录原始排序，用于对比变更
-      originalOrders: {},
       // 查询参数
       queryParams: {
         deptName: undefined,
@@ -244,8 +228,6 @@ export default {
       this.loading = true
       listDept(this.queryParams).then(response => {
         this.deptList = this.handleTree(response.data, "deptId")
-        // 记录原始排序值
-        this.recordOriginalOrders(this.deptList)
         this.loading = false
       })
     },
@@ -344,40 +326,6 @@ export default {
         }
       })
     },
-    /** 递归记录原始排序 */
-    recordOriginalOrders(list) {
-      list.forEach(item => {
-        this.originalOrders[item.deptId] = item.orderNum
-        if (item.children && item.children.length) {
-          this.recordOriginalOrders(item.children)
-        }
-      })
-    },
-    /** 保存排序 */
-    handleSaveSort() {
-      const changedDeptIds = []
-      const changedOrderNums = []
-      const collectChanged = (list) => {
-        list.forEach(item => {
-          if (String(this.originalOrders[item.deptId]) !== String(item.orderNum)) {
-            changedDeptIds.push(item.deptId)
-            changedOrderNums.push(item.orderNum)
-          }
-          if (item.children && item.children.length) {
-            collectChanged(item.children)
-          }
-        })
-      }
-      collectChanged(this.deptList)
-      if (changedDeptIds.length === 0) {
-        this.$modal.msgWarning("未检测到排序修改")
-        return
-      }
-      updateDeptSort({ deptIds: changedDeptIds.join(","), orderNums: changedOrderNums.join(",") }).then(() => {
-        this.$modal.msgSuccess("排序保存成功")
-        this.recordOriginalOrders(this.deptList)
-      })
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {

ruoyi-ui/src/views/system/dict/detail.vue

@@ -1,203 +0,0 @@
-<template>
-  <el-drawer :title="drawerTitle" :visible.sync="localVisible" direction="rtl" size="700px" append-to-body>
-    <div class="drawer-wrap">
-      <div v-if="loading" class="drawer-loading">
-        <i class="el-icon-loading"></i>
-        <span>加载中...</span>
-      </div>
-      <div v-else-if="!dataList.length" class="drawer-empty">
-        <i class="el-icon-document"></i>
-        <div>暂无字典数据</div>
-      </div>
-      <template v-else>
-        <el-row :gutter="12" class="stat-row">
-          <el-col :span="disabledCount > 0 ? 8 : 12">
-            <div class="stat-card">
-              <div class="stat-num">{{ dataList.length }}</div>
-              <div class="stat-label">共计条目</div>
-            </div>
-          </el-col>
-          <el-col :span="disabledCount > 0 ? 8 : 12">
-            <div class="stat-card">
-              <div class="stat-num success">{{ normalCount }}</div>
-              <div class="stat-label">正常</div>
-            </div>
-          </el-col>
-          <el-col :span="8" v-if="disabledCount > 0">
-            <div class="stat-card">
-              <div class="stat-num danger">{{ disabledCount }}</div>
-              <div class="stat-label">停用</div>
-            </div>
-          </el-col>
-        </el-row>
-        <div v-for="item in dataList" :key="item.dictCode" class="dict-item">
-          <div class="dict-cell">
-            <div class="dict-cell-key">标签</div>
-            <div class="dict-cell-val">
-              <el-tag v-if="item.listClass && item.listClass !== 'default'" :type="item.listClass === 'primary' ? '' : item.listClass" size="small">{{ item.dictLabel }}</el-tag>
-              <span v-else>{{ item.dictLabel }}</span>
-            </div>
-          </div>
-          <div class="dict-cell">
-            <div class="dict-cell-key">键值</div>
-            <div class="dict-cell-val">{{ item.dictValue }}</div>
-          </div>
-          <div class="dict-cell">
-            <div class="dict-cell-key">状态</div>
-            <div class="dict-cell-val">
-              <el-tag :type="item.status === '0' ? 'success' : 'danger'" size="small">
-                {{ item.status === '0' ? '正常' : '停用' }}
-              </el-tag>
-            </div>
-          </div>
-        </div>
-      </template>
-    </div>
-  </el-drawer>
-</template>
-
-<script>
-import { listData } from '@/api/system/dict/data'
-
-export default {
-  props: {
-    visible: { type: Boolean, default: false },
-    row: { type: Object, default: () => ({}) }
-  },
-  data() {
-    return {
-      localVisible: false,
-      loading: false,
-      dataList: []
-    }
-  },
-  computed: {
-    drawerTitle() {
-      return this.row.dictName + '　' + (this.row.dictType || '')
-    },
-    normalCount() {
-      return this.dataList.filter(r => r.status === '0').length
-    },
-    disabledCount() {
-      return this.dataList.filter(r => r.status !== '0').length
-    }
-  },
-  watch: {
-    visible(val) {
-      this.localVisible = val
-    },
-    localVisible(val) {
-      this.$emit('update:visible', val)
-      if (val) {
-        this.loadData()
-      } else {
-        this.dataList = []
-      }
-    }
-  },
-  methods: {
-    loadData() {
-      if (!this.row || !this.row.dictType) return
-      this.loading = true
-      this.dataList = []
-      listData({ dictType: this.row.dictType, pageSize: 100, pageNum: 1 }).then(response => {
-        this.dataList = response.rows || []
-      }).catch(() => {}).finally(() => {
-        this.loading = false
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.drawer-wrap {
-  padding: 0 20px 20px;
-}
-
-.drawer-loading {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 120px;
-  color: #aaa;
-  font-size: 13px;
-  gap: 8px;
-}
-
-.drawer-empty {
-  text-align: center;
-  color: #bbb;
-  padding: 60px 0;
-  font-size: 13px;
-}
-
-.drawer-empty i {
-  font-size: 36px;
-  display: block;
-  margin-bottom: 8px;
-}
-
-.stat-row {
-  margin-bottom: 16px;
-}
-
-.stat-card {
-  background: #f7f9fb;
-  border: 1px solid #e8ecf0;
-  border-radius: 6px;
-  padding: 10px 14px;
-  text-align: center;
-}
-
-.stat-num {
-  font-size: 22px;
-  font-weight: 700;
-  color: #2c3e50;
-}
-
-.stat-num.success { color: #27ae60; }
-.stat-num.danger  { color: #e74c3c; }
-
-.stat-label {
-  font-size: 11px;
-  color: #95a5a6;
-  margin-top: 4px;
-}
-
-.dict-item {
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
-  border: 1px solid #e8ecf0;
-  border-radius: 6px;
-  overflow: hidden;
-  margin-bottom: 8px;
-}
-
-.dict-cell {
-  display: grid;
-  grid-template-columns: 70px 1fr;
-  border-right: 1px solid #f0f4f8;
-}
-
-.dict-cell:last-child {
-  border-right: 0;
-}
-
-.dict-cell-key {
-  padding: 9px 14px;
-  font-size: 12px;
-  color: #888;
-  background: #f7f9fb;
-  border-right: 1px solid #f0f4f8;
-}
-
-.dict-cell-val {
-  padding: 9px 14px;
-  font-size: 13px;
-  color: #2c3e50;
-  word-break: break-all;
-  display: flex;
-  align-items: center;
-}
-</style>

ruoyi-ui/src/views/system/dict/index.vue

@@ -113,7 +113,9 @@
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <a class="link-type" style="cursor:pointer" @click="handleViewData(scope.row)">{{ scope.row.dictType }}</a>
+          <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+            <span>{{ scope.row.dictType }}</span>
+          </router-link>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
@@ -136,13 +138,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-s-operation"
-            @click="handleDataList(scope.row)"
-            v-hasPermi="['system:dict:edit']"
-          >列表</el-button>
           <el-button
             size="mini"
             type="text"
@@ -195,18 +190,14 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <dict-data-drawer :visible.sync="drawerVisible" :row="drawerRow" />
   </div>
 </template>
 
 <script>
-import DictDataDrawer from './detail'
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"
 
 export default {
   name: "Dict",
-  components: { DictDataDrawer },
   dicts: ['sys_normal_disable'],
   data() {
     return {
@@ -228,10 +219,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 字典数据抽屉状态
-      drawerVisible: false,
-      // 字典数据信息
-      drawerRow: {},
       // 日期范围
       dateRange: [],
       // 查询参数
@@ -308,15 +295,6 @@ export default {
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
-    /** 字典数据抽屉显示信息 */
-    handleViewData(row) {
-      this.drawerRow = row
-      this.drawerVisible = true
-    },
-    /** 字典数据列表页面 */
-    handleDataList(row) {
-      this.$tab.openPage("字典数据", '/system/dict-data/index/' + row.dictId)
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()

ruoyi-ui/src/views/system/menu/index.vue

@@ -36,16 +36,6 @@
           v-hasPermi="['system:menu:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-check"
-          size="mini"
-          @click="handleSaveSort"
-          v-hasPermi="['system:menu:edit']"
-        >保存排序</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -66,31 +56,23 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="220">
+      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+      <el-table-column prop="icon" label="图标" align="center" width="100">
         <template slot-scope="scope">
-            <svg-icon :icon-class="scope.row.icon" />
-            <span class="ml5">{{ scope.row.menuName }}</span>
+          <svg-icon :icon-class="scope.row.icon" />
         </template>
       </el-table-column>
-      <el-table-column prop="menuName" label="类型" :show-overflow-tooltip="true" width="100">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.menuType === 'M' && scope.row.isFrame === '0'" type="danger" size="small">外链</el-tag>
-          <el-tag v-else-if="scope.row.menuType === 'M'" type="primary" size="small">目录</el-tag>
-          <el-tag v-else-if="scope.row.menuType === 'C' && scope.row.isFrame === '0'" type="danger" size="small">外链</el-tag>
-          <el-tag v-else-if="scope.row.menuType === 'C'" type="success" size="small">菜单</el-tag>
-          <el-tag v-else-if="scope.row.menuType === 'F'" type="warning" size="small">按钮</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200">
-        <template slot-scope="scope">
-          <el-input-number v-model="scope.row.orderNum" controls-position="right" :min="0" size="mini" style="width: 88px" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true" />
-      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
+      <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
+      <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="status" label="状态" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -317,7 +299,7 @@
 </template>
 
 <script>
-import { listMenu, getMenu, delMenu, addMenu, updateMenu, updateMenuSort } from "@/api/system/menu"
+import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/menu"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 import IconSelect from "@/components/IconSelect"
@@ -344,8 +326,6 @@ export default {
       isExpandAll: false,
       // 重新渲染表格状态
       refreshTable: true,
-      // 记录原始排序，用于对比变更
-      originalOrders: {},
       // 查询参数
       queryParams: {
         menuName: undefined,
@@ -380,8 +360,6 @@ export default {
       this.loading = true
       listMenu(this.queryParams).then(response => {
         this.menuList = this.handleTree(response.data, "menuId")
-        // 记录原始排序值
-        this.recordOriginalOrders(this.menuList)
         this.loading = false
       })
     },
@@ -485,40 +463,6 @@ export default {
         }
       })
     },
-    /** 递归记录原始排序 */
-    recordOriginalOrders(list) {
-      list.forEach(item => {
-        this.originalOrders[item.menuId] = item.orderNum
-        if (item.children && item.children.length) {
-          this.recordOriginalOrders(item.children)
-        }
-      })
-    },
-    /** 保存排序 */
-    handleSaveSort() {
-      const changedMenuIds = []
-      const changedOrderNums = []
-      const collectChanged = (list) => {
-        list.forEach(item => {
-          if (String(this.originalOrders[item.menuId]) !== String(item.orderNum)) {
-            changedMenuIds.push(item.menuId)
-            changedOrderNums.push(item.orderNum)
-          }
-          if (item.children && item.children.length) {
-            collectChanged(item.children)
-          }
-        })
-      }
-      collectChanged(this.menuList)
-      if (changedMenuIds.length === 0) {
-        this.$modal.msgWarning("未检测到排序修改")
-        return
-      }
-      updateMenuSort({ menuIds: changedMenuIds.join(","), orderNums: changedOrderNums.join(",") }).then(() => {
-        this.$modal.msgSuccess("排序保存成功")
-        this.recordOriginalOrders(this.menuList)
-      })
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function() {