若依 3.8.5

v3最新版本不需要render-after-expand
升级pagehelper到最新版1.4.6
2026-04-30 00:00:08 +08:00 · 2023-01-01 09:09:25 +08:00 · 2022-12-23 16:08:23 +08:00 · 2022-12-13 19:42:39 +08:00 · 2022-12-13 19:40:48 +08:00 · 2022-12-13 19:39:36 +08:00
86 changed files with 990 additions and 816 deletions
@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.4</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.5</h1>
 <h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.4-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.5-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
@@ -94,4 +94,4 @@
 ## 若依前后端分离交流群
-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) 点击按钮入群。
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) 点击按钮入群。
@@ -6,26 +6,25 @@
    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi</artifactId>
-    <version>3.8.4</version>
+    <version>3.8.5</version>
    <name>ruoyi</name>
    <url>http://www.ruoyi.vip</url>
    <description>若依管理系统</description>
    <properties>
-        <ruoyi.version>3.8.4</ruoyi.version>
+        <ruoyi.version>3.8.5</ruoyi.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <druid.version>1.2.11</druid.version>
+        <druid.version>1.2.15</druid.version>
        <bitwalker.version>1.21</bitwalker.version>
        <swagger.version>3.0.0</swagger.version>
-        <kaptcha.version>2.3.2</kaptcha.version>
+        <kaptcha.version>2.3.3</kaptcha.version>
-        <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
+        <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
-        <pagehelper.boot.version>1.4.3</pagehelper.boot.version>
+        <fastjson.version>2.0.20</fastjson.version>
-        <fastjson.version>2.0.14</fastjson.version>
+        <oshi.version>6.4.0</oshi.version>
        <oshi.version>6.2.2</oshi.version>
        <commons.io.version>2.11.0</commons.io.version>
        <commons.fileupload.version>1.4</commons.fileupload.version>
        <commons.collections.version>3.2.2</commons.collections.version>
@@ -61,13 +60,6 @@
                <version>${bitwalker.version}</version>
            </dependency>
            <!-- SpringBoot集成mybatis框架 -->
            <dependency>
                <groupId>org.mybatis.spring.boot</groupId>
                <artifactId>mybatis-spring-boot-starter</artifactId>
                <version>${mybatis-spring-boot.version}</version>
            </dependency>
            <!-- pagehelper 分页插件 -->
            <dependency>
                <groupId>com.github.pagehelper</groupId>
@@ -146,7 +138,7 @@
            <!-- 验证码 -->
            <dependency>
-                <groupId>com.github.penggle</groupId>
+                <groupId>pro.fessional</groupId>
                <artifactId>kaptcha</artifactId>
                <version>${kaptcha.version}</version>
            </dependency>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.8.4</version>
+        <version>3.8.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>
@@ -64,6 +64,6 @@ public class SysOperlogController extends BaseController
    public AjaxResult clean()
    {
        operLogService.cleanOperLog();
-        return AjaxResult.success();
+        return success();
    }
 }
@@ -87,6 +87,6 @@ public class SysUserOnlineController extends BaseController
    public AjaxResult forceLogout(@PathVariable String tokenId)
    {
        redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
-        return AjaxResult.success();
+        return success();
    }
 }
@@ -64,7 +64,7 @@ public class SysConfigController extends BaseController
    @GetMapping(value = "/{configId}")
    public AjaxResult getInfo(@PathVariable Long configId)
    {
-        return AjaxResult.success(configService.selectConfigById(configId));
+        return success(configService.selectConfigById(configId));
    }
    /**
@@ -73,7 +73,7 @@ public class SysConfigController extends BaseController
    @GetMapping(value = "/configKey/{configKey}")
    public AjaxResult getConfigKey(@PathVariable String configKey)
    {
-        return AjaxResult.success(configService.selectConfigByKey(configKey));
+        return success(configService.selectConfigByKey(configKey));
    }
    /**
@@ -86,7 +86,7 @@ public class SysConfigController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
        {
-            return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
        config.setCreateBy(getUsername());
        return toAjax(configService.insertConfig(config));
@@ -102,7 +102,7 @@ public class SysConfigController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
        {
-            return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
        }
        config.setUpdateBy(getUsername());
        return toAjax(configService.updateConfig(config));
@@ -129,6 +129,6 @@ public class SysConfigController extends BaseController
    public AjaxResult refreshCache()
    {
        configService.resetConfigCache();
-        return AjaxResult.success();
+        return success();
    }
 }
@@ -42,7 +42,7 @@ public class SysDeptController extends BaseController
    public AjaxResult list(SysDept dept)
    {
        List<SysDept> depts = deptService.selectDeptList(dept);
-        return AjaxResult.success(depts);
+        return success(depts);
    }
    /**
@@ -54,7 +54,7 @@ public class SysDeptController extends BaseController
    {
        List<SysDept> depts = deptService.selectDeptList(new SysDept());
        depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
-        return AjaxResult.success(depts);
+        return success(depts);
    }
    /**
@@ -65,7 +65,7 @@ public class SysDeptController extends BaseController
    public AjaxResult getInfo(@PathVariable Long deptId)
    {
        deptService.checkDeptDataScope(deptId);
-        return AjaxResult.success(deptService.selectDeptById(deptId));
+        return success(deptService.selectDeptById(deptId));
    }
    /**
@@ -78,7 +78,7 @@ public class SysDeptController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
        {
-            return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
        }
        dept.setCreateBy(getUsername());
        return toAjax(deptService.insertDept(dept));
@@ -96,15 +96,15 @@ public class SysDeptController extends BaseController
        deptService.checkDeptDataScope(deptId);
        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
        {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+            return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
        }
        else if (dept.getParentId().equals(deptId))
        {
-            return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+            return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
        }
        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
        {
-            return AjaxResult.error("该部门包含未停用的子部门！");
+            return error("该部门包含未停用的子部门！");
        }
        dept.setUpdateBy(getUsername());
        return toAjax(deptService.updateDept(dept));
@@ -120,11 +120,11 @@ public class SysDeptController extends BaseController
    {
        if (deptService.hasChildByDeptId(deptId))
        {
-            return AjaxResult.error("存在下级部门,不允许删除");
+            return warn("存在下级部门,不允许删除");
        }
        if (deptService.checkDeptExistUser(deptId))
        {
-            return AjaxResult.error("部门存在用户,不允许删除");
+            return warn("部门存在用户,不允许删除");
        }
        deptService.checkDeptDataScope(deptId);
        return toAjax(deptService.deleteDeptById(deptId));
@@ -66,7 +66,7 @@ public class SysDictDataController extends BaseController
    @GetMapping(value = "/{dictCode}")
    public AjaxResult getInfo(@PathVariable Long dictCode)
    {
-        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+        return success(dictDataService.selectDictDataById(dictCode));
    }
    /**
@@ -80,7 +80,7 @@ public class SysDictDataController extends BaseController
        {
            data = new ArrayList<SysDictData>();
        }
-        return AjaxResult.success(data);
+        return success(data);
    }
    /**
@@ -61,7 +61,7 @@ public class SysDictTypeController extends BaseController
    @GetMapping(value = "/{dictId}")
    public AjaxResult getInfo(@PathVariable Long dictId)
    {
-        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+        return success(dictTypeService.selectDictTypeById(dictId));
    }
    /**
@@ -74,7 +74,7 @@ public class SysDictTypeController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
        {
-            return AjaxResult.error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
        }
        dict.setCreateBy(getUsername());
        return toAjax(dictTypeService.insertDictType(dict));
@@ -90,7 +90,7 @@ public class SysDictTypeController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
        {
-            return AjaxResult.error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+            return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
        }
        dict.setUpdateBy(getUsername());
        return toAjax(dictTypeService.updateDictType(dict));
@@ -117,7 +117,7 @@ public class SysDictTypeController extends BaseController
    public AjaxResult refreshCache()
    {
        dictTypeService.resetDictCache();
-        return AjaxResult.success();
+        return success();
    }
    /**
@@ -127,6 +127,6 @@ public class SysDictTypeController extends BaseController
    public AjaxResult optionselect()
    {
        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
-        return AjaxResult.success(dictTypes);
+        return success(dictTypes);
    }
 }
@@ -41,7 +41,7 @@ public class SysMenuController extends BaseController
    public AjaxResult list(SysMenu menu)
    {
        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return AjaxResult.success(menus);
+        return success(menus);
    }
    /**
@@ -51,7 +51,7 @@ public class SysMenuController extends BaseController
    @GetMapping(value = "/{menuId}")
    public AjaxResult getInfo(@PathVariable Long menuId)
    {
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+        return success(menuService.selectMenuById(menuId));
    }
    /**
@@ -61,7 +61,7 @@ public class SysMenuController extends BaseController
    public AjaxResult treeselect(SysMenu menu)
    {
        List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
-        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+        return success(menuService.buildMenuTreeSelect(menus));
    }
    /**
@@ -87,11 +87,11 @@ public class SysMenuController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
        {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
        }
        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
        {
-            return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
        }
        menu.setCreateBy(getUsername());
        return toAjax(menuService.insertMenu(menu));
@@ -107,15 +107,15 @@ public class SysMenuController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
        {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+            return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
        }
        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
        {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+            return error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
        }
        else if (menu.getMenuId().equals(menu.getParentId()))
        {
-            return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+            return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
        }
        menu.setUpdateBy(getUsername());
        return toAjax(menuService.updateMenu(menu));
@@ -131,11 +131,11 @@ public class SysMenuController extends BaseController
    {
        if (menuService.hasChildByMenuId(menuId))
        {
-            return AjaxResult.error("存在子菜单,不允许删除");
+            return warn("存在子菜单,不允许删除");
        }
        if (menuService.checkMenuExistRole(menuId))
        {
-            return AjaxResult.error("菜单已分配,不允许删除");
+            return warn("菜单已分配,不允许删除");
        }
        return toAjax(menuService.deleteMenuById(menuId));
    }
@@ -51,7 +51,7 @@ public class SysNoticeController extends BaseController
    @GetMapping(value = "/{noticeId}")
    public AjaxResult getInfo(@PathVariable Long noticeId)
    {
-        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+        return success(noticeService.selectNoticeById(noticeId));
    }
    /**
@@ -64,7 +64,7 @@ public class SysPostController extends BaseController
    @GetMapping(value = "/{postId}")
    public AjaxResult getInfo(@PathVariable Long postId)
    {
-        return AjaxResult.success(postService.selectPostById(postId));
+        return success(postService.selectPostById(postId));
    }
    /**
@@ -77,11 +77,11 @@ public class SysPostController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
        {
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
        }
        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
        {
-            return AjaxResult.error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
        }
        post.setCreateBy(getUsername());
        return toAjax(postService.insertPost(post));
@@ -97,11 +97,11 @@ public class SysPostController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
        {
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+            return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
        }
        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
        {
-            return AjaxResult.error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+            return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
        }
        post.setUpdateBy(getUsername());
        return toAjax(postService.updatePost(post));
@@ -125,6 +125,6 @@ public class SysPostController extends BaseController
    public AjaxResult optionselect()
    {
        List<SysPost> posts = postService.selectPostAll();
-        return AjaxResult.success(posts);
+        return success(posts);
    }
 }
@@ -66,12 +66,12 @@ public class SysProfileController extends BaseController
        if (StringUtils.isNotEmpty(user.getPhonenumber())
                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
        if (StringUtils.isNotEmpty(user.getEmail())
                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        user.setUserId(sysUser.getUserId());
        user.setPassword(null);
@@ -85,9 +85,9 @@ public class SysProfileController extends BaseController
            sysUser.setEmail(user.getEmail());
            sysUser.setSex(user.getSex());
            tokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
+            return success();
        }
-        return AjaxResult.error("修改个人信息异常，请联系管理员");
+        return error("修改个人信息异常，请联系管理员");
    }
    /**
@@ -102,20 +102,20 @@ public class SysProfileController extends BaseController
        String password = loginUser.getPassword();
        if (!SecurityUtils.matchesPassword(oldPassword, password))
        {
-            return AjaxResult.error("修改密码失败，旧密码错误");
+            return error("修改密码失败，旧密码错误");
        }
        if (SecurityUtils.matchesPassword(newPassword, password))
        {
-            return AjaxResult.error("新密码不能与旧密码相同");
+            return error("新密码不能与旧密码相同");
        }
        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)
        {
            // 更新缓存用户密码
            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));
            tokenService.setLoginUser(loginUser);
-            return AjaxResult.success();
+            return success();
        }
-        return AjaxResult.error("修改密码异常，请联系管理员");
+        return error("修改密码异常，请联系管理员");
    }
    /**
@@ -139,6 +139,6 @@ public class SysProfileController extends BaseController
                return ajax;
            }
        }
-        return AjaxResult.error("上传图片异常，请联系管理员");
+        return error("上传图片异常，请联系管理员");
    }
 }
@@ -83,7 +83,7 @@ public class SysRoleController extends BaseController
    public AjaxResult getInfo(@PathVariable Long roleId)
    {
        roleService.checkRoleDataScope(roleId);
-        return AjaxResult.success(roleService.selectRoleById(roleId));
+        return success(roleService.selectRoleById(roleId));
    }
    /**
@@ -96,11 +96,11 @@ public class SysRoleController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
        }
        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
        {
-            return AjaxResult.error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
        }
        role.setCreateBy(getUsername());
        return toAjax(roleService.insertRole(role));
@@ -119,11 +119,11 @@ public class SysRoleController extends BaseController
        roleService.checkRoleDataScope(role.getRoleId());
        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
        {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+            return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
        }
        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
        {
-            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+            return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
        }
        role.setUpdateBy(getUsername());
@@ -137,9 +137,9 @@ public class SysRoleController extends BaseController
                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
                tokenService.setLoginUser(loginUser);
            }
-            return AjaxResult.success();
+            return success();
        }
-        return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+        return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
    }
    /**
@@ -187,7 +187,7 @@ public class SysRoleController extends BaseController
    @GetMapping("/optionselect")
    public AjaxResult optionselect()
    {
-        return AjaxResult.success(roleService.selectRoleAll());
+        return success(roleService.selectRoleAll());
    }
    /**
@@ -85,7 +85,7 @@ public class SysUserController extends BaseController
        List<SysUser> userList = util.importExcel(file.getInputStream());
        String operName = getUsername();
        String message = userService.importUser(userList, updateSupport, operName);
-        return AjaxResult.success(message);
+        return success(message);
    }
    @PostMapping("/importTemplate")
@@ -127,17 +127,17 @@ public class SysUserController extends BaseController
    {
        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+            return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
        }
        else if (StringUtils.isNotEmpty(user.getPhonenumber())
                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
        else if (StringUtils.isNotEmpty(user.getEmail())
                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
        {
-            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -156,17 +156,17 @@ public class SysUserController extends BaseController
        userService.checkUserDataScope(user.getUserId());
        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+            return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
        }
        else if (StringUtils.isNotEmpty(user.getPhonenumber())
                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+            return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
        }
        else if (StringUtils.isNotEmpty(user.getEmail())
                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
        {
-            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        user.setUpdateBy(getUsername());
        return toAjax(userService.updateUser(user));
@@ -251,6 +251,6 @@ public class SysUserController extends BaseController
    @GetMapping("/deptTree")
    public AjaxResult deptTree(SysDept dept)
    {
-        return AjaxResult.success(deptService.selectDeptTreeList(dept));
+        return success(deptService.selectDeptTreeList(dept));
    }
 }
@@ -1,24 +0,0 @@
 package com.ruoyi.web.controller.tool;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.ruoyi.common.core.controller.BaseController;
 /**
 * swagger 接口
 * 
 * @author ruoyi
 */
@Controller
@RequestMapping("/tool/swagger")
 public class SwaggerController extends BaseController
 {
    @PreAuthorize("@ss.hasPermi('tool:swagger:view')")
    @GetMapping()
    public String index()
    {
        return redirect("/swagger-ui.html");
    }
 }
@@ -3,9 +3,9 @@ ruoyi:
  # 名称
  name: RuoYi
  # 版本
-  version: 3.8.4
+  version: 3.8.5
  # 版权年份
-  copyrightYear: 2022
+  copyrightYear: 2023
  # 实例演示开关
  demoEnabled: true
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.8.4</version>
+        <version>3.8.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -58,6 +58,13 @@
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <!-- 动态数据源 -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
 			<version>3.5.2</version>
 		</dependency>
        <!-- 阿里JSON解析器 -->
        <dependency>
@@ -138,5 +138,5 @@ public class Constants
     * 定时任务违规的字符
     */
    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework", "org.apache", "com.ruoyi.common.utils.file" };
+            "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config" };
 }
@@ -86,4 +86,9 @@ public class HttpStatus
     * 接口未实现
     */
    public static final int NOT_IMPLEMENTED = 501;
    /**
     * 系统警告消息
     */
    public static final int WARN = 601;
 }
@@ -113,6 +113,14 @@ public class BaseController
    {
        return AjaxResult.success(message);
    }
    /**
     * 返回成功消息
     */
    public AjaxResult success(Object data)
    {
        return AjaxResult.success(data);
    }
    /**
     * 返回失败消息
@@ -122,6 +130,14 @@ public class BaseController
        return AjaxResult.error(message);
    }
    /**
     * 返回警告消息
     */
    public AjaxResult warn(String message)
    {
        return AjaxResult.warn(message);
    }
    /**
     * 响应返回结果
     * 
@@ -101,10 +101,33 @@ public class AjaxResult extends HashMap<String, Object>
        return new AjaxResult(HttpStatus.SUCCESS, msg, data);
    }
    /**
     * 返回警告消息
     *
     * @param msg 返回内容
     * @return 警告消息
     */
    public static AjaxResult warn(String msg)
    {
        return AjaxResult.warn(msg, null);
    }
    /**
     * 返回警告消息
     *
     * @param msg 返回内容
     * @param data 数据对象
     * @return 警告消息
     */
    public static AjaxResult warn(String msg, Object data)
    {
        return new AjaxResult(HttpStatus.WARN, msg, data);
    }
    /**
     * 返回错误消息
     * 
-     * @return
+     * @return 错误消息
     */
    public static AjaxResult error()
    {
@@ -115,7 +138,7 @@ public class AjaxResult extends HashMap<String, Object>
     * 返回错误消息
     * 
     * @param msg 返回内容
-     * @return 警告消息
+     * @return 错误消息
     */
    public static AjaxResult error(String msg)
    {
@@ -127,7 +150,7 @@ public class AjaxResult extends HashMap<String, Object>
     * 
     * @param msg 返回内容
     * @param data 数据对象
-     * @return 警告消息
+     * @return 错误消息
     */
    public static AjaxResult error(String msg, Object data)
    {
@@ -139,7 +162,7 @@ public class AjaxResult extends HashMap<String, Object>
     * 
     * @param code 状态码
     * @param msg 返回内容
-     * @return 警告消息
+     * @return 错误消息
     */
    public static AjaxResult error(int code, String msg)
    {
@@ -5,6 +5,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 /**
 * Entity基类
@@ -16,6 +18,7 @@ public class BaseEntity implements Serializable
    private static final long serialVersionUID = 1L;
    /** 搜索值 */
    @JsonIgnore
    private String searchValue;
    /** 创建者 */
@@ -36,6 +39,7 @@ public class BaseEntity implements Serializable
    private String remark;
    /** 请求参数 */
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private Map<String, Object> params;
    public String getSearchValue()
@@ -103,13 +103,13 @@ public class R<T> implements Serializable
        this.data = data;
    }
-    public Boolean isError()
+    public static <T> Boolean isError(R<T> ret)
    {
-        return !isSuccess();
+        return !isSuccess(ret);
    }
-    public Boolean isSuccess()
+    public static <T> Boolean isSuccess(R<T> ret)
    {
-        return R.SUCCESS == getCode();
+        return R.SUCCESS == ret.getCode();
    }
 }
@@ -54,7 +54,7 @@ public class SysMenu extends BaseEntity
    /** 显示状态（0显示 1隐藏） */
    private String visible;
-    /** 菜单状态（0显示 1隐藏） */
+    /** 菜单状态（0正常 1停用） */
    private String status;
    /** 权限字符串 */
@@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain.entity;
 import java.util.Set;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -32,7 +33,7 @@ public class SysRole extends BaseEntity
    /** 角色排序 */
    @Excel(name = "角色排序")
-    private String roleSort;
+    private Integer roleSort;
    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
@@ -117,13 +118,13 @@ public class SysRole extends BaseEntity
        this.roleKey = roleKey;
    }
-    @NotBlank(message = "显示顺序不能为空")
+    @NotNull(message = "显示顺序不能为空")
-    public String getRoleSort()
+    public Integer getRoleSort()
    {
        return roleSort;
    }
-    public void setRoleSort(String roleSort)
+    public void setRoleSort(Integer roleSort)
    {
        this.roleSort = roleSort;
    }
@@ -713,7 +713,7 @@ public class Convert
        }
        if (value instanceof Double)
        {
-            return new BigDecimal((Double) value);
+            return BigDecimal.valueOf((Double) value);
        }
        if (value instanceof Integer)
        {
@@ -34,13 +34,13 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
        if (values != null)
        {
            int length = values.length;
-            String[] escapseValues = new String[length];
+            String[] escapesValues = new String[length];
            for (int i = 0; i < length; i++)
            {
                // 防xss攻击和过滤前后空格
-                escapseValues[i] = EscapeUtil.clean(values[i]).trim();
+                escapesValues[i] = EscapeUtil.clean(values[i]).trim();
            }
-            return escapseValues;
+            return escapesValues;
        }
        return super.getParameterValues(name);
    }
@@ -4,6 +4,10 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -68,6 +72,34 @@ public class ServletUtils
        return Convert.toBool(getRequest().getParameter(name), defaultValue);
    }
    /**
     * 获得所有请求参数
     *
     * @param request 请求对象{@link ServletRequest}
     * @return Map
     */
    public static Map<String, String[]> getParams(ServletRequest request)
    {
        final Map<String, String[]> map = request.getParameterMap();
        return Collections.unmodifiableMap(map);
    }
    /**
     * 获得所有请求参数
     *
     * @param request 请求对象{@link ServletRequest}
     * @return Map
     */
    public static Map<String, String> getParamMap(ServletRequest request)
    {
        Map<String, String> params = new HashMap<>();
        for (Map.Entry<String, String[]> entry : getParams(request).entrySet())
        {
            params.put(entry.getKey(), StringUtils.join(entry.getValue(), ","));
        }
        return params;
    }
    /**
     * 获取request
     */
@@ -116,8 +116,7 @@ public class FileUtils
        // 路径为文件且不为空则进行删除
        if (file.isFile() && file.exists())
        {
-            file.delete();
+            flag = file.delete();
            flag = true;
        }
        return flag;
    }
@@ -289,5 +288,4 @@ public class FileUtils
        String baseName = FilenameUtils.getBaseName(fileName);
        return baseName;
    }
 }
@@ -48,6 +48,7 @@ import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.Name;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -689,17 +690,24 @@ public class ExcelUtil<T>
        int rowNo = (1 + rownum) - startNo;
        for (int i = startNo; i < endNo; i++)
        {
-            rowNo = i > 1 ? rowNo + 1 : rowNo + i;
+            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
            row = sheet.createRow(rowNo);
            // 得到导出对象.
            T vo = (T) list.get(i);
            Collection<?> subList = null;
-            if (isSubListValue(vo))
+            if (isSubList())
            {
-                subList = getListCellValue(vo);
+                if (isSubListValue(vo))
-                subMergedLastRowNum = subMergedLastRowNum + subList.size();
+                {
                    subList = getListCellValue(vo);
                    subMergedLastRowNum = subMergedLastRowNum + subList.size();
                }
                else
                {
                    subMergedFirstRowNum++;
                    subMergedLastRowNum++;
                }
            }
            int column = 0;
            for (Object[] os : fields)
            {
@@ -904,6 +912,10 @@ public class ExcelUtil<T>
            {
                cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
            }
            if (value instanceof Collection && StringUtils.equals("[]", cellValue))
            {
                cellValue = StringUtils.EMPTY;
            }
            cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
        }
        else if (ColumnType.NUMERIC == attr.cellType())
@@ -971,8 +983,16 @@ public class ExcelUtil<T>
        }
        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
        {
-            // 提示信息或只能选择不能输入的列内容.
+            if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
-            setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+            {
                // 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到
                setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
            }
            else
            {
                // 提示信息或只能选择不能输入的列内容.
                setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
            }
        }
    }
@@ -1076,6 +1096,58 @@ public class ExcelUtil<T>
        sheet.addValidationData(dataValidation);
    }
    /**
     * 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）.
     * 
     * @param sheet 要设置的sheet.
     * @param textlist 下拉框显示的内容
     * @param promptContent 提示内容
     * @param firstRow 开始行
     * @param endRow 结束行
     * @param firstCol 开始列
     * @param endCol 结束列
     */
    public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)
    {
        String hideSheetName = "combo_" + firstCol + "_" + endCol;
        Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据
        for (int i = 0; i < textlist.length; i++)
        {
            hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
        }
        // 创建名称，可被其他单元格引用
        Name name = wb.createName();
        name.setNameName(hideSheetName + "_data");
        name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);
        DataValidationHelper helper = sheet.getDataValidationHelper();
        // 加载下拉列表内容
        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data");
        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
        // 数据有效性对象
        DataValidation dataValidation = helper.createValidation(constraint, regions);
        if (StringUtils.isNotEmpty(promptContent))
        {
            // 如果设置了提示信息则鼠标放上去提示
            dataValidation.createPromptBox("", promptContent);
            dataValidation.setShowPromptBox(true);
        }
        // 处理Excel兼容性问题
        if (dataValidation instanceof XSSFDataValidation)
        {
            dataValidation.setSuppressDropDownArrow(true);
            dataValidation.setShowErrorBox(true);
        }
        else
        {
            dataValidation.setSuppressDropDownArrow(false);
        }
        sheet.addValidationData(dataValidation);
        // 设置hiddenSheet隐藏
        wb.setSheetHidden(wb.getSheetIndex(hideSheet), true);
    }
    /**
     * 解析导出值 0=男,1=女,2=未知
     * 
@@ -13,7 +13,7 @@ public class SqlUtil
    /**
     * 定义常用的 sql关键字
     */
-    public static String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare ";
+    public static String SQL_REGEX = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |+|user()";
    /**
     * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.8.4</version>
+        <version>3.8.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
        <!-- 验证码 -->
        <dependency>
-            <groupId>com.github.penggle</groupId>
+            <groupId>pro.fessional</groupId>
            <artifactId>kaptcha</artifactId>
            <exclusions>
                <exclusion>
@@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.HandlerMapping;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -103,7 +102,6 @@ public class LogAspect
        catch (Exception exp)
        {
            // 记录本地异常日志
            log.error("==前置通知异常==");
            log.error("异常信息:{}", exp.getMessage());
            exp.printStackTrace();
        }
@@ -153,8 +151,8 @@ public class LogAspect
        }
        else
        {
-            Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+            Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
-            operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
+            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter()), 0, 2000));
        }
    }
@@ -50,7 +50,6 @@ public class RateLimiterAspect
    @Before("@annotation(rateLimiter)")
    public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable
    {
        String key = rateLimiter.key();
        int time = rateLimiter.time();
        int count = rateLimiter.count();
@@ -63,7 +62,7 @@ public class RateLimiterAspect
            {
                throw new ServiceException("访问过于频繁，请稍候再试");
            }
-            log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), key);
+            log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), combineKey);
        }
        catch (ServiceException e)
        {
@@ -1,8 +1,10 @@
 package com.ruoyi.framework.config;
 import java.util.concurrent.TimeUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.CacheControl;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
@@ -33,7 +35,8 @@ public class ResourcesConfig implements WebMvcConfigurer
        /** swagger配置 */
        registry.addResourceHandler("/swagger-ui/**")
-                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());;
    }
    /**
@@ -102,6 +102,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
        httpSecurity
                // CSRF禁用，因为不使用session
                .csrf().disable()
                // 禁用HTTP响应标头
                .headers().cacheControl().disable().and()
                // 认证失败处理类
                .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
                // 基于token，所以不需要session
@@ -109,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                // 过滤请求
                .authorizeRequests()
                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage").permitAll()
                // 静态资源，可匿名访问
                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
@@ -10,7 +10,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.ServletUtils;
@@ -48,6 +47,6 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
            // 记录用户退出日志
            AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功"));
        }
-        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.SUCCESS, "退出成功")));
+        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success("退出成功")));
    }
 }
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.8.4</version>
+        <version>3.8.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -69,7 +69,7 @@ public class GenController extends BaseController
        map.put("info", table);
        map.put("rows", list);
        map.put("tables", tables);
-        return AjaxResult.success(map);
+        return success(map);
    }
    /**
@@ -110,7 +110,7 @@ public class GenController extends BaseController
        // 查询表信息
        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
        genTableService.importGenTable(tableList);
-        return AjaxResult.success();
+        return success();
    }
    /**
@@ -123,7 +123,7 @@ public class GenController extends BaseController
    {
        genTableService.validateEdit(genTable);
        genTableService.updateGenTable(genTable);
-        return AjaxResult.success();
+        return success();
    }
    /**
@@ -135,7 +135,7 @@ public class GenController extends BaseController
    public AjaxResult remove(@PathVariable Long[] tableIds)
    {
        genTableService.deleteGenTableByIds(tableIds);
-        return AjaxResult.success();
+        return success();
    }
    /**
@@ -146,7 +146,7 @@ public class GenController extends BaseController
    public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
    {
        Map<String, String> dataMap = genTableService.previewCode(tableId);
-        return AjaxResult.success(dataMap);
+        return success(dataMap);
    }
    /**
@@ -170,7 +170,7 @@ public class GenController extends BaseController
    public AjaxResult genCode(@PathVariable("tableName") String tableName)
    {
        genTableService.generatorCode(tableName);
-        return AjaxResult.success();
+        return success();
    }
    /**
@@ -182,7 +182,7 @@ public class GenController extends BaseController
    public AjaxResult synchDb(@PathVariable("tableName") String tableName)
    {
        genTableService.synchDb(tableName);
-        return AjaxResult.success();
+        return success();
    }
    /**
@@ -53,7 +53,7 @@ public class ${ClassName}Controller extends BaseController
    public AjaxResult list(${ClassName} ${className})
    {
        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-        return AjaxResult.success(list);
+        return success(list);
    }
 #end
@@ -77,7 +77,7 @@ public class ${ClassName}Controller extends BaseController
    @GetMapping(value = "/{${pkColumn.javaField}}")
    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
    {
-        return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
    }
    /**
@@ -187,11 +187,11 @@
          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <image-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <file-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "editor")
@@ -205,8 +205,11 @@
              v-for="dict in dict.type.${dictType}"
              :key="dict.value"
              :label="dict.label"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :value="parseInt(dict.value)"
 #else
              :value="dict.value"
 #end
            ></el-option>
          </el-select>
        </el-form-item>
@@ -217,7 +220,7 @@
          </el-select>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox
              v-for="dict in dict.type.${dictType}"
@@ -228,24 +231,27 @@
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox>请选择字典生成</el-checkbox>
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio
              v-for="dict in dict.type.${dictType}"
              :key="dict.value"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :label="parseInt(dict.value)"
 #else
              :label="dict.value"
 #end
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio label="1">请选择字典生成</el-radio>
          </el-radio-group>
@@ -335,7 +341,7 @@ export default {
 #set($comment=$column.columnComment)
 #end
        $column.javaField: [
-          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
        ]#if($foreach.count != $columns.size()),#end
 #end
 #end
@@ -398,10 +404,7 @@ export default {
    reset() {
      this.form = {
 #foreach ($column in $columns)
-#if($column.htmlType == "radio")
+#if($column.htmlType == "checkbox")
        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
 #elseif($column.htmlType == "checkbox")
        $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else
        $column.javaField: null#if($foreach.count != $columns.size()),#end
@@ -198,11 +198,11 @@
          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <image-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <file-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "editor")
@@ -216,8 +216,11 @@
              v-for="dict in dict.type.${dictType}"
              :key="dict.value"
              :label="dict.label"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :value="parseInt(dict.value)"
 #else
              :value="dict.value"
 #end
            ></el-option>
          </el-select>
        </el-form-item>
@@ -228,7 +231,7 @@
          </el-select>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox
              v-for="dict in dict.type.${dictType}"
@@ -239,24 +242,27 @@
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox>请选择字典生成</el-checkbox>
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio
              v-for="dict in dict.type.${dictType}"
              :key="dict.value"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :label="parseInt(dict.value)"
 #else
              :label="dict.value"
 #end
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio label="1">请选择字典生成</el-radio>
          </el-radio-group>
@@ -412,7 +418,7 @@ export default {
 #set($comment=$column.columnComment)
 #end
        $column.javaField: [
-          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
        ]#if($foreach.count != $columns.size()),#end
 #end
 #end
@@ -456,9 +462,7 @@ export default {
    reset() {
      this.form = {
 #foreach ($column in $columns)
-#if($column.htmlType == "radio")
+#if($column.htmlType == "checkbox")
        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
 #elseif($column.htmlType == "checkbox")
        $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else
        $column.javaField: null#if($foreach.count != $columns.size()),#end
@@ -136,24 +136,9 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
-          <el-button
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
-            type="text"
+          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
-            icon="Edit"
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
            @click="handleUpdate(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:edit']"
          >修改</el-button>
          <el-button
            type="text"
            icon="Plus"
            @click="handleAdd(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:add']"
          >新增</el-button>
          <el-button
            type="text"
            icon="Delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -188,11 +173,11 @@
          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <image-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <file-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "editor")
@@ -206,8 +191,11 @@
              v-for="dict in ${dictType}"
              :key="dict.value"
              :label="dict.label"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :value="parseInt(dict.value)"
 #else
              :value="dict.value"
 #end
            ></el-option>
          </el-select>
        </el-form-item>
@@ -218,7 +206,7 @@
          </el-select>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox
              v-for="dict in ${dictType}"
@@ -229,24 +217,27 @@
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox>请选择字典生成</el-checkbox>
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio
              v-for="dict in ${dictType}"
              :key="dict.value"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :label="parseInt(dict.value)"
 #else
              :label="dict.value"
 #end
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio label="1">请选择字典生成</el-radio>
          </el-radio-group>
@@ -322,7 +313,7 @@ const data = reactive({
 #set($comment=$column.columnComment)
 #end
    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
    ]#if($foreach.count != $columns.size()),#end
 #end
 #end
@@ -375,10 +366,7 @@ function cancel() {
 function reset() {
  form.value = {
 #foreach ($column in $columns)
-#if($column.htmlType == "radio")
+#if($column.htmlType == "checkbox")
    $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
 #elseif($column.htmlType == "checkbox")
    $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else
    $column.javaField: null#if($foreach.count != $columns.size()),#end
@@ -148,18 +148,8 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
-          <el-button
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
-            type="text"
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
            icon="Edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:edit']"
          >修改</el-button>
          <el-button
            type="text"
            icon="Delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['${moduleName}:${businessName}:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -191,11 +181,11 @@
          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <image-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <file-upload v-model="form.${field}"/>
        </el-form-item>
 #elseif($column.htmlType == "editor")
@@ -209,8 +199,11 @@
              v-for="dict in ${dictType}"
              :key="dict.value"
              :label="dict.label"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :value="parseInt(dict.value)"
 #else
              :value="dict.value"
 #end
            ></el-option>
          </el-select>
        </el-form-item>
@@ -221,7 +214,7 @@
          </el-select>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox
              v-for="dict in ${dictType}"
@@ -232,24 +225,27 @@
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-checkbox-group v-model="form.${field}">
            <el-checkbox>请选择字典生成</el-checkbox>
          </el-checkbox-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio
              v-for="dict in ${dictType}"
              :key="dict.value"
-              #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end
+#if($column.javaType == "Integer" || $column.javaType == "Long")
-
+              :label="parseInt(dict.value)"
 #else
              :label="dict.value"
 #end
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}">
+        <el-form-item label="${comment}" prop="${field}">
          <el-radio-group v-model="form.${field}">
            <el-radio label="1">请选择字典生成</el-radio>
          </el-radio-group>
@@ -398,7 +394,7 @@ const data = reactive({
 #set($comment=$column.columnComment)
 #end
    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
    ]#if($foreach.count != $columns.size()),#end
 #end
 #end
@@ -442,9 +438,7 @@ function cancel() {
 function reset() {
  form.value = {
 #foreach ($column in $columns)
-#if($column.htmlType == "radio")
+#if($column.htmlType == "checkbox")
    $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end
 #elseif($column.htmlType == "checkbox")
    $column.javaField: []#if($foreach.count != $columns.size()),#end
 #else
    $column.javaField: null#if($foreach.count != $columns.size()),#end
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.8.4</version>
+        <version>3.8.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -71,7 +71,7 @@ public class SysJobController extends BaseController
    @GetMapping(value = "/{jobId}")
    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
    {
-        return AjaxResult.success(jobService.selectJobById(jobId));
+        return success(jobService.selectJobById(jobId));
    }
    /**
@@ -60,10 +60,10 @@ public class SysJobLogController extends BaseController
     * 根据调度编号获取详细信息
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
-    @GetMapping(value = "/{configId}")
+    @GetMapping(value = "/{jobLogId}")
    public AjaxResult getInfo(@PathVariable Long jobLogId)
    {
-        return AjaxResult.success(jobLogService.selectJobLogById(jobLogId));
+        return success(jobLogService.selectJobLogById(jobLogId));
    }
@@ -87,6 +87,6 @@ public class SysJobLogController extends BaseController
    public AjaxResult clean()
    {
        jobLogService.cleanJobLog();
-        return AjaxResult.success();
+        return success();
    }
 }
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.8.4</version>
+        <version>3.8.5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -1,6 +1,7 @@
 package com.ruoyi.system.domain;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,7 +32,7 @@ public class SysPost extends BaseEntity
    /** 岗位排序 */
    @Excel(name = "岗位排序")
-    private String postSort;
+    private Integer postSort;
    /** 状态（0正常 1停用） */
    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
@@ -74,13 +75,13 @@ public class SysPost extends BaseEntity
        this.postName = postName;
    }
-    @NotBlank(message = "显示顺序不能为空")
+    @NotNull(message = "显示顺序不能为空")
-    public String getPostSort()
+    public Integer getPostSort()
    {
        return postSort;
    }
-    public void setPostSort(String postSort)
+    public void setPostSort(Integer postSort)
    {
        this.postSort = postSort;
    }
@@ -18,6 +18,14 @@ public interface SysConfigMapper
     */
    public SysConfig selectConfig(SysConfig config);
    /**
     * 通过ID查询配置
     * 
     * @param configId 参数ID
     * @return 参数配置信息
     */
    public SysConfig selectConfigById(Long configId);
    /**
     * 查询参数配置列表
     * 
@@ -134,6 +134,12 @@ public class SysConfigServiceImpl implements ISysConfigService
    @Override
    public int updateConfig(SysConfig config)
    {
        SysConfig temp = configMapper.selectConfigById(config.getConfigId());
        if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey()))
        {
            redisCache.deleteObject(getCacheKey(temp.getConfigKey()));
        }
        int row = configMapper.updateConfig(config);
        if (row > 0)
        {
@@ -71,11 +71,7 @@ public class SysDeptServiceImpl implements ISysDeptService
    public List<SysDept> buildDeptTree(List<SysDept> depts)
    {
        List<SysDept> returnList = new ArrayList<SysDept>();
-        List<Long> tempList = new ArrayList<Long>();
+        List<Long> tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
        for (SysDept dept : depts)
        {
            tempList.add(dept.getDeptId());
        }
        for (SysDept dept : depts)
        {
            // 如果是顶级节点, 遍历该父节点的所有子节点
@@ -223,11 +223,7 @@ public class SysMenuServiceImpl implements ISysMenuService
    public List<SysMenu> buildMenuTree(List<SysMenu> menus)
    {
        List<SysMenu> returnList = new ArrayList<SysMenu>();
-        List<Long> tempList = new ArrayList<Long>();
+        List<Long> tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
        for (SysMenu dept : menus)
        {
            tempList.add(dept.getMenuId());
        }
        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
        {
            SysMenu menu = (SysMenu) iterator.next();
@@ -479,8 +475,8 @@ public class SysMenuServiceImpl implements ISysMenuService
    /**
     * 递归列表
     * 
-     * @param list
+     * @param list 分类表
-     * @param t
+     * @param t 子节点
     */
    private void recursionFn(List<SysMenu> list, SysMenu t)
    {
@@ -525,7 +521,7 @@ public class SysMenuServiceImpl implements ISysMenuService
    /**
     * 内链域名特殊字符替换
     * 
-     * @return
+     * @return 替换后的内链域名
     */
    public String innerLinkReplaceEach(String path)
    {
@@ -508,6 +508,8 @@ public class SysUserServiceImpl implements ISysUserService
                else if (isUpdateSupport)
                {
                    BeanValidators.validateWithException(validator, user);
                    checkUserAllowed(user);
                    checkUserDataScope(user.getUserId());
                    user.setUpdateBy(operName);
                    this.updateUser(user);
                    successNum++;
@@ -59,6 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
    </select>
    <select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        where config_id = #{configId}
    </select>
    <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        where config_key = #{configKey} limit 1
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<set>
 			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
 			<if test="postName != null and postName != ''">post_name = #{postName},</if>
- 			<if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
+ 			<if test="postSort != null">post_sort = #{postSort},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="postId != null and postId != 0">post_id,</if>
 			<if test="postCode != null and postCode != ''">post_code,</if>
 			<if test="postName != null and postName != ''">post_name,</if>
- 			<if test="postSort != null and postSort != ''">post_sort,</if>
+ 			<if test="postSort != null">post_sort,</if>
 			<if test="status != null and status != ''">status,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="postId != null and postId != 0">#{postId},</if>
 			<if test="postCode != null and postCode != ''">#{postCode},</if>
 			<if test="postName != null and postName != ''">#{postName},</if>
- 			<if test="postSort != null and postSort != ''">#{postSort},</if>
+ 			<if test="postSort != null">#{postSort},</if>
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="roleId != null and roleId != 0">role_id,</if>
 			<if test="roleName != null and roleName != ''">role_name,</if>
 			<if test="roleKey != null and roleKey != ''">role_key,</if>
- 			<if test="roleSort != null and roleSort != ''">role_sort,</if>
+ 			<if test="roleSort != null">role_sort,</if>
 			<if test="dataScope != null and dataScope != ''">data_scope,</if>
 			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
 			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="roleId != null and roleId != 0">#{roleId},</if>
 			<if test="roleName != null and roleName != ''">#{roleName},</if>
 			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
- 			<if test="roleSort != null and roleSort != ''">#{roleSort},</if>
+ 			<if test="roleSort != null">#{roleSort},</if>
 			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
 			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
 			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<set>
 			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
 			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
- 			<if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>
+ 			<if test="roleSort != null">role_sort = #{roleSort},</if>
 			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
 			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
 			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
@@ -1,6 +1,6 @@
 {
  "name": "ruoyi",
-  "version": "3.8.4",
+  "version": "3.8.5",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
@@ -39,8 +39,8 @@
    "@riophae/vue-treeselect": "0.4.0",
    "axios": "0.24.0",
    "clipboard": "2.0.8",
-    "core-js": "3.25.2",
+    "core-js": "3.25.3",
-    "echarts": "4.9.0",
+    "echarts": "5.4.0",
    "element-ui": "2.15.10",
    "file-saver": "2.0.5",
    "fuse.js": "6.4.3",
@@ -1,12 +1,16 @@
 <template>
  <div id="app">
    <router-view />
    <theme-picker />
  </div>
 </template>
 <script>
-export default  {
+import ThemePicker from "@/components/ThemePicker";
-  name:  'App',
+
 export default {
  name: "App",
  components: { ThemePicker },
    metaInfo() {
        return {
            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
@@ -15,5 +19,10 @@ export default  {
            }
        }
    }
-}
+};
 </script>
 <style scoped>
 #app .theme-picker {
  display: none;
 }
 </style>
@@ -1 +1 @@
-<?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="1546567861908" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2422" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M318.577778 819.2L17.066667 512l301.511111-307.2 45.511111 45.511111L96.711111 512l267.377778 261.688889zM705.422222 819.2l-45.511111-45.511111L927.288889 512l-267.377778-261.688889 45.511111-45.511111L1006.933333 512zM540.785778 221.866667l55.751111 11.150222L483.157333 802.133333l-55.751111-11.093333z" fill="#bfbfbf" p-id="2423"></path></svg>
+<?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="1546567861908" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2422" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M318.577778 819.2L17.066667 512l301.511111-307.2 45.511111 45.511111L96.711111 512l267.377778 261.688889zM705.422222 819.2l-45.511111-45.511111L927.288889 512l-267.377778-261.688889 45.511111-45.511111L1006.933333 512zM540.785778 221.866667l55.751111 11.150222L483.157333 802.133333l-55.751111-11.093333z" p-id="2423"></path></svg>
@@ -1 +1 @@
-<?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="1547360688278" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6717" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M890 120H134a70 70 0 0 0-70 70v500a70 70 0 0 0 70 70h756a70 70 0 0 0 70-70V190a70 70 0 0 0-70-70z m-10 520a40 40 0 0 1-40 40H712V448a40 40 0 0 0-80 0v232h-80V368a40 40 0 0 0-80 0v312h-80V512a40 40 0 0 0-80 0v168H184a40 40 0 0 1-40-40V240a40 40 0 0 1 40-40h656a40 40 0 0 1 40 40zM696 824H328a40 40 0 0 0 0 80h368a40 40 0 0 0 0-80z" fill="#bfbfbf" p-id="6718"></path></svg>
+<?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="1547360688278" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6717" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M890 120H134a70 70 0 0 0-70 70v500a70 70 0 0 0 70 70h756a70 70 0 0 0 70-70V190a70 70 0 0 0-70-70z m-10 520a40 40 0 0 1-40 40H712V448a40 40 0 0 0-80 0v232h-80V368a40 40 0 0 0-80 0v312h-80V512a40 40 0 0 0-80 0v168H184a40 40 0 0 1-40-40V240a40 40 0 0 1 40-40h656a40 40 0 0 1 40 40zM696 824H328a40 40 0 0 0 0 80h368a40 40 0 0 0 0-80z" p-id="6718"></path></svg>
@@ -1,2 +1,2 @@
 <?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="1543827724451" class="icon" style="" viewBox="0 0 1084 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10233" xmlns:xlink="http://www.w3.org/1999/xlink" width="211.71875" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }
-</style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234" fill="#bfbfbf"></path></svg>
+</style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234"></path></svg>
@@ -1 +1 @@
-<?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="1553828490559" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1684" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M898.831744 900.517641 103.816972 900.517641c-36.002982 0-65.363683-29.286-65.363683-65.313541l0-554.949184c0-36.041868 29.361725-65.326844 65.363683-65.326844l795.015795 0c36.002982 0 65.198931 29.284977 65.198931 65.326844l0 554.949184C964.030675 871.231641 934.834726 900.517641 898.831744 900.517641L898.831744 900.517641zM103.816972 255.593236c-13.576203 0-24.711821 11.085476-24.711821 24.662703l0 554.949184c0 13.576203 11.136641 24.662703 24.711821 24.662703l795.015795 0c13.577227 0 24.547069-11.086499 24.547069-24.662703l0-554.949184c0-13.577227-10.970866-24.662703-24.547069-24.662703L103.816972 255.593236 103.816972 255.593236zM664.346245 251.774257c-11.161201 0-20.332071-9.080819-20.332071-20.332071l0-101.278661c0-13.576203-11.047614-24.623817-24.699542-24.623817L383.181611 105.539708c-13.576203 0-24.712845 11.04659-24.712845 24.623817l0 101.278661c0 11.252275-9.041934 20.332071-20.332071 20.332071-11.20111 0-20.319791-9.080819-20.319791-20.332071l0-101.278661c0-35.989679 29.323862-65.275679 65.364707-65.275679l236.133022 0c36.06745 0 65.402569 29.284977 65.402569 65.275679l0 101.278661C684.717202 242.694461 675.636383 251.774257 664.346245 251.774257L664.346245 251.774257zM413.233044 521.725502 75.694471 521.725502c-11.163247 0-20.333094-9.117658-20.333094-20.35663 0-11.252275 9.169847-20.332071 20.333094-20.332071l337.538573 0c11.277858 0 20.319791 9.080819 20.319791 20.332071C433.552835 512.607844 424.510902 521.725502 413.233044 521.725502L413.233044 521.725502zM912.894018 521.725502 575.367725 521.725502c-11.213389 0-20.332071-9.117658-20.332071-20.35663 0-11.252275 9.118682-20.332071 20.332071-20.332071l337.526293 0c11.290137 0 20.332071 9.080819 20.332071 20.332071C933.226089 512.607844 924.184155 521.725502 912.894018 521.725502L912.894018 521.725502zM557.56322 634.217552 445.085496 634.217552c-11.213389 0-20.332071-9.079796-20.332071-20.331048l0-168.763658c0-11.251252 9.118682-20.332071 20.332071-20.332071l112.478747 0c11.290137 0 20.370956 9.080819 20.370956 20.332071l0 168.763658C577.934177 625.137757 568.853357 634.217552 557.56322 634.217552L557.56322 634.217552zM465.417567 593.514525l71.827909 0L537.245476 465.454918l-71.827909 0L465.417567 593.514525 465.417567 593.514525z" p-id="1685" fill="#bfbfbf"></path></svg>
+<?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="1553828490559" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1684" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M898.831744 900.517641 103.816972 900.517641c-36.002982 0-65.363683-29.286-65.363683-65.313541l0-554.949184c0-36.041868 29.361725-65.326844 65.363683-65.326844l795.015795 0c36.002982 0 65.198931 29.284977 65.198931 65.326844l0 554.949184C964.030675 871.231641 934.834726 900.517641 898.831744 900.517641L898.831744 900.517641zM103.816972 255.593236c-13.576203 0-24.711821 11.085476-24.711821 24.662703l0 554.949184c0 13.576203 11.136641 24.662703 24.711821 24.662703l795.015795 0c13.577227 0 24.547069-11.086499 24.547069-24.662703l0-554.949184c0-13.577227-10.970866-24.662703-24.547069-24.662703L103.816972 255.593236 103.816972 255.593236zM664.346245 251.774257c-11.161201 0-20.332071-9.080819-20.332071-20.332071l0-101.278661c0-13.576203-11.047614-24.623817-24.699542-24.623817L383.181611 105.539708c-13.576203 0-24.712845 11.04659-24.712845 24.623817l0 101.278661c0 11.252275-9.041934 20.332071-20.332071 20.332071-11.20111 0-20.319791-9.080819-20.319791-20.332071l0-101.278661c0-35.989679 29.323862-65.275679 65.364707-65.275679l236.133022 0c36.06745 0 65.402569 29.284977 65.402569 65.275679l0 101.278661C684.717202 242.694461 675.636383 251.774257 664.346245 251.774257L664.346245 251.774257zM413.233044 521.725502 75.694471 521.725502c-11.163247 0-20.333094-9.117658-20.333094-20.35663 0-11.252275 9.169847-20.332071 20.333094-20.332071l337.538573 0c11.277858 0 20.319791 9.080819 20.319791 20.332071C433.552835 512.607844 424.510902 521.725502 413.233044 521.725502L413.233044 521.725502zM912.894018 521.725502 575.367725 521.725502c-11.213389 0-20.332071-9.117658-20.332071-20.35663 0-11.252275 9.118682-20.332071 20.332071-20.332071l337.526293 0c11.290137 0 20.332071 9.080819 20.332071 20.332071C933.226089 512.607844 924.184155 521.725502 912.894018 521.725502L912.894018 521.725502zM557.56322 634.217552 445.085496 634.217552c-11.213389 0-20.332071-9.079796-20.332071-20.331048l0-168.763658c0-11.251252 9.118682-20.332071 20.332071-20.332071l112.478747 0c11.290137 0 20.370956 9.080819 20.370956 20.332071l0 168.763658C577.934177 625.137757 568.853357 634.217552 557.56322 634.217552L557.56322 634.217552zM465.417567 593.514525l71.827909 0L537.245476 465.454918l-71.827909 0L465.417567 593.514525 465.417567 593.514525z" p-id="1685"></path></svg>
@@ -1,273 +1,277 @@
- /**
+ /**
- * 通用css样式布局处理
+ * 通用css样式布局处理
- * Copyright (c) 2019 ruoyi
+ * Copyright (c) 2019 ruoyi
- */
+ */
-
+
- /** 基础通用 **/
+ /** 基础通用 **/
-.pt5 {
+.pt5 {
-	padding-top: 5px;
+	padding-top: 5px;
-}
+}
-.pr5 {
+.pr5 {
-	padding-right: 5px;
+	padding-right: 5px;
-}
+}
-.pb5 {
+.pb5 {
-	padding-bottom: 5px;
+	padding-bottom: 5px;
-}
+}
-.mt5 {
+.mt5 {
-	margin-top: 5px;
+	margin-top: 5px;
-}
+}
-.mr5 {
+.mr5 {
-	margin-right: 5px;
+	margin-right: 5px;
-}
+}
-.mb5 {
+.mb5 {
-	margin-bottom: 5px;
+	margin-bottom: 5px;
-}
+}
-.mb8 {
+.mb8 {
-	margin-bottom: 8px;
+	margin-bottom: 8px;
-}
+}
-.ml5 {
+.ml5 {
-	margin-left: 5px;
+	margin-left: 5px;
-}
+}
-.mt10 {
+.mt10 {
-	margin-top: 10px;
+	margin-top: 10px;
-}
+}
-.mr10 {
+.mr10 {
-	margin-right: 10px;
+	margin-right: 10px;
-}
+}
-.mb10 {
+.mb10 {
-	margin-bottom: 10px;
+	margin-bottom: 10px;
-}
+}
-.ml10 {
+.ml10 {
-	margin-left: 10px;
+	margin-left: 10px;
-}
+}
-.mt20 {
+.mt20 {
-	margin-top: 20px;
+	margin-top: 20px;
-}
+}
-.mr20 {
+.mr20 {
-	margin-right: 20px;
+	margin-right: 20px;
-}
+}
-.mb20 {
+.mb20 {
-	margin-bottom: 20px;
+	margin-bottom: 20px;
-}
+}
-.ml20 {
+.ml20 {
-	margin-left: 20px;
+	margin-left: 20px;
-}
+}
-
+
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-	font-family: inherit;
+	font-family: inherit;
-	font-weight: 500;
+	font-weight: 500;
-	line-height: 1.1;
+	line-height: 1.1;
-	color: inherit;
+	color: inherit;
-}
+}
-
+
-.el-dialog:not(.is-fullscreen) {
+.el-message-box__status + .el-message-box__message{
-	margin-top: 6vh !important;
+    word-break: break-word;
-}
+}
-
+
-.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+.el-dialog:not(.is-fullscreen) {
-    overflow: auto;
+	margin-top: 6vh !important;
-	overflow-x: hidden;
+}
-	max-height: 70vh;
+
-	padding: 10px 20px 0;
+.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
-}
+    overflow: auto;
-
+	overflow-x: hidden;
-.el-table {
+	max-height: 70vh;
-	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
+	padding: 10px 20px 0;
-		th {
+}
-			word-break: break-word;
+
-			background-color: #f8f8f9;
+.el-table {
-			color: #515a6e;
+	.el-table__header-wrapper, .el-table__fixed-header-wrapper {
-			height: 40px;
+		th {
-			font-size: 13px;
+			word-break: break-word;
-		}
+			background-color: #f8f8f9;
-	}
+			color: #515a6e;
-	.el-table__body-wrapper {
+			height: 40px;
-		.el-button [class*="el-icon-"] + span {
+			font-size: 13px;
-			margin-left: 1px;
+		}
-		}
+	}
-	}
+	.el-table__body-wrapper {
-}
+		.el-button [class*="el-icon-"] + span {
-
+			margin-left: 1px;
-/** 表单布局 **/
+		}
-.form-header {
+	}
-    font-size:15px;
+}
-	color:#6379bb;
+
-	border-bottom:1px solid #ddd;
+/** 表单布局 **/
-	margin:8px 10px 25px 10px;
+.form-header {
-	padding-bottom:5px
+    font-size:15px;
-}
+	color:#6379bb;
-
+	border-bottom:1px solid #ddd;
-/** 表格布局 **/
+	margin:8px 10px 25px 10px;
-.pagination-container {
+	padding-bottom:5px
-	position: relative;
+}
-	height: 25px;
+
-	margin-bottom: 10px;
+/** 表格布局 **/
-	margin-top: 15px;
+.pagination-container {
-	padding: 10px 20px !important;
+	position: relative;
-}
+	height: 25px;
-
+	margin-bottom: 10px;
-/* tree border */
+	margin-top: 15px;
-.tree-border {
+	padding: 10px 20px !important;
-    margin-top: 5px;
+}
-    border: 1px solid #e5e6e7;
+
-    background: #FFFFFF none;
+/* tree border */
-    border-radius:4px;
+.tree-border {
-}
+    margin-top: 5px;
-
+    border: 1px solid #e5e6e7;
-.pagination-container .el-pagination {
+    background: #FFFFFF none;
-	right: 0;
+    border-radius:4px;
-	position: absolute;
+}
-}
+
-
+.pagination-container .el-pagination {
-@media ( max-width : 768px) {
+	right: 0;
-  .pagination-container .el-pagination > .el-pagination__jump {
+	position: absolute;
-    display: none !important;
+}
-  }
+
-  .pagination-container .el-pagination > .el-pagination__sizes {
+@media ( max-width : 768px) {
-    display: none !important;
+  .pagination-container .el-pagination > .el-pagination__jump {
-  }
+    display: none !important;
-}
+  }
-
+  .pagination-container .el-pagination > .el-pagination__sizes {
-.el-table .fixed-width .el-button--mini {
+    display: none !important;
-	padding-left: 0;
+  }
-	padding-right: 0;
+}
-	width: inherit;
+
-}
+.el-table .fixed-width .el-button--mini {
-
+	padding-left: 0;
-/** 表格更多操作下拉样式 */
+	padding-right: 0;
-.el-table .el-dropdown-link {
+	width: inherit;
-	cursor: pointer;
+}
-	color: #409EFF;
+
-	margin-left: 5px;
+/** 表格更多操作下拉样式 */
-}
+.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {
-
+	cursor: pointer;
-.el-table .el-dropdown, .el-icon-arrow-down {
+	margin-left: 5px;
-	font-size: 12px;
+}
-}
+
-
+.el-table .el-dropdown, .el-icon-arrow-down {
-.el-tree-node__content > .el-checkbox {
+	font-size: 12px;
-	margin-right: 8px;
+}
-}
+
-
+.el-tree-node__content > .el-checkbox {
-.list-group-striped > .list-group-item {
+	margin-right: 8px;
-	border-left: 0;
+}
-	border-right: 0;
+
-	border-radius: 0;
+.list-group-striped > .list-group-item {
-	padding-left: 0;
+	border-left: 0;
-	padding-right: 0;
+	border-right: 0;
-}
+	border-radius: 0;
-
+	padding-left: 0;
-.list-group {
+	padding-right: 0;
-	padding-left: 0px;
+}
-	list-style: none;
+
-}
+.list-group {
-
+	padding-left: 0px;
-.list-group-item {
+	list-style: none;
-	border-bottom: 1px solid #e7eaec;
+}
-	border-top: 1px solid #e7eaec;
+
-	margin-bottom: -1px;
+.list-group-item {
-	padding: 11px 0px;
+	border-bottom: 1px solid #e7eaec;
-	font-size: 13px;
+	border-top: 1px solid #e7eaec;
-}
+	margin-bottom: -1px;
-
+	padding: 11px 0px;
-.pull-right {
+	font-size: 13px;
-	float: right !important;
+}
-}
+
-
+.pull-right {
-.el-card__header {
+	float: right !important;
-	padding: 14px 15px 7px;
+}
-	min-height: 40px;
+
-}
+.el-card__header {
-
+	padding: 14px 15px 7px;
-.el-card__body {
+	min-height: 40px;
-	padding: 15px 20px 20px 20px;
+}
-}
+
-
+.el-card__body {
-.card-box {
+	padding: 15px 20px 20px 20px;
-	padding-right: 15px;
+}
-	padding-left: 15px;
+
-	margin-bottom: 10px;
+.card-box {
-}
+	padding-right: 15px;
-
+	padding-left: 15px;
-/* button color */
+	margin-bottom: 10px;
-.el-button--cyan.is-active,
+}
-.el-button--cyan:active {
+
-  background: #20B2AA;
+/* button color */
-  border-color: #20B2AA;
+.el-button--cyan.is-active,
-  color: #FFFFFF;
+.el-button--cyan:active {
-}
+  background: #20B2AA;
-
+  border-color: #20B2AA;
-.el-button--cyan:focus,
+  color: #FFFFFF;
-.el-button--cyan:hover {
+}
-  background: #48D1CC;
+
-  border-color: #48D1CC;
+.el-button--cyan:focus,
-  color: #FFFFFF;
+.el-button--cyan:hover {
-}
+  background: #48D1CC;
-
+  border-color: #48D1CC;
-.el-button--cyan {
+  color: #FFFFFF;
-  background-color: #20B2AA;
+}
-  border-color: #20B2AA;
+
-  color: #FFFFFF;
+.el-button--cyan {
-}
+  background-color: #20B2AA;
-
+  border-color: #20B2AA;
-/* text color */
+  color: #FFFFFF;
-.text-navy {
+}
-	color: #1ab394;
+
-}
+/* text color */
-
+.text-navy {
-.text-primary {
+	color: #1ab394;
-	color: inherit;
+}
-}
+
-
+.text-primary {
-.text-success {
+	color: inherit;
-	color: #1c84c6;
+}
-}
+
-
+.text-success {
-.text-info {
+	color: #1c84c6;
-	color: #23c6c8;
+}
-}
+
-
+.text-info {
-.text-warning {
+	color: #23c6c8;
-	color: #f8ac59;
+}
-}
+
-
+.text-warning {
-.text-danger {
+	color: #f8ac59;
-	color: #ed5565;
+}
-}
+
-
+.text-danger {
-.text-muted {
+	color: #ed5565;
-	color: #888888;
+}
-}
+
-
+.text-muted {
-/* image */
+	color: #888888;
-.img-circle {
+}
-	border-radius: 50%;
+
-}
+/* image */
-
+.img-circle {
-.img-lg {
+	border-radius: 50%;
-	width: 120px;
+}
-	height: 120px;
+
-}
+.img-lg {
-
+	width: 120px;
-.avatar-upload-preview {
+	height: 120px;
-	position: absolute;
+}
-	top: 50%;
+
-	transform: translate(50%, -50%);
+.avatar-upload-preview {
-	width: 200px;
+	position: relative;
-	height: 200px;
+	top: 50%;
-	border-radius: 50%;
+	left: 50%;
-	box-shadow: 0 0 4px #ccc;
+	transform: translate(-50%, -50%);
-	overflow: hidden;
+	width: 200px;
-}
+	height: 200px;
-
+	border-radius: 50%;
-/* 拖拽列样式 */
+	box-shadow: 0 0 4px #ccc;
-.sortable-ghost{
+	overflow: hidden;
-	opacity: .8;
+}
-	color: #fff!important;
+
-	background: #42b983!important;
+/* 拖拽列样式 */
-}
+.sortable-ghost{
-
+	opacity: .8;
-.top-right-btn {
+	color: #fff!important;
-	position: relative;
+	background: #42b983!important;
-	float: right;
+}
-}
+
 .top-right-btn {
 	position: relative;
 	float: right;
 }
@@ -73,7 +73,7 @@ export default {
      number: 0,
      uploadList: [],
      baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
      headers: {
        Authorization: "Bearer " + getToken(),
      },
@@ -115,15 +115,9 @@ export default {
    handleBeforeUpload(file) {
      // 校检文件类型
      if (this.fileType) {
-        let fileExtension = "";
+        const fileName = file.name.split('.');
-        if (file.name.lastIndexOf(".") > -1) {
+        const fileExt = fileName[fileName.length - 1];
-          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
        }
        const isTypeOk = this.fileType.some((type) => {
          if (file.type.indexOf(type) > -1) return true;
          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
          return false;
        });
        if (!isTypeOk) {
          this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
          return false;
@@ -147,7 +141,7 @@ export default {
    },
    // 上传失败
    handleUploadError(err) {
-      this.$modal.msgError("上传图片失败，请重试");
+      this.$modal.msgError("上传文件失败，请重试");
      this.$modal.closeLoading()
    },
    // 上传成功回调
@@ -90,7 +90,6 @@ export default {
        threshold: 0.4,
        location: 0,
        distance: 100,
        maxPatternLength: 32,
        minMatchCharLength: 1,
        keys: [{
          name: 'title',
@@ -39,7 +39,6 @@ export default {
    }
  },
  mounted() {
    this.insertToBody()
    this.addEventClick()
  },
  beforeDestroy() {
@@ -56,11 +55,6 @@ export default {
        this.show = false
        window.removeEventListener('click', this.closeSidebar)
      }
    },
    insertToBody() {
      const elx = this.$refs.rightPanel
      const body = document.querySelector('body')
      body.insertBefore(elx, body.firstChild)
    }
  }
 }
@@ -92,7 +92,9 @@ export default {
      if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
        const tmpPath = path.substring(1, path.length);
        activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
-        this.$store.dispatch('app/toggleSideBarHide', false);
+        if (!this.$route.meta.link) {
          this.$store.dispatch('app/toggleSideBarHide', false);
        }
      } else if(!this.$route.children) {
        activePath = path;
        this.$store.dispatch('app/toggleSideBarHide', true);
@@ -145,6 +147,8 @@ export default {
      }
      if(routes.length > 0) {
        this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
      } else {
        this.$store.dispatch('app/toggleSideBarHide', true);
      }
    },
    ishttp(url) {
@@ -9,7 +9,7 @@ const baseURL = process.env.VUE_APP_BASE_API
 export default {
  name(name, isDelete = true) {
-    var url = baseURL + "/common/download?fileName=" + encodeURI(name) + "&delete=" + isDelete
+    var url = baseURL + "/common/download?fileName=" + encodeURIComponent(name) + "&delete=" + isDelete
    axios({
      method: 'get',
      url: url,
@@ -19,14 +19,14 @@ export default {
      const isLogin = await blobValidate(res.data);
      if (isLogin) {
        const blob = new Blob([res.data])
-        this.saveAs(blob, decodeURI(res.headers['download-filename']))
+        this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
      } else {
        this.printErrMsg(res.data);
      }
    })
  },
  resource(resource) {
-    var url = baseURL + "/common/download/resource?resource=" + encodeURI(resource);
+    var url = baseURL + "/common/download/resource?resource=" + encodeURIComponent(resource);
    axios({
      method: 'get',
      url: url,
@@ -36,7 +36,7 @@ export default {
      const isLogin = await blobValidate(res.data);
      if (isLogin) {
        const blob = new Blob([res.data])
-        this.saveAs(blob, decodeURI(res.headers['download-filename']))
+        this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
      } else {
        this.printErrMsg(res.data);
      }
@@ -141,7 +141,7 @@ export const dynamicRoutes = [
    permissions: ['monitor:job:list'],
    children: [
      {
-        path: 'index',
+        path: 'index/:jobId(\\d+)',
        component: () => import('@/views/monitor/job/log'),
        name: 'JobLog',
        meta: { title: '调度日志', activeMenu: '/monitor/job' }
@@ -78,31 +78,24 @@ service.interceptors.response.use(res => {
    if (code === 401) {
      if (!isRelogin.show) {
        isRelogin.show = true;
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
+        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
-          confirmButtonText: '重新登录',
+          isRelogin.show = false;
-          cancelButtonText: '取消',
+          store.dispatch('LogOut').then(() => {
-          type: 'warning'
+            location.href = '/index';
-        }
+          })
      ).then(() => {
        isRelogin.show = false;
        store.dispatch('LogOut').then(() => {
          location.href = '/index';
        })
      }).catch(() => {
        isRelogin.show = false;
      });
    }
      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
    } else if (code === 500) {
-      Message({
+      Message({ message: msg, type: 'error' })
        message: msg,
        type: 'error'
      })
      return Promise.reject(new Error(msg))
    } else if (code === 601) {
      Message({ message: msg, type: 'warning' })
      return Promise.reject('error')
    } else if (code !== 200) {
-      Notification.error({
+      Notification.error({ title: msg })
        title: msg
      })
      return Promise.reject('error')
    } else {
      return res.data
@@ -113,18 +106,12 @@ service.interceptors.response.use(res => {
    let { message } = error;
    if (message == "Network Error") {
      message = "后端接口连接异常";
-    }
+    } else if (message.includes("timeout")) {
    else if (message.includes("timeout")) {
      message = "系统接口请求超时";
-    }
+    } else if (message.includes("Request failed with status code")) {
    else if (message.includes("Request failed with status code")) {
      message = "系统接口" + message.substr(message.length - 3) + "异常";
    }
-    Message({
+    Message({ message: message, type: 'error', duration: 5 * 1000 })
      message: message,
      type: 'error',
      duration: 5 * 1000
    })
    return Promise.reject(error)
  }
 )
@@ -86,11 +86,14 @@ export function selectDictLabel(datas, value) {
  return actions.join('');
 }
-// 回显数据字典（字符串数组）
+// 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined) {
+  if (value === undefined || value.length ===0) {
    return "";
  }
  if (Array.isArray(value)) {
    value = value.join(",");
  }
  var actions = [];
  var currentSeparator = undefined === separator ? "," : separator;
  var temp = value.split(currentSeparator);
@@ -3,7 +3,7 @@
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts';
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
@@ -3,7 +3,7 @@
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts';
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
@@ -3,7 +3,7 @@
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts';
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
@@ -3,7 +3,7 @@
 </template>
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts';
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
@@ -121,8 +121,8 @@
              <i class="el-icon-user-solid"></i> QQ群：<s>满937441</s> <s>满887144332</s>
              <s>满180251782</s> <s>满104180207</s> <s>满186866453</s> <s>满201396349</s>
              <s>满101456076</s> <s>满101539465</s> <s>满264312783</s> <s>满167385320</s> 
-              <s>满104748341</s> <a href="https://jq.qq.com/?_wv=1027&k=0fsNiYZt" target="_blank">
+              <s>满104748341</s> <s>满160110482</s> <a href="https://jq.qq.com/?_wv=1027&k=Xnbinl0U" target="_blank">
-                160110482</a
+                170801498</a
              >
            </p>
            <p>
@@ -147,6 +147,44 @@
            <span>更新日志</span>
          </div>
          <el-collapse accordion>
            <el-collapse-item title="v3.8.5 - 2023-01-01">
              <ol>
                <li>定时任务违规的字符</li>
                <li>重置时取消部门选中</li>
                <li>新增返回警告消息提示</li>
                <li>忽略不必要的属性数据返回</li>
                <li>修改参数键名时移除前缓存配置</li>
                <li>导入更新用户数据前校验数据权限</li>
                <li>兼容Excel下拉框内容过多无法显示的问题</li>
                <li>升级echarts到最新版本5.4.0</li>
                <li>升级core-js到最新版本3.25.3</li>
                <li>升级oshi到最新版本6.4.0</li>
                <li>升级kaptcha到最新版2.3.3</li>
                <li>升级druid到最新版本1.2.15</li>
                <li>升级fastjson到最新版2.0.20</li>
                <li>升级pagehelper到最新版1.4.6</li>
                <li>优化弹窗内容过多展示不全问题</li>
                <li>优化swagger-ui静态资源使用缓存</li>
                <li>开启TopNav没有子菜单隐藏侧边栏</li>
                <li>删除fuse无效选项maxPatternLength</li>
                <li>优化导出对象的子列表为空会出现[]问题</li>
                <li>优化编辑头像时透明部分会变成黑色问题</li>
                <li>优化小屏幕上修改头像界面布局错位的问题</li>
                <li>修复代码生成勾选属性无效问题</li>
                <li>修复文件上传组件格式验证问题</li>
                <li>修复回显数据字典数组异常问题</li>
                <li>修复sheet超出最大行数异常问题</li>
                <li>修复Log注解GET请求记录不到参数问题</li>
                <li>修复调度日志点击多次数据不变化的问题</li>
                <li>修复主题颜色在Drawer组件不会加载问题</li>
                <li>修复文件名包含特殊字符的文件无法下载问题</li>
                <li>修复table中更多按钮切换主题色未生效修复问题</li>
                <li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
                <li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
                <li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
                <li>其他细节优化</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v3.8.4 - 2022-09-26">
              <ol>
                <li>数据逻辑删除不进行唯一验证</li>
@@ -871,14 +909,14 @@ export default {
  data() {
    return {
      // 版本号
-      version: "3.8.4",
+      version: "3.8.5"
    };
  },
  methods: {
    goTarget(href) {
      window.open(href, "_blank");
-    },
+    }
-  },
+  }
 };
 </script>
@@ -68,7 +68,7 @@
 <script>
 import { getCache } from "@/api/monitor/cache";
-import echarts from "echarts";
+import * as echarts from "echarts";
 export default {
  name: "Cache",
@@ -129,9 +129,7 @@
            v-hasPermi="['monitor:job:remove']"
          >删除</el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
-            <span class="el-dropdown-link">
+            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
                v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
@@ -456,7 +454,7 @@ export default {
    /** 任务日志列表查询 */
    handleJobLog(row) {
      const jobId = row.jobId || 0;
-      this.$router.push({ path: '/monitor/job-log/index', query: { jobId: jobId } })
+      this.$router.push('/monitor/job-log/index/' + jobId)
    },
    /** 新增按钮操作 */
    handleAdd() {
@@ -217,7 +217,7 @@ export default {
    };
  },
  created() {
-    const jobId = this.$route.query.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;
@@ -135,9 +135,7 @@
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
-            <span class="el-dropdown-link">
+            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
@@ -20,6 +20,7 @@
            :expand-on-click-node="false"
            :filter-node-method="filterNode"
            ref="tree"
            node-key="id"
            default-expand-all
            highlight-current
            @node-click="handleNodeClick"
@@ -179,9 +180,7 @@
                v-hasPermi="['system:user:remove']"
              >删除</el-button>
              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <span class="el-dropdown-link">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
                </span>
                <el-dropdown-menu slot="dropdown">
                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
@@ -536,6 +535,8 @@ export default {
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.queryParams.deptId = undefined;
      this.$refs.tree.setCurrentKey(null);
      this.handleQuery();
    },
    // 多选框选中数据
@@ -576,8 +577,8 @@ export default {
        this.form = response.data;
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
-        this.form.postIds = response.postIds;
+        this.$set(this.form, "postIds", response.postIds);
-        this.form.roleIds = response.roleIds;
+        this.$set(this.form, "roleIds", response.roleIds);
        this.open = true;
        this.title = "修改用户";
        this.form.password = "";
@@ -1,172 +1,187 @@
-<template>
+<template>
-  <div>
+  <div>
-    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
-      <el-row>
+      <el-row>
-        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
-          <vue-cropper
+          <vue-cropper
-            ref="cropper"
+            ref="cropper"
-            :img="options.img"
+            :img="options.img"
-            :info="true"
+            :info="true"
-            :autoCrop="options.autoCrop"
+            :autoCrop="options.autoCrop"
-            :autoCropWidth="options.autoCropWidth"
+            :autoCropWidth="options.autoCropWidth"
-            :autoCropHeight="options.autoCropHeight"
+            :autoCropHeight="options.autoCropHeight"
-            :fixedBox="options.fixedBox"
+            :fixedBox="options.fixedBox"
-            @realTime="realTime"
+            :outputType="options.outputType"
-            v-if="visible"
+            @realTime="realTime"
-          />
+            v-if="visible"
-        </el-col>
+          />
-        <el-col :xs="24" :md="12" :style="{height: '350px'}">
+        </el-col>
-          <div class="avatar-upload-preview">
+        <el-col :xs="24" :md="12" :style="{height: '350px'}">
-            <img :src="previews.url" :style="previews.img" />
+          <div class="avatar-upload-preview">
-          </div>
+            <img :src="previews.url" :style="previews.img" />
-        </el-col>
+          </div>
-      </el-row>
+        </el-col>
-      <br />
+      </el-row>
-      <el-row>
+      <br />
-        <el-col :lg="2" :md="2">
+      <el-row>
-          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+        <el-col :lg="2" :sm="3" :xs="3">
-            <el-button size="small">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
-              选择
+            <el-button size="small">
-              <i class="el-icon-upload el-icon--right"></i>
+              选择
-            </el-button>
+              <i class="el-icon-upload el-icon--right"></i>
-          </el-upload>
+            </el-button>
-        </el-col>
+          </el-upload>
-        <el-col :lg="{span: 1, offset: 2}" :md="2">
+        </el-col>
-          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
+        <el-col :lg="{span: 1, offset: 2}" :sm="2" :xs="2">
-        </el-col>
+          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)"></el-button>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
+        </el-col>
-          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
-        </el-col>
+          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)"></el-button>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
+        </el-col>
-          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
-        </el-col>
+          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()"></el-button>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
+        </el-col>
-          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
+        <el-col :lg="{span: 1, offset: 1}" :sm="2" :xs="2">
-        </el-col>
+          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
-        <el-col :lg="{span: 2, offset: 6}" :md="2">
+        </el-col>
-          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
+        <el-col :lg="{span: 2, offset: 6}" :sm="2" :xs="2">
-        </el-col>
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
-      </el-row>
+        </el-col>
-    </el-dialog>
+      </el-row>
-  </div>
+    </el-dialog>
-</template>
+  </div>
-
+</template>
-<script>
+
-import store from "@/store";
+<script>
-import { VueCropper } from "vue-cropper";
+import store from "@/store";
-import { uploadAvatar } from "@/api/system/user";
+import { VueCropper } from "vue-cropper";
-
+import { uploadAvatar } from "@/api/system/user";
-export default {
+import { debounce } from '@/utils'
-  components: { VueCropper },
+
-  props: {
+export default {
-    user: {
+  components: { VueCropper },
-      type: Object
+  props: {
-    }
+    user: {
-  },
+      type: Object
-  data() {
+    }
-    return {
+  },
-      // 是否显示弹出层
+  data() {
-      open: false,
+    return {
-      // 是否显示cropper
+      // 是否显示弹出层
-      visible: false,
+      open: false,
-      // 弹出层标题
+      // 是否显示cropper
-      title: "修改头像",
+      visible: false,
-      options: {
+      // 弹出层标题
-        img: store.getters.avatar, //裁剪图片的地址
+      title: "修改头像",
-        autoCrop: true, // 是否默认生成截图框
+      options: {
-        autoCropWidth: 200, // 默认生成截图框宽度
+        img: store.getters.avatar, //裁剪图片的地址
-        autoCropHeight: 200, // 默认生成截图框高度
+        autoCrop: true, // 是否默认生成截图框
-        fixedBox: true // 固定截图框大小 不允许改变
+        autoCropWidth: 200, // 默认生成截图框宽度
-      },
+        autoCropHeight: 200, // 默认生成截图框高度
-      previews: {}
+        fixedBox: true, // 固定截图框大小 不允许改变
-    };
+        outputType:"png" // 默认生成截图为PNG格式
-  },
+      },
-  methods: {
+      previews: {},
-    // 编辑头像
+      resizeHandler: null
-    editCropper() {
+    };
-      this.open = true;
+  },
-    },
+  methods: {
-    // 打开弹出层结束时的回调
+    // 编辑头像
-    modalOpened() {
+    editCropper() {
-      this.visible = true;
+      this.open = true;
-    },
+    },
-    // 覆盖默认的上传行为
+    // 打开弹出层结束时的回调
-    requestUpload() {
+    modalOpened() {
-    },
+      this.visible = true;
-    // 向左旋转
+      if (!this.resizeHandler) {
-    rotateLeft() {
+        this.resizeHandler = debounce(() => {
-      this.$refs.cropper.rotateLeft();
+          this.refresh()
-    },
+        }, 100)
-    // 向右旋转
+      }
-    rotateRight() {
+      window.addEventListener("resize", this.resizeHandler)
-      this.$refs.cropper.rotateRight();
+    },
-    },
+    // 刷新组件
-    // 图片缩放
+    refresh() {
-    changeScale(num) {
+      this.$refs.cropper.refresh();
-      num = num || 1;
+    },
-      this.$refs.cropper.changeScale(num);
+    // 覆盖默认的上传行为
-    },
+    requestUpload() {
-    // 上传预处理
+    },
-    beforeUpload(file) {
+    // 向左旋转
-      if (file.type.indexOf("image/") == -1) {
+    rotateLeft() {
-        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
+      this.$refs.cropper.rotateLeft();
-      } else {
+    },
-        const reader = new FileReader();
+    // 向右旋转
-        reader.readAsDataURL(file);
+    rotateRight() {
-        reader.onload = () => {
+      this.$refs.cropper.rotateRight();
-          this.options.img = reader.result;
+    },
-        };
+    // 图片缩放
-      }
+    changeScale(num) {
-    },
+      num = num || 1;
-    // 上传图片
+      this.$refs.cropper.changeScale(num);
-    uploadImg() {
+    },
-      this.$refs.cropper.getCropBlob(data => {
+    // 上传预处理
-        let formData = new FormData();
+    beforeUpload(file) {
-        formData.append("avatarfile", data);
+      if (file.type.indexOf("image/") == -1) {
-        uploadAvatar(formData).then(response => {
+        this.$modal.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");
-          this.open = false;
+      } else {
-          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+        const reader = new FileReader();
-          store.commit('SET_AVATAR', this.options.img);
+        reader.readAsDataURL(file);
-          this.$modal.msgSuccess("修改成功");
+        reader.onload = () => {
-          this.visible = false;
+          this.options.img = reader.result;
-        });
+        };
-      });
+      }
-    },
+    },
-    // 实时预览
+    // 上传图片
-    realTime(data) {
+    uploadImg() {
-      this.previews = data;
+      this.$refs.cropper.getCropBlob(data => {
-    },
+        let formData = new FormData();
-    // 关闭窗口
+        formData.append("avatarfile", data);
-    closeDialog() {
+        uploadAvatar(formData).then(response => {
-      this.options.img = store.getters.avatar
+          this.open = false;
-      this.visible = false;
+          this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
-    }
+          store.commit('SET_AVATAR', this.options.img);
-  }
+          this.$modal.msgSuccess("修改成功");
-};
+          this.visible = false;
-</script>
+        });
-<style scoped lang="scss">
+      });
-.user-info-head {
+    },
-  position: relative;
+    // 实时预览
-  display: inline-block;
+    realTime(data) {
-  height: 120px;
+      this.previews = data;
-}
+    },
-
+    // 关闭窗口
-.user-info-head:hover:after {
+    closeDialog() {
-  content: '+';
+      this.options.img = store.getters.avatar
-  position: absolute;
+      this.visible = false;
-  left: 0;
+      window.removeEventListener("resize", this.resizeHandler)
-  right: 0;
+    }
-  top: 0;
+  }
-  bottom: 0;
+};
-  color: #eee;
+</script>
-  background: rgba(0, 0, 0, 0.5);
+<style scoped lang="scss">
-  font-size: 24px;
+.user-info-head {
-  font-style: normal;
+  position: relative;
-  -webkit-font-smoothing: antialiased;
+  display: inline-block;
-  -moz-osx-font-smoothing: grayscale;
+  height: 120px;
-  cursor: pointer;
+}
-  line-height: 110px;
+
-  border-radius: 50%;
+.user-info-head:hover:after {
-}
+  content: '+';
-</style>
+  position: absolute;
  left: 0;
  right: 0;
  top: 0;
  bottom: 0;
  color: #eee;
  background: rgba(0, 0, 0, 0.5);
  font-size: 24px;
  font-style: normal;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  cursor: pointer;
  line-height: 110px;
  border-radius: 50%;
 }
 </style>
@@ -45,22 +45,22 @@
          <el-table-column label="插入" min-width="5%">
            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert"></el-checkbox>
            </template>
          </el-table-column>
          <el-table-column label="编辑" min-width="5%">
            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit"></el-checkbox>
            </template>
          </el-table-column>
          <el-table-column label="列表" min-width="5%">
            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isList"></el-checkbox>
            </template>
          </el-table-column>
          <el-table-column label="查询" min-width="5%">
            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
            </template>
          </el-table-column>
          <el-table-column label="查询方式" min-width="10%">
@@ -79,7 +79,7 @@
          </el-table-column>
          <el-table-column label="必填" min-width="5%">
            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
            </template>
          </el-table-column>
          <el-table-column label="显示类型" min-width="12%">
@@ -267,7 +267,7 @@ export default {
          this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
        });
      } else {
-        this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
+        this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip");
      }
    },
    /** 同步数据库操作 */
Author	SHA1	Message	Date
RuoYi	c3a727b2fd	若依 3.8.5	2023-01-01 09:09:25 +08:00
RuoYi	19eaad0129	v3最新版本不需要render-after-expand	2022-12-23 16:08:23 +08:00
RuoYi	565cbb8c7a	升级pagehelper到最新版1.4.6	2022-12-13 19:42:39 +08:00
RuoYi	b2cf949956	修改参数键名时移除前缓存配置	2022-12-13 19:40:48 +08:00
RuoYi	3fec133c69	升级oshi到最新版本6.4.0	2022-12-13 19:39:36 +08:00
RuoYi	c9de6fcd82	优化代码	2022-12-13 19:39:19 +08:00
RuoYi	22ee2c2e94	删除fuse无效选项maxPatternLength	2022-12-08 10:21:48 +08:00
RuoYi	f11db02ff8	修复代码生成图片/文件/单选时选择必填无法校验问题(I64IO2)	2022-12-08 10:19:38 +08:00
RuoYi	d5f5c5d066	升级fastjson到最新版2.0.20	2022-12-08 10:13:39 +08:00
RuoYi	4536906b21	修复Vue3树形下拉不能默认选中(I64ESN)	2022-12-07 20:24:08 +08:00
RuoYi	9748e10339	升级druid到最新版本1.2.15	2022-12-07 11:41:44 +08:00
RuoYi	b08a6ce3f6	升级kaptcha到最新版2.3.3	2022-12-07 10:45:50 +08:00
RuoYi	3039b745a9	升级echarts到最新版本5.4.0	2022-12-07 10:12:15 +08:00
RuoYi	39298d803c	添加新群号：170801498	2022-12-03 12:50:26 +08:00
RuoYi	09bb3e15c6	定时任务违规的字符	2022-12-03 12:48:51 +08:00
RuoYi	3b8a68c4cf	升级oshi到最新版本6.3.2	2022-12-03 12:43:37 +08:00
RuoYi	9aae863ce3	优化弹窗内容过多展示不全问题(I645RU)	2022-12-03 12:42:50 +08:00
若依	963247df43	!627 update ruoyi-ui/src/plugins/download.js. Merge pull request !627 from Zeno/N/A	2022-12-01 08:21:29 +00:00
Zeno	7d874e31cf	update ruoyi-ui/src/plugins/download.js. 修复文件名包含特殊字符（+、-、*...）的文件无法下载问题 Signed-off-by: Zeno <15270656234@163.com>	2022-11-28 10:29:38 +00:00
RuoYi	1bb6342bcb	修复Log注解GET请求记录不到参数问题	2022-11-22 10:41:40 +08:00
RuoYi	27acbe5b73	修复某些特性的环境生成代码变乱码TXT文件问题	2022-11-22 09:23:17 +08:00
RuoYi	6474a17100	消除Vue3控制台出现的警告信息	2022-11-21 19:10:25 +08:00
RuoYi	142f6ad6a0	兼容Excel下拉框内容过多无法显示的问题(I5XB6I)	2022-11-21 12:20:36 +08:00
RuoYi	b4bdd4f306	开启TopNav没有子菜单隐藏侧边栏	2022-11-17 14:27:30 +08:00
RuoYi	74ba681fee	修复回显数据字典数组异常问题(I60UYQ)	2022-11-15 14:11:52 +08:00
若依	8f2b3ac465	!611 修复调度日志点击多次数据不变化的问题 Merge pull request !611 from 也曾为你像超人/N/A	2022-11-15 06:09:02 +00:00
RuoYi	7eee3b9f02	升级druid到最新版本1.2.14	2022-11-14 11:17:04 +08:00
RuoYi	27e34c2f0a	忽略不必要的属性数据返回	2022-11-12 11:26:48 +08:00
RuoYi	836180fe0e	优化导出对象的子列表为空会出现[]问题	2022-11-11 11:31:27 +08:00
RuoYi	06fbda5324	修复sheet超出最大行数异常问题	2022-11-07 11:20:02 +08:00
若依	bf313b17da	!612 根据调度编号获取详细信息参数名改正 Merge pull request !612 from Rain/N/A	2022-10-31 05:51:48 +00:00
Rain	a8b9485a29	根据调度编号获取详细信息参数名改正 Signed-off-by: Rain <938448486@qq.com>	2022-10-31 05:51:08 +00:00
也曾为你像超人	101e15d83f	修复调度日志点击多次数据不变化的问题 Signed-off-by: 也曾为你像超人 <1553592282@qq.com>	2022-10-31 05:45:21 +00:00
RuoYi	ebb9f15a75	新增返回警告消息提示	2022-10-30 12:02:06 +08:00
RuoYi	cd137bd9fc	升级fastjson到最新版2.0.16	2022-10-30 09:58:12 +08:00
若依	07bde5f88a	!610 pagehelper-boot更新1.4.5 Merge pull request !610 from abbfun/N/A	2022-10-30 01:57:27 +00:00
abbfun	6fffa02acf	pagehelper-boot更新1.4.5 Signed-off-by: abbfun <819589789@qq.com>	2022-10-29 14:45:55 +00:00
RuoYi	dc48f9858b	修复table中更多按钮切换主题色未生效修复问题	2022-10-28 20:59:42 +08:00
RuoYi	a6b2ac5dcd	升级oshi到最新版本6.3.0	2022-10-28 19:57:35 +08:00
若依	c0685b7f7f	!608 编辑头像时生成为透明png图片 Merge pull request !608 from BlossomWave/N/A	2022-10-28 11:48:22 +00:00
若依	fb2d616c57	!609 优化代码 Merge pull request !609 from lihy2021/N/A	2022-10-28 11:44:27 +00:00
若依	6ff6853082	!606 重置时取消部门选中 Merge pull request !606 from 也曾为你像超人/N/A	2022-10-28 11:42:26 +00:00
若依	f8014ae969	!602 去除某些svg图标的fill="#bfbfbf"属性，避免菜单激活无法修改其填充颜色 Merge pull request !602 from 清溪先生/master	2022-10-28 11:39:13 +00:00
lihy2021	1de2b7a57e	优化代码	2022-10-27 01:25:39 +00:00
BlossomWave	f01aa37394	update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 默认修改头像时如果上传的图片为png透明图片，生成的头像透明部分会变成黑色，修改了生成头像为png格式。可正常显示图片透明部分。 Signed-off-by: BlossomWave <316975215@qq.com>	2022-10-24 08:25:33 +00:00
也曾为你、像超人	4517dea98d	重置时取消部门选中 Signed-off-by: 也曾为你、像超人 <1553592282@qq.com>	2022-10-21 23:24:35 +00:00
RuoYi	e21396870f	修正菜单状态注释信息	2022-10-21 11:56:15 +08:00
若依	b67f6a0fec	!604 修复小屏幕上修改头像界面布局错位的问题 Merge pull request !604 from 也曾为你、像超人/master	2022-10-21 03:50:16 +00:00
若依	42d8104505	!603 update ruoyi-ui/src/views/system/user/index.vue. Merge pull request !603 from kknd97/N/A	2022-10-21 03:46:49 +00:00
若依	f40a0eab23	!601 swagger-ui静态资源缓存 Merge pull request !601 from abbfun/N/A	2022-10-21 03:41:22 +00:00
刘元博	b6153d1aef	修正选择按钮宽度	2022-10-21 11:21:59 +08:00
若依	a2c585daa4	!605 升级fastjson到最新版2.0.15 Merge pull request !605 from Rain/N/A	2022-10-21 03:11:58 +00:00
Rain	5a60bf0b0a	升级fastjson到最新版2.0.15 Signed-off-by: Rain <938448486@qq.com>	2022-10-21 03:01:54 +00:00
刘元博	9dcddc7876	修复小屏幕上修改头像界面布局错位的问题	2022-10-20 19:18:10 +08:00
kknd97	b970185536	update ruoyi-ui/src/views/system/user/index.vue. handleUpdate(row)方法中：this.form = response.data;语句会导致【this.form.postIds = response.postIds;】和【this.form.roleIds = response.roleIds;】失效。导致用户编辑对话框中，角色和部门多选框无法正常修改。建议使用以下语句修改： this.$set(this.form, "postIds", response.postIds); this.$set(this.form, "roleIds", response.roleIds); Signed-off-by: kknd97 <liujingwei@ln.chinamobile.com>	2022-10-20 06:27:02 +00:00
清溪先生	a64a029323	去除某些svg图标的fill="#bfbfbf"属性，避免菜单激活无法修改其填充颜色。 Signed-off-by: 清溪先生 <usfree2021@163.com>	2022-10-19 22:11:14 +08:00
abbfun	78f4d1c85b	swagger-ui静态资源缓存 Signed-off-by: abbfun <819589789@qq.com>	2022-10-19 09:07:35 +00:00
RuoYi	bf83fe568b	修复主题颜色在Drawer组件不会加载问题(I5VCF0)	2022-10-19 10:54:01 +08:00
RuoYi	6505432bf4	修复文件上传组件格式验证问题(I5V32H)	2022-10-12 19:33:58 +08:00
RuoYi	a32a931d24	升级core-js到最新版本3.25.3	2022-10-10 09:22:47 +08:00
RuoYi	4d72fb4289	R isError and isSuccess static	2022-10-10 09:22:37 +08:00
若依	186c04d90a	!595 解决导出时包含空子列表数据异常的问题 Merge pull request !595 from 也曾为你、像超人/N/A	2022-10-10 01:20:41 +00:00
也曾为你、像超人	c542b7ac32	解决导出时包含空子列表数据异常的问题 Signed-off-by: 也曾为你、像超人 <1553592282@qq.com>	2022-09-30 23:06:10 +00:00
RuoYi	3607e008a3	优化限流打印日志KEY(I5SQ09)	2022-09-28 19:32:55 +08:00
RuoYi	5b8edbf381	修复代码生成勾选属性无效问题	2022-09-28 19:31:52 +08:00
RuoYi	03f7bc0f3f	导入更新用户数据前校验数据权限	2022-09-28 19:26:16 +08:00
		`@@ -1 +1 @@`
			<?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="1546567861908" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2422" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M318.577778 819.2L17.066667 512l301.511111-307.2 45.511111 45.511111L96.711111 512l267.377778 261.688889zM705.422222 819.2l-45.511111-45.511111L927.288889 512l-267.377778-261.688889 45.511111-45.511111L1006.933333 512zM540.785778 221.866667l55.751111 11.150222L483.157333 802.133333l-55.751111-11.093333z" fill="#bfbfbf" p-id="2423"></path></svg>				<?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="1546567861908" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2422" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M318.577778 819.2L17.066667 512l301.511111-307.2 45.511111 45.511111L96.711111 512l267.377778 261.688889zM705.422222 819.2l-45.511111-45.511111L927.288889 512l-267.377778-261.688889 45.511111-45.511111L1006.933333 512zM540.785778 221.866667l55.751111 11.150222L483.157333 802.133333l-55.751111-11.093333z" p-id="2423"></path></svg>
`@@ -1,2 +1,2 @@`
	<?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="1543827724451" class="icon" style="" viewBox="0 0 1084 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10233" xmlns:xlink="http://www.w3.org/1999/xlink" width="211.71875" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }	<?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="1543827724451" class="icon" style="" viewBox="0 0 1084 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10233" xmlns:xlink="http://www.w3.org/1999/xlink" width="211.71875" height="200"><defs><style type="text/css">@font-face { font-family: rbicon; src: url("chrome-extension://dipiagiiohfljcicegpgffpbnjmgjcnf/fonts/rbicon.woff2") format("woff2"); font-weight: normal; font-style: normal; }
	</style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234" fill="#bfbfbf"></path></svg>	</style></defs><path d="M1080.09609 434.500756c-4.216302-23.731757-26.9241-47.945376-50.595623-53.185637l-17.648235-4.095836a175.940257 175.940257 0 0 1-101.612877-80.832531 177.807476 177.807476 0 0 1-18.732427-129.801867l5.541425-16.684509c7.10748-23.129428-2.108151-54.992624-20.599646-70.833873 0 0-16.624276-14.094495-63.244529-41.199293-46.800951-26.984332-66.858502-34.513443-66.858502-34.513443-22.76803-8.372371-54.631227-0.361397-71.255503 17.407304l-12.287509 13.251234a173.470708 173.470708 0 0 1-120.465769 48.065842A174.13327 174.13327 0 0 1 421.329029 33.590675L409.583617 20.761071C393.140039 2.99237 361.096144-4.898138 338.267881 3.353767c0 0-20.358715 7.529111-67.099434 34.513443-46.800951 27.34573-63.244529 41.440225-63.244529 41.440225-18.431263 15.66055-27.646894 47.222582-20.539413 70.592941l5.059562 16.865207a178.048407 178.048407 0 0 1-18.672194 129.621169 174.916297 174.916297 0 0 1-102.275439 81.073463l-17.045906 3.854904c-23.310126 5.42096-46.258856 29.333415-50.595623 53.185637 0 0-3.854905 21.382674-3.854905 75.712737 0 54.330062 3.854905 75.712736 3.854905 75.712736 4.216302 23.972688 26.9241 47.945376 50.595623 53.185637l16.624276 3.854905a174.253736 174.253736 0 0 1 102.395904 81.314394c23.310126 40.837896 28.911785 87.337683 18.732427 129.801867l-4.81863 16.443578c-7.10748 23.129428 2.108151 54.992624 20.599646 70.833872 0 0 16.624276 14.094495 63.244529 41.199293 46.800951 27.104798 66.918735 34.513443 66.918735 34.513443 22.707798 8.372371 54.631227 0.361397 71.255503-17.407303l11.624947-12.588673a175.096996 175.096996 0 0 1 242.256662 0.120465l11.624947 12.648906c16.383345 17.708468 48.427239 25.598976 71.255503 17.347071 0 0 20.358715-7.529111 67.159666-34.513443 46.740719-27.104798 63.124063-41.199293 63.124064-41.199293 18.491496-15.600317 27.707127-47.463513 20.599646-70.833873l-5.059562-17.106139a176.723284 176.723284 0 0 1 18.672194-129.139305 176.060722 176.060722 0 0 1 102.395904-81.314394l16.68451-3.854905c23.310126-5.42096 46.258856-29.333415 50.595623-53.185637 0 0 3.854905-21.382674 3.854904-75.712737-0.240932-54.330062-4.095836-75.833202-4.095836-75.833202z m-537.819428 293.334149c-119.261112 0-216.175824-97.336342-216.175824-217.621412a216.657687 216.657687 0 0 1 216.236057-217.320249c119.200879 0 216.115591 97.276109 216.11559 217.56118-0.240932 120.044139-96.974945 217.320248-216.175823 217.320249z" p-id="10234"></path></svg>