若依 v4.7.7

Merge pull request !448 from 周冰/master

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-dd77653d7c9f197dd9d93684f3c8dcfbab6.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v4.7.4</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v4.7.7</h1>
 <h4 align="center">基于SpringBoot开发的轻量级Java快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi/stargazers"><img src="https://gitee.com/y_project/RuoYi/badge/star.svg?theme=gvp"></a>
-	<a href="https://gitee.com/y_project/RuoYi"><img src="https://img.shields.io/badge/RuoYi-v4.7.4-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi"><img src="https://img.shields.io/badge/RuoYi-v4.7.7-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 
@@ -99,4 +99,4 @@
 
 ## 若依交流群
 
-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN)  [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW)  [![加入QQ群](https://img.shields.io/badge/已满-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z)  [![加入QQ群](https://img.shields.io/badge/已满-1772718-blue.svg)](https://jq.qq.com/?_wv=1027&k=5g75dCU)  [![加入QQ群](https://img.shields.io/badge/已满-1366522-blue.svg)](https://jq.qq.com/?_wv=1027&k=58cPoHA)  [![加入QQ群](https://img.shields.io/badge/已满-1382251-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Ofd4Pb)  [![加入QQ群](https://img.shields.io/badge/已满-1145125-blue.svg)](https://jq.qq.com/?_wv=1027&k=5yugASz)  [![加入QQ群](https://img.shields.io/badge/已满-86752435-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Rf3d2P)  [![加入QQ群](https://img.shields.io/badge/已满-134072510-blue.svg)](https://jq.qq.com/?_wv=1027&k=5ZIjaeP)  [![加入QQ群](https://img.shields.io/badge/已满-210336300-blue.svg)](https://jq.qq.com/?_wv=1027&k=5CJw1jY)  [![加入QQ群](https://img.shields.io/badge/已满-339522636-blue.svg)](https://jq.qq.com/?_wv=1027&k=5omzbKc)  [![加入QQ群](https://img.shields.io/badge/已满-130035985-blue.svg)](https://jq.qq.com/?_wv=1027&k=qPIKBb7s)  [![加入QQ群](https://img.shields.io/badge/已满-143151071-blue.svg)](https://jq.qq.com/?_wv=1027&k=4NsjKbtU)  [![加入QQ群](https://img.shields.io/badge/已满-158781320-blue.svg)](https://jq.qq.com/?_wv=1027&k=VD2pkz2G)  [![加入QQ群](https://img.shields.io/badge/已满-201531282-blue.svg)](https://jq.qq.com/?_wv=1027&k=HlshFwkJ)  [![加入QQ群](https://img.shields.io/badge/已满-101526938-blue.svg)](https://jq.qq.com/?_wv=1027&k=0ARRrO9V)  [![加入QQ群](https://img.shields.io/badge/已满-264355400-blue.svg)](https://jq.qq.com/?_wv=1027&k=up9k3ZXJ)  [![加入QQ群](https://img.shields.io/badge/已满-298522656-blue.svg)](https://jq.qq.com/?_wv=1027&k=540WfdEr)  [![加入QQ群](https://img.shields.io/badge/已满-139845794-blue.svg)](https://jq.qq.com/?_wv=1027&k=ss91fC4t)  [![加入QQ群](https://img.shields.io/badge/213650505-blue.svg)](https://jq.qq.com/?_wv=1027&k=uUQpdY7J)
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-1389287-blue.svg)](https://jq.qq.com/?_wv=1027&k=5HBAaYN)  [![加入QQ群](https://img.shields.io/badge/已满-1679294-blue.svg)](https://jq.qq.com/?_wv=1027&k=5cHeRVW)  [![加入QQ群](https://img.shields.io/badge/已满-1529866-blue.svg)](https://jq.qq.com/?_wv=1027&k=53R0L5Z)  [![加入QQ群](https://img.shields.io/badge/已满-1772718-blue.svg)](https://jq.qq.com/?_wv=1027&k=5g75dCU)  [![加入QQ群](https://img.shields.io/badge/已满-1366522-blue.svg)](https://jq.qq.com/?_wv=1027&k=58cPoHA)  [![加入QQ群](https://img.shields.io/badge/已满-1382251-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Ofd4Pb)  [![加入QQ群](https://img.shields.io/badge/已满-1145125-blue.svg)](https://jq.qq.com/?_wv=1027&k=5yugASz)  [![加入QQ群](https://img.shields.io/badge/已满-86752435-blue.svg)](https://jq.qq.com/?_wv=1027&k=5Rf3d2P)  [![加入QQ群](https://img.shields.io/badge/已满-134072510-blue.svg)](https://jq.qq.com/?_wv=1027&k=5ZIjaeP)  [![加入QQ群](https://img.shields.io/badge/已满-210336300-blue.svg)](https://jq.qq.com/?_wv=1027&k=5CJw1jY)  [![加入QQ群](https://img.shields.io/badge/已满-339522636-blue.svg)](https://jq.qq.com/?_wv=1027&k=5omzbKc)  [![加入QQ群](https://img.shields.io/badge/已满-130035985-blue.svg)](https://jq.qq.com/?_wv=1027&k=qPIKBb7s)  [![加入QQ群](https://img.shields.io/badge/已满-143151071-blue.svg)](https://jq.qq.com/?_wv=1027&k=4NsjKbtU)  [![加入QQ群](https://img.shields.io/badge/已满-158781320-blue.svg)](https://jq.qq.com/?_wv=1027&k=VD2pkz2G)  [![加入QQ群](https://img.shields.io/badge/已满-201531282-blue.svg)](https://jq.qq.com/?_wv=1027&k=HlshFwkJ)  [![加入QQ群](https://img.shields.io/badge/已满-101526938-blue.svg)](https://jq.qq.com/?_wv=1027&k=0ARRrO9V)  [![加入QQ群](https://img.shields.io/badge/已满-264355400-blue.svg)](https://jq.qq.com/?_wv=1027&k=up9k3ZXJ)  [![加入QQ群](https://img.shields.io/badge/已满-298522656-blue.svg)](https://jq.qq.com/?_wv=1027&k=540WfdEr)  [![加入QQ群](https://img.shields.io/badge/已满-139845794-blue.svg)](https://jq.qq.com/?_wv=1027&k=ss91fC4t)  [![加入QQ群](https://img.shields.io/badge/已满-185760789-blue.svg)](https://jq.qq.com/?_wv=1027&k=Cqd66IKe) [![加入QQ群](https://img.shields.io/badge/175104288-blue.svg)](https://jq.qq.com/?_wv=1027&k=7FplYUnR)

pom.xml

@@ -5,30 +5,28 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>4.7.4</version>
+    <version>4.7.7</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
     
     <properties>
-        <ruoyi.version>4.7.4</ruoyi.version>
+        <ruoyi.version>4.7.7</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>
-        <shiro.version>1.9.0</shiro.version>
+        <shiro.version>1.10.1</shiro.version>
         <thymeleaf.extras.shiro.version>2.1.0</thymeleaf.extras.shiro.version>
-        <druid.version>1.2.8</druid.version>
+        <druid.version>1.2.16</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
-        <kaptcha.version>2.3.2</kaptcha.version>
+        <kaptcha.version>2.3.3</kaptcha.version>
         <swagger.version>3.0.0</swagger.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.1</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
-        <oshi.version>6.1.6</oshi.version>
+        <oshi.version>6.4.1</oshi.version>
         <commons.io.version>2.11.0</commons.io.version>
-        <commons.fileupload.version>1.4</commons.fileupload.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
     </properties>
@@ -55,7 +53,7 @@
             
             <!-- 验证码 -->
             <dependency>
-                <groupId>com.github.penggle</groupId>
+                <groupId>pro.fessional</groupId>
                 <artifactId>kaptcha</artifactId>
                 <version>${kaptcha.version}</version>
             </dependency>
@@ -95,13 +93,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>
@@ -136,13 +127,6 @@
                 <version>${commons.io.version}</version>
             </dependency>
 
-            <!-- 文件上传工具类 -->
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>${commons.fileupload.version}</version>
-            </dependency>
-
             <!-- excel工具 -->
             <dependency>
                 <groupId>org.apache.poi</groupId>

ruoyi-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.7.4</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoFormController.java

@@ -62,6 +62,15 @@ public class DemoFormController
         return prefix + "/timeline";
     }
 
+    /**
+     * 进度条
+     */
+    @GetMapping("/progress_bars")
+    public String progress_bars()
+    {
+        return prefix + "/progress_bars";
+    }
+
     /**
      * 表单校验
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java

@@ -506,8 +506,8 @@ public class DemoTableController extends BaseController
             }
         }
         PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = (pageDomain.getPageNum() - 1) * 10;
+        Integer pageNum = (pageDomain.getPageNum() - 1) * pageDomain.getPageSize();
-        Integer pageSize = pageDomain.getPageNum() * 10;
+        Integer pageSize = pageDomain.getPageNum() * pageDomain.getPageSize();
         if (pageSize > areaList.size())
         {
             pageSize = areaList.size();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -47,7 +47,7 @@ public class CacheController extends BaseController
     public String getCacheKeys(String fragment, String cacheName, ModelMap mmap)
     {
         mmap.put("cacheName", cacheName);
-        mmap.put("cacheKyes", cacheService.getCacheKeys(cacheName));
+        mmap.put("cacheKeys", cacheService.getCacheKeys(cacheName));
         return prefix + "/cache::" + fragment;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -84,7 +83,7 @@ public class SysConfigController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysConfig config)
     {
-        if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        if (!configService.checkConfigKeyUnique(config))
         {
             return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
@@ -112,7 +111,7 @@ public class SysConfigController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysConfig config)
     {
-        if (UserConstants.CONFIG_KEY_NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        if (!configService.checkConfigKeyUnique(config))
         {
             return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
@@ -151,7 +150,7 @@ public class SysConfigController extends BaseController
      */
     @PostMapping("/checkConfigKeyUnique")
     @ResponseBody
-    public String checkConfigKeyUnique(SysConfig config)
+    public boolean checkConfigKeyUnique(SysConfig config)
     {
         return configService.checkConfigKeyUnique(config);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -17,7 +17,6 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.Ztree;
 import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
@@ -75,7 +74,7 @@ public class SysDeptController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysDept dept)
     {
-        if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        if (!deptService.checkDeptNameUnique(dept))
         {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
@@ -111,7 +110,7 @@ public class SysDeptController extends BaseController
     {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
-        if (UserConstants.DEPT_NAME_NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        if (!deptService.checkDeptNameUnique(dept))
         {
             return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
@@ -153,7 +152,7 @@ public class SysDeptController extends BaseController
      */
     @PostMapping("/checkDeptNameUnique")
     @ResponseBody
-    public String checkDeptNameUnique(SysDept dept)
+    public boolean checkDeptNameUnique(SysDept dept)
     {
         return deptService.checkDeptNameUnique(dept);
     }
@@ -166,24 +165,13 @@ public class SysDeptController extends BaseController
      */
     @GetMapping(value = { "/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}" })
     public String selectDeptTree(@PathVariable("deptId") Long deptId,
-            @PathVariable(value = "excludeId", required = false) String excludeId, ModelMap mmap)
+            @PathVariable(value = "excludeId", required = false) Long excludeId, ModelMap mmap)
     {
         mmap.put("dept", deptService.selectDeptById(deptId));
         mmap.put("excludeId", excludeId);
         return prefix + "/tree";
     }
 
-    /**
-     * 加载部门列表树
-     */
-    @GetMapping("/treeData")
-    @ResponseBody
-    public List<Ztree> treeData()
-    {
-        List<Ztree> ztrees = deptService.selectDeptTree(new SysDept());
-        return ztrees;
-    }
-
     /**
      * 加载部门列表树（排除下级）
      */
@@ -196,15 +184,4 @@ public class SysDeptController extends BaseController
         List<Ztree> ztrees = deptService.selectDeptTreeExcludeChild(dept);
         return ztrees;
     }
-
-    /**
-     * 加载角色部门（数据权限）列表树
-     */
-    @GetMapping("/roleDeptTreeData")
-    @ResponseBody
-    public List<Ztree> deptTreeData(SysRole role)
-    {
-        List<Ztree> ztrees = deptService.roleDeptTreeData(role);
-        return ztrees;
-    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.Ztree;
@@ -83,7 +82,7 @@ public class SysDictTypeController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysDictType dict)
     {
-        if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        if (!dictTypeService.checkDictTypeUnique(dict))
         {
             return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
@@ -111,7 +110,7 @@ public class SysDictTypeController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysDictType dict)
     {
-        if (UserConstants.DICT_TYPE_NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
+        if (!dictTypeService.checkDictTypeUnique(dict))
         {
             return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
@@ -159,7 +158,7 @@ public class SysDictTypeController extends BaseController
      */
     @PostMapping("/checkDictTypeUnique")
     @ResponseBody
-    public String checkDictTypeUnique(SysDictType dictType)
+    public boolean checkDictTypeUnique(SysDictType dictType)
     {
         return dictTypeService.checkDictTypeUnique(dictType);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.Ztree;
@@ -105,7 +104,7 @@ public class SysMenuController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysMenu menu)
     {
-        if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        if (!menuService.checkMenuNameUnique(menu))
         {
             return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
@@ -134,7 +133,7 @@ public class SysMenuController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysMenu menu)
     {
-        if (UserConstants.MENU_NAME_NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        if (!menuService.checkMenuNameUnique(menu))
         {
             return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
@@ -157,7 +156,7 @@ public class SysMenuController extends BaseController
      */
     @PostMapping("/checkMenuNameUnique")
     @ResponseBody
-    public String checkMenuNameUnique(SysMenu menu)
+    public boolean checkMenuNameUnique(SysMenu menu)
     {
         return menuService.checkMenuNameUnique(menu);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -97,11 +96,11 @@ public class SysPostController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysPost post)
     {
-        if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        if (!postService.checkPostNameUnique(post))
         {
             return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         }
-        else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        else if (!postService.checkPostCodeUnique(post))
         {
             return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
@@ -129,11 +128,11 @@ public class SysPostController extends BaseController
     @ResponseBody
     public AjaxResult editSave(@Validated SysPost post)
     {
-        if (UserConstants.POST_NAME_NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
+        if (!postService.checkPostNameUnique(post))
         {
             return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         }
-        else if (UserConstants.POST_CODE_NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
+        else if (!postService.checkPostCodeUnique(post))
         {
             return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
         }
@@ -146,7 +145,7 @@ public class SysPostController extends BaseController
      */
     @PostMapping("/checkPostNameUnique")
     @ResponseBody
-    public String checkPostNameUnique(SysPost post)
+    public boolean checkPostNameUnique(SysPost post)
     {
         return postService.checkPostNameUnique(post);
     }
@@ -156,7 +155,7 @@ public class SysPostController extends BaseController
      */
     @PostMapping("/checkPostCodeUnique")
     @ResponseBody
-    public String checkPostCodeUnique(SysPost post)
+    public boolean checkPostCodeUnique(SysPost post)
     {
         return postService.checkPostCodeUnique(post);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -63,11 +62,7 @@ public class SysProfileController extends BaseController
     public boolean checkPassword(String password)
     {
         SysUser user = getSysUser();
-        if (passwordService.matches(user, password))
+        return passwordService.matches(user, password);
-        {
-            return true;
-        }
-        return false;
     }
 
     @GetMapping("/resetPwd")
@@ -138,13 +133,11 @@ public class SysProfileController extends BaseController
         currentUser.setEmail(user.getEmail());
         currentUser.setPhonenumber(user.getPhonenumber());
         currentUser.setSex(user.getSex());
-        if (StringUtils.isNotEmpty(user.getPhonenumber())
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
-                && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(currentUser)))
         {
             return error("修改用户'" + currentUser.getLoginName() + "'失败，手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail())
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
-                && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(currentUser)))
         {
             return error("修改用户'" + currentUser.getLoginName() + "'失败，邮箱账号已存在");
         }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.Ztree;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -22,6 +22,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.shiro.util.AuthorizationUtils;
 import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
 
@@ -42,6 +43,9 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ISysDeptService deptService;
+
     @RequiresPermissions("system:role:view")
     @GetMapping()
     public String role()
@@ -88,11 +92,11 @@ public class SysRoleController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysRole role)
     {
-        if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        if (!roleService.checkRoleNameUnique(role))
         {
             return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
         }
-        else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        else if (!roleService.checkRoleKeyUnique(role))
         {
             return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
@@ -125,11 +129,11 @@ public class SysRoleController extends BaseController
     {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
-        if (UserConstants.ROLE_NAME_NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
+        if (!roleService.checkRoleNameUnique(role))
         {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
         }
-        else if (UserConstants.ROLE_KEY_NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
+        else if (!roleService.checkRoleKeyUnique(role))
         {
             return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
@@ -182,7 +186,7 @@ public class SysRoleController extends BaseController
      */
     @PostMapping("/checkRoleNameUnique")
     @ResponseBody
-    public String checkRoleNameUnique(SysRole role)
+    public boolean checkRoleNameUnique(SysRole role)
     {
         return roleService.checkRoleNameUnique(role);
     }
@@ -192,7 +196,7 @@ public class SysRoleController extends BaseController
      */
     @PostMapping("/checkRoleKeyUnique")
     @ResponseBody
-    public String checkRoleKeyUnique(SysRole role)
+    public boolean checkRoleKeyUnique(SysRole role)
     {
         return roleService.checkRoleKeyUnique(role);
     }
@@ -303,4 +307,16 @@ public class SysRoleController extends BaseController
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
+
+    /**
+     * 加载角色部门（数据权限）列表树
+     */
+    @RequiresPermissions("system:role:edit")
+    @GetMapping("/deptTreeData")
+    @ResponseBody
+    public List<Ztree> deptTreeData(SysRole role)
+    {
+        List<Ztree> ztrees = deptService.roleDeptTreeData(role);
+        return ztrees;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -15,9 +15,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.Ztree;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -28,6 +29,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.shiro.service.SysPasswordService;
 import com.ruoyi.framework.shiro.util.AuthorizationUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
@@ -49,6 +51,9 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysRoleService roleService;
     
+    @Autowired
+    private ISysDeptService deptService;
+
     @Autowired
     private ISysPostService postService;
 
@@ -124,17 +129,15 @@ public class SysUserController extends BaseController
     @ResponseBody
     public AjaxResult addSave(@Validated SysUser user)
     {
-        if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(user.getLoginName())))
+        if (!userService.checkLoginNameUnique(user))
         {
             return error("新增用户'" + user.getLoginName() + "'失败，登录账号已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getPhonenumber())
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
-                && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
         {
             return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail())
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
-                && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
             return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
         }
@@ -170,13 +173,15 @@ public class SysUserController extends BaseController
     {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
-        if (StringUtils.isNotEmpty(user.getPhonenumber())
+        if (!userService.checkLoginNameUnique(user))
-                && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
+        {
+            return error("修改用户'" + user.getLoginName() + "'失败，登录账号已存在");
+        }
+        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
         {
             return error("修改用户'" + user.getLoginName() + "'失败，手机号码已存在");
         }
-        else if (StringUtils.isNotEmpty(user.getEmail())
+        else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
-                && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
         {
             return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在");
         }
@@ -261,9 +266,9 @@ public class SysUserController extends BaseController
      */
     @PostMapping("/checkLoginNameUnique")
     @ResponseBody
-    public String checkLoginNameUnique(SysUser user)
+    public boolean checkLoginNameUnique(SysUser user)
     {
-        return userService.checkLoginNameUnique(user.getLoginName());
+        return userService.checkLoginNameUnique(user);
     }
 
     /**
@@ -271,7 +276,7 @@ public class SysUserController extends BaseController
      */
     @PostMapping("/checkPhoneUnique")
     @ResponseBody
-    public String checkPhoneUnique(SysUser user)
+    public boolean checkPhoneUnique(SysUser user)
     {
         return userService.checkPhoneUnique(user);
     }
@@ -281,7 +286,7 @@ public class SysUserController extends BaseController
      */
     @PostMapping("/checkEmailUnique")
     @ResponseBody
-    public String checkEmailUnique(SysUser user)
+    public boolean checkEmailUnique(SysUser user)
     {
         return userService.checkEmailUnique(user);
     }
@@ -299,4 +304,29 @@ public class SysUserController extends BaseController
         userService.checkUserDataScope(user.getUserId());
         return toAjax(userService.changeStatus(user));
     }
+
+    /**
+     * 加载部门列表树
+     */
+    @RequiresPermissions("system:user:list")
+    @GetMapping("/deptTreeData")
+    @ResponseBody
+    public List<Ztree> deptTreeData()
+    {
+        List<Ztree> ztrees = deptService.selectDeptTree(new SysDept());
+        return ztrees;
+    }
+
+    /**
+     * 选择部门树
+     * 
+     * @param deptId 部门ID
+     */
+    @RequiresPermissions("system:user:list")
+    @GetMapping("/selectDeptTree/{deptId}")
+    public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap)
+    {
+        mmap.put("dept", deptService.selectDeptById(deptId));
+        return prefix + "/deptTree";
+    }
 }

ruoyi-admin/src/main/resources/application-druid.yml

@@ -24,6 +24,10 @@ spring:
             maxActive: 20
             # 配置获取连接等待超时的时间
             maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
             # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
             timeBetweenEvictionRunsMillis: 60000
             # 配置一个连接在池中最小生存的时间，单位是毫秒

ruoyi-admin/src/main/resources/application.yml

@@ -3,9 +3,9 @@ ruoyi:
   # 名称
   name: RuoYi
   # 版本
-  version: 4.7.4
+  version: 4.7.7
   # 版权年份
-  copyrightYear: 2022
+  copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-fileinput/fileinput.css

@@ -1,11 +1,11 @@
 /*!
- * bootstrap-fileinput v5.2.4
+ * bootstrap-fileinput v5.5.2
  * http://plugins.krajee.com/file-input
  *
  * Krajee default styling for bootstrap-fileinput.
  *
  * Author: Kartik Visweswaran
- * Copyright: 2014 - 2021, Kartik Visweswaran, Krajee.com
+ * Copyright: 2014 - 2022, Kartik Visweswaran, Krajee.com
  *
  * Licensed under the BSD-3-Clause
  * https://github.com/kartik-v/bootstrap-fileinput/blob/master/LICENSE.md
@@ -50,6 +50,10 @@ input[type=file].file-loading {
     display: none;
 }
 
+.file-caption .input-group {
+    align-items: center;
+}
+
 .btn-file input[type=file],
 .file-caption-icon,
 .file-preview .fileinput-remove,
@@ -274,6 +278,7 @@ input[type=file].file-loading {
     padding: 6px;
     float: left;
     text-align: center;
+
 }
 
 .krajee-default.file-preview-frame .kv-file-content {
@@ -281,12 +286,6 @@ input[type=file].file-loading {
     height: 160px;
 }
 
-.krajee-default .file-preview-other-frame {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
 .krajee-default.file-preview-frame .kv-file-content.kv-pdf-rendered {
     width: 400px;
 }
@@ -330,7 +329,7 @@ input[type=file].file-loading {
     text-align: center;
     padding-top: 4px;
     font-size: 11px;
-    color: #777;
+    color: #999;
     margin-bottom: 30px;
 }
 
@@ -406,7 +405,7 @@ input[type=file].file-loading {
     height: 2.4rem;
     top: 50%;
     border-radius: 50%;
-    text-align:center;
+    text-align: center;
 }
 
 .btn-navigate * {
@@ -426,19 +425,12 @@ input[type=file].file-loading {
     right: 0;
 }
 
-.file-zoom-dialog .kv-zoom-caption {
-    max-width: 50%;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
 .file-zoom-dialog .kv-zoom-header {
     padding: 0.5rem;
 }
 
 .file-zoom-dialog .kv-zoom-body {
-    padding: 0.25rem 0.5rem 0.25rem 0;
+    padding: 0.25rem;
 }
 
 .file-zoom-dialog .kv-zoom-description {
@@ -554,6 +546,10 @@ input[type=file].file-loading {
     z-index: 3000;
 }
 
+.kv-zoom-actions {
+    min-width: 140px;
+}
+
 .kv-zoom-actions .btn-kv {
     margin-left: 3px;
 }
@@ -568,15 +564,6 @@ input[type=file].file-loading {
     background: transparent;
 }
 
-.file-zoom-content > * {
-    display: inline-block;
-    vertical-align: middle;
-}
-
-.file-zoom-content .kv-spacer {
-    height: 100%;
-}
-
 .file-zoom-content .file-preview-image {
     max-height: 100%;
 }
@@ -669,3 +656,33 @@ input[type=file].file-loading {
 .file-preview .kv-zoom-cache {
     display: none;
 }
+
+.file-preview-other-frame, .file-preview-object, .kv-file-content, .kv-zoom-body {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.btn-kv-rotate,
+.kv-file-rotate {
+    display: none;
+}
+
+.rotatable:not(.hide-rotate) .btn-kv-rotate,
+.rotatable:not(.hide-rotate) .kv-file-rotate {
+    display: inline-block;
+}
+
+.rotatable .file-zoom-detail,
+.rotatable .kv-file-content,
+.rotatable .kv-file-content > :first-child {
+    transform-origin: center center;
+}
+
+.rotate-animate {
+    transition: transform 0.3s ease;
+}
+
+.kv-overflow-hidden {
+    overflow: hidden;
+}

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.js

@@ -187,6 +187,7 @@
                     success: function(data, textStatus, jqXHR) {
                     	data = calculateObjectValue(options, options.responseHandler, [data], data);
                         renderTable(data);
+                        calculateObjectValue(options, options.onLoadSuccess, [data], data);
                     },
                     error: function(xhr, textStatus) {
                         var _errorMsg = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">' + xhr.responseText + '</div></td></tr>'
@@ -697,7 +698,8 @@
 	                        if (_ls && _ls.length > 0) {
 	                            $.each(_ls, function(index, item) {
 	                                var _p_icon = $("#" + $(item).attr("pid")).children().eq(options.expandColumn).find(".treetable-expander");
-	                                if (_p_icon.hasClass(options.expanderExpandedClass)) {
+	                                var _p_display = $("#" + $(item).attr("pid")).css('display');
+	                                if (_p_icon.hasClass(options.expanderExpandedClass) && _p_display == 'table') {
 	                                    $(item).css("display", "table");
 	                                }
 	                            });
@@ -728,7 +730,7 @@
                                     $.ajax({
                                         type: options.type,
                                         url: options.dataUrl,
-                                        data: $.extend(parms, options.ajaxParams),
+                                        data: parms,
                                         dataType: "json",
                                         success: function(data, textStatus, jqXHR) {
                                             $("#" + row_id + "_load").remove();
@@ -764,6 +766,7 @@
         }
         // 添加数据刷新表格
         target.appendData = function(data) {
+            data.reverse()
             // 下边的操作主要是为了查询时让一些没有根节点的节点显示
             $.each(data, function(i, item) {
                 if (options.pagination) {

ruoyi-admin/src/main/resources/static/i18n/messages.properties

@@ -8,6 +8,7 @@ user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
 user.password.delete=对不起，您的账号已被删除
 user.blocked=用户已封禁，请联系管理员
 role.blocked=角色已封禁，请联系管理员
+login.blocked=很遗憾，访问IP已被列入系统黑名单
 user.logout.success=退出成功
 
 length.not.valid=长度必须在{min}到{max}个字符之间

ruoyi-admin/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js

@@ -1,120 +1,10 @@
 /*
- * metismenu - v1.1.3
+ * metismenu - v2.0.2
- * Easy menu jQuery plugin for Twitter Bootstrap 3
+ * A jQuery menu plugin
  * https://github.com/onokumus/metisMenu
  *
  * Made by Osman Nuri Okumus
  * Under MIT License
  */
-;(function($, window, document, undefined) {
 
-    var pluginName = "metisMenu",
+!function(a){"use strict";function b(){var a=document.createElement("mm"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}function c(b){return this.each(function(){var c=a(this),d=c.data("mm"),f=a.extend({},e.DEFAULTS,c.data(),"object"==typeof b&&b);d||c.data("mm",d=new e(this,f)),"string"==typeof b&&d[b]()})}a.fn.emulateTransitionEnd=function(b){var c=!1,e=this;a(this).one("mmTransitionEnd",function(){c=!0});var f=function(){c||a(e).trigger(d.end)};return setTimeout(f,b),this};var d=b();d&&(a.event.special.mmTransitionEnd={bindType:d.end,delegateType:d.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}});var e=function(b,c){this.$element=a(b),this.options=a.extend({},e.DEFAULTS,c),this.transitioning=null,this.init()};e.TRANSITION_DURATION=350,e.DEFAULTS={toggle:!0,doubleTapToGo:!1,activeClass:"active"},e.prototype.init=function(){var b=this,c=this.options.activeClass;this.$element.find("li."+c).has("ul").children("ul").addClass("collapse in"),this.$element.find("li").not("."+c).has("ul").children("ul").addClass("collapse"),this.options.doubleTapToGo&&this.$element.find("li."+c).has("ul").children("a").addClass("doubleTapToGo"),this.$element.find("li").has("ul").children("a").on("click.metisMenu",function(d){var e=a(this),f=e.parent("li"),g=f.children("ul");return d.preventDefault(),f.hasClass(c)?b.hide(g):b.show(g),b.options.doubleTapToGo&&b.doubleTapToGo(e)&&"#"!==e.attr("href")&&""!==e.attr("href")?(d.stopPropagation(),void(document.location=e.attr("href"))):void 0})},e.prototype.doubleTapToGo=function(a){var b=this.$element;return a.hasClass("doubleTapToGo")?(a.removeClass("doubleTapToGo"),!0):a.parent().children("ul").length?(b.find(".doubleTapToGo").removeClass("doubleTapToGo"),a.addClass("doubleTapToGo"),!1):void 0},e.prototype.show=function(b){var c=this.options.activeClass,f=a(b),g=f.parent("li");if(!this.transitioning&&!f.hasClass("in")){g.addClass(c),this.options.toggle&&this.hide(g.siblings().children("ul.in")),f.removeClass("collapse").addClass("collapsing").height(0),this.transitioning=1;var h=function(){f.removeClass("collapsing").addClass("collapse in").height(""),this.transitioning=0};return d?void f.one("mmTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(e.TRANSITION_DURATION).height(f[0].scrollHeight):h.call(this)}},e.prototype.hide=function(b){var c=this.options.activeClass,f=a(b);if(!this.transitioning&&f.hasClass("in")){f.parent("li").removeClass(c),f.height(f.height())[0].offsetHeight,f.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var g=function(){this.transitioning=0,f.removeClass("collapsing").addClass("collapse")};return d?void f.height(0).one("mmTransitionEnd",a.proxy(g,this)).emulateTransitionEnd(e.TRANSITION_DURATION):g.call(this)}};var f=a.fn.metisMenu;a.fn.metisMenu=c,a.fn.metisMenu.Constructor=e,a.fn.metisMenu.noConflict=function(){return a.fn.metisMenu=f,this}}(jQuery);
-        defaults = {
-            toggle: true,
-            doubleTapToGo: false
-        };
-
-    function Plugin(element, options) {
-        this.element = $(element);
-        this.settings = $.extend({}, defaults, options);
-        this._defaults = defaults;
-        this._name = pluginName;
-        this.init();
-    }
-
-    Plugin.prototype = {
-        init: function() {
-
-            var $this = this.element,
-                $toggle = this.settings.toggle,
-                obj = this;
-
-            if (this.isIE() <= 9) {
-                $this.find("li.active").has("ul").children("ul").collapse("show");
-                $this.find("li").not(".active").has("ul").children("ul").collapse("hide");
-            } else {
-                $this.find("li.active").has("ul").children("ul").addClass("collapse in");
-                $this.find("li").not(".active").has("ul").children("ul").addClass("collapse");
-            }
-
-            //add the "doubleTapToGo" class to active items if needed
-            if (obj.settings.doubleTapToGo) {
-                $this.find("li.active").has("ul").children("a").addClass("doubleTapToGo");
-            }
-
-            $this.find("li").has("ul").children("a").on("click" + "." + pluginName, function(e) {
-                e.preventDefault();
-
-                //Do we need to enable the double tap
-                if (obj.settings.doubleTapToGo) {
-
-                    //if we hit a second time on the link and the href is valid, navigate to that url
-                    if (obj.doubleTapToGo($(this)) && $(this).attr("href") !== "#" && $(this).attr("href") !== "") {
-                        e.stopPropagation();
-                        document.location = $(this).attr("href");
-                        return;
-                    }
-                }
-
-                $(this).parent("li").toggleClass("active").children("ul").collapse("toggle");
-
-                if ($toggle) {
-                    $(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide");
-                }
-
-            });
-        },
-
-        isIE: function() { //https://gist.github.com/padolsey/527683
-            var undef,
-                v = 3,
-                div = document.createElement("div"),
-                all = div.getElementsByTagName("i");
-
-            while (
-                div.innerHTML = "<!--[if gt IE " + (++v) + "]><i></i><![endif]-->",
-                    all[0]
-                ) {
-                return v > 4 ? v : undef;
-            }
-        },
-
-        //Enable the link on the second click.
-        doubleTapToGo: function(elem) {
-            var $this = this.element;
-
-            //if the class "doubleTapToGo" exists, remove it and return
-            if (elem.hasClass("doubleTapToGo")) {
-                elem.removeClass("doubleTapToGo");
-                return true;
-            }
-
-            //does not exists, add a new class and return false
-            if (elem.parent().children("ul").length) {
-                //first remove all other class
-                $this.find(".doubleTapToGo").removeClass("doubleTapToGo");
-                //add the class on the current element
-                elem.addClass("doubleTapToGo");
-                return false;
-            }
-        },
-
-        remove: function() {
-            this.element.off("." + pluginName);
-            this.element.removeData(pluginName);
-        }
-
-    };
-
-    $.fn[pluginName] = function(options) {
-        this.each(function () {
-            var el = $(this);
-            if (el.data(pluginName)) {
-                el.data(pluginName).remove();
-            }
-            el.data(pluginName, new Plugin(this, options));
-        });
-        return this;
-    };
-
-})(jQuery, window, document);

ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css

@@ -338,7 +338,7 @@ label.error {
 
 .input-group label.error {
 	z-index:99;
-	right: 42px
+	right: 42px;
 }
 
 .input-group input.error + label.error + .input-group-addon>i {
@@ -347,10 +347,14 @@ label.error {
 
 .input-group.date label.error {
 	z-index:99;
-	right: 42px
+	right: 42px;
 }
 
-.Validform_error,input.error,textarea.error,select.error {
+.select2-hidden-accessible + label.error {
+	right: 38px;
+}
+
+.Validform_error,input.error,textarea.error,select.error,label.error+.select2-container--bootstrap .select2-selection--single {
 	background-color: #fbe2e2;
 	border-color: #c66161;
 	color: #c00

ruoyi-admin/src/main/resources/static/ruoyi/index.js

@@ -262,7 +262,7 @@ $(function() {
         // 获取标识数据
         var dataUrl = $(this).attr('href'),
         dataIndex = $(this).data('index'),
-        menuName = $.trim($(this).text()),
+        menuName = $(this).data('title') || $.trim($(this).text()),
         isRefresh = $(this).data("refresh"),
         flag = true;
 
@@ -306,7 +306,7 @@ $(function() {
             $('.menuTab').removeClass('active');
 
             // 添加选项卡对应的iframe
-            var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>';
+            var str1 = '<iframe class="RuoYi_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" data-refresh="' + isRefresh + '" seamless></iframe>';
             $('.mainContent').find('iframe.RuoYi_iframe').hide().parents('.mainContent').append(str1);
 
             $.modal.loading("数据加载中，请稍候...");
@@ -434,15 +434,20 @@ $(function() {
     function activeTab() {
         if (!$(this).hasClass('active')) {
             var currentId = $(this).data('id');
+            var isRefresh = false;
             syncMenuTab(currentId);
             // 显示tab对应的内容区
             $('.mainContent .RuoYi_iframe').each(function() {
                 if ($(this).data('id') == currentId) {
                     $(this).show().siblings('.RuoYi_iframe').hide();
+                    isRefresh = $.common.nullToDefault($(this).data('refresh'), false);
                     return false;
                 }
             });
             $(this).addClass('active').siblings('.menuTab').removeClass('active');
+            if (isRefresh) {
+                refreshTab();
+            }
             scrollToTab(this);
         }
     }

ruoyi-admin/src/main/resources/static/ruoyi/js/common.js

@@ -68,6 +68,7 @@ $(function() {
                         endLayDate.config.min.month = '';
                         endLayDate.config.min.date = '';
                     }
+                    $('#endTime').trigger('click');
                 }
             });
             endLayDate = laydate.render({
@@ -383,6 +384,32 @@ function checkpwd(chrtype, password) {
     return true;
 }
 
+/** 开始时间/时分秒 */
+function beginOfTime(date) {
+    if($.common.isNotEmpty(date)) {
+        return $.common.sprintf("%s 00:00:00", date);
+    }
+}
+
+/** 结束时间/时分秒 */
+function endOfTime(date) {
+    if($.common.isNotEmpty(date)) {
+        return $.common.sprintf("%s 23:59:59", date);
+    }
+}
+
+/** 重置日期/年月日 */
+function resetDate() {
+	if ($.common.isNotEmpty(startLayDate) && $.common.isNotEmpty(endLayDate)) {
+	    endLayDate.config.min.year = '';
+	    endLayDate.config.min.month = '';
+	    endLayDate.config.min.date = '';
+	    startLayDate.config.max.year = '2099';
+	    startLayDate.config.max.month = '12';
+	    startLayDate.config.max.date = '31';
+	}
+}
+
 // 日志打印封装处理
 var log = {
     log: function(msg) {
@@ -428,7 +455,7 @@ var sub = {
 		var data = $("#" + table.options.id).bootstrapTable('getData');
     	var count = data.length;
     	for (var dataIndex = 0; dataIndex < count; dataIndex++) {
-    	    var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td');
+    	    var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td:visible');
     	    var obj = new Object();
     	    for (var i = 0; i < columns.length; i++) {
     	        var inputValue = $(columns[i]).find('input');
@@ -465,9 +492,10 @@ var sub = {
         }
         $("#" + table.options.id).bootstrapTable('remove', { field: subColumn, values: ids });
     },
-    delRowByIndex: function(value) {
+    delRowByIndex: function(value, tableId) {
+    	var currentId = $.common.isEmpty(tableId) ? table.options.id : tableId;
     	sub.editRow();
-        $("#" + table.options.id).bootstrapTable('remove', { field: "index", values: [value] });
+        $("#" + currentId).bootstrapTable('remove', { field: "index", values: [value] });
         sub.editRow();
     },
     addRow: function(row, tableId) {

ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -10,8 +10,8 @@ var table = {
     options: {},
     // 设置实例配置
     set: function(id) {
-        if($.common.getLength(table.config) > 1 && $.common.isNotEmpty(event)) {
+        if ($.common.getLength(table.config) > 1 && $.common.isNotEmpty(event)) {
-            var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") : id;
+            var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") || $(event.currentTarget).parents(".bootstrap-tree-table").find("table.table").attr("id") : id;
             if ($.common.isNotEmpty(tableId)) {
                 table.options = table.get(tableId);
             }
@@ -221,13 +221,13 @@ var table = {
                     if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
                         func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference';
                         var selectedIds = table.rememberSelectedIds[table.options.id];
-                        if($.common.isNotEmpty(selectedIds)) {
+                        if ($.common.isNotEmpty(selectedIds)) {
                             table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds);
                         } else {
                             table.rememberSelectedIds[table.options.id] = _[func]([], rowIds);
                         }
                         var selectedRows = table.rememberSelecteds[table.options.id];
-                        if($.common.isNotEmpty(selectedRows)) {
+                        if ($.common.isNotEmpty(selectedRows)) {
                             table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows);
                         } else {
                             table.rememberSelecteds[table.options.id] = _[func]([], rows);
@@ -249,7 +249,7 @@ var table = {
                 $(optionsIds).off("click").on("click", '.img-circle', function() {
                     var src = $(this).attr('src');
                     var target = $(this).data('target');
-                    if($.common.equals("self", target)) {
+                    if ($.common.equals("self", target)) {
                         var height = $(this).data('height');
                         var width = $(this).data('width');
                         top.layer.open({
@@ -363,7 +363,7 @@ var table = {
                 if ($.common.isNotEmpty(pageSize)) {
                     params.pageSize = pageSize;
                 }
-                if($.common.isNotEmpty(tableId)){
+                if ($.common.isNotEmpty(tableId)){
                     $("#" + tableId).bootstrapTable('refresh', params);
                 } else{
                     $("#" + table.options.id).bootstrapTable('refresh', params);
@@ -493,7 +493,7 @@ var table = {
                 });
                 if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
                     var selectedRows = table.rememberSelecteds[table.options.id];
-                    if($.common.isNotEmpty(selectedRows)) {
+                    if ($.common.isNotEmpty(selectedRows)) {
                         rows = $.map(table.rememberSelecteds[table.options.id], function (row) {
                             return $.common.getItemField(row, column);
                         });
@@ -522,7 +522,7 @@ var table = {
                 });
                 if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
                     var selectedRows = table.rememberSelecteds[table.options.id];
-                    if($.common.isNotEmpty(selectedRows)) {
+                    if ($.common.isNotEmpty(selectedRows)) {
                         rows = $.map(selectedRows, function (row) {
                             return $.common.getItemField(row, table.options.columns[1].field);
                         });
@@ -704,14 +704,7 @@ var table = {
                 } else if (table.options.type == table_type.bootstrapTreeTable) {
                     $("#" + tableId).bootstrapTreeTable('refresh', table.options.ajaxParams);
                 }
-                if ($.common.isNotEmpty(startLayDate) && $.common.isNotEmpty(endLayDate)) {
+                resetDate();
-                    endLayDate.config.min.year = '';
-                    endLayDate.config.min.month = '';
-                    endLayDate.config.min.date = '';
-                    startLayDate.config.max.year = '2099';
-                    startLayDate.config.max.month = '12';
-                    startLayDate.config.max.date = '31';
-                 }
             },
             // 获取选中复选框项
             selectCheckeds: function(name) {
@@ -812,7 +805,7 @@ var table = {
             },
             // 获取iframe页的DOM
             getChildFrame: function (index) {
-                if($.common.isEmpty(index)){
+                if ($.common.isEmpty(index)){
                     var index = parent.layer.getFrameIndex(window.name);
                     return parent.layer.getChildFrame('body', index);
                 } else {
@@ -821,7 +814,7 @@ var table = {
             },
             // 关闭窗体
             close: function (index) {
-                if($.common.isEmpty(index)){
+                if ($.common.isEmpty(index)){
                     var index = parent.layer.getFrameIndex(window.name);
                     parent.layer.close(index);
                 } else {
@@ -883,6 +876,9 @@ var table = {
                     yes: callback,
                     cancel: function(index) {
                         return true;
+                    },
+                    success: function () {
+                        $(':focus').blur();
                     }
                 });
             },
@@ -904,7 +900,7 @@ var table = {
                     }
                 }
                 var btnCallback = {};
-                if(options.btn instanceof Array){
+                if (options.btn instanceof Array){
                     for (var i = 1, len = options.btn.length; i < len; i++) {
                         var btn = options["btn" + (i + 1)];
                         if (btn) {
@@ -929,6 +925,9 @@ var table = {
                     yes: options.yes,
                     cancel: function () {
                         return true;
+                    },
+                    success: function () {
+                        $(':focus').blur();
                     }
                 }, btnCallback));
                 if ($.common.isNotEmpty(options.full) && options.full === true) {
@@ -972,6 +971,9 @@ var table = {
                     },
                     cancel: function(index) {
                         return true;
+                    },
+                    success: function () {
+                        $(':focus').blur();
                     }
                 });
                 top.layer.full(index);
@@ -1086,7 +1088,7 @@ var table = {
                 table.set();
                 $.modal.confirm("确定删除该条" + table.options.modalName + "信息吗？", function() {
                     var url = $.common.isEmpty(id) ? table.options.removeUrl : table.options.removeUrl.replace("{id}", id);
-                    if(table.options.type == table_type.bootstrapTreeTable) {
+                    if (table.options.type == table_type.bootstrapTreeTable) {
                         $.operate.get(url);
                     } else {
                         var data = { "ids": id };
@@ -1139,7 +1141,7 @@ var table = {
             // 修改信息
             edit: function(id) {
                 table.set();
-                if($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) {
+                if ($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) {
                     var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
                     if ($.common.isEmpty(row)) {
                         $.modal.alertWarning("请至少选择一条记录");
@@ -1163,7 +1165,7 @@ var table = {
                 if ($.common.isNotEmpty(id)) {
                     url = table.options.updateUrl.replace("{id}", id);
                 } else {
-                    if(table.options.type == table_type.bootstrapTreeTable) {
+                    if (table.options.type == table_type.bootstrapTreeTable) {
                         var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0];
                         if ($.common.isEmpty(row)) {
                             $.modal.alertWarning("请至少选择一条记录");
@@ -1289,7 +1291,7 @@ var table = {
             successCallback: function(result) {
                 if (result.code == web_status.SUCCESS) {
                     var parent = activeWindow();
-                    if($.common.isEmpty(parent.table)) {
+                    if ($.common.isEmpty(parent.table)) {
                     	$.modal.msgSuccessReload(result.msg);
                     } else if (parent.table.options.type == table_type.bootstrapTable) {
                         $.modal.close();
@@ -1313,15 +1315,20 @@ var table = {
                 if (result.code == web_status.SUCCESS) {
                     var topWindow = $(window.parent.document);
                     var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-panel');
-                    var $contentWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0].contentWindow;
+                    var topWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0];
-                    $.modal.close();
+                    if ($.common.isNotEmpty(topWindow) && $.common.isNotEmpty(currentId)) {
-                    $contentWindow.$.modal.msgSuccess(result.msg);
+                    	var $contentWindow = topWindow.contentWindow;
-                    $contentWindow.$(".layui-layer-padding").removeAttr("style");
+                    	$contentWindow.$.modal.msgSuccess(result.msg);
-                    if ($contentWindow.table.options.type == table_type.bootstrapTable) {
+                        $contentWindow.$(".layui-layer-padding").removeAttr("style");
-                        $contentWindow.$.table.refresh();
+                        if ($contentWindow.table.options.type == table_type.bootstrapTable) {
-                    } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) {
+                            $contentWindow.$.table.refresh();
-                        $contentWindow.$.treeTable.refresh();
+                        } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) {
+                            $contentWindow.$.treeTable.refresh();
+                        }
+                    } else {
+                        $.modal.msgSuccess(result.msg);
                     }
+                    $.modal.close();
                     $.modal.closeTab();
                 } else if (result.code == web_status.WARNING) {
                     $.modal.alertWarning(result.msg)
@@ -1333,13 +1340,6 @@ var table = {
         },
         // 校验封装处理
         validate: {
-            // 判断返回标识是否唯一 false 为存在 true 为不存在
-            unique: function (value) {
-                if (value == "0") {
-                    return true;
-                }
-                return false;
-            },
             // 表单验证
             form: function (formId) {
                 var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
@@ -1404,7 +1404,7 @@ var table = {
                     var node = tree.getNodesByParam("id", treeId, null)[0];
                     $.tree.selectByIdName(treeId, node);
                     // 回调tree方法
-                    if(typeof(options.callBack) === "function"){
+                    if (typeof(options.callBack) === "function"){
                         options.callBack(tree);
                     }
                 });
@@ -1493,7 +1493,7 @@ var table = {
             // 不允许根父节点选择
             notAllowParents: function(_tree) {
                 var nodes = _tree.getSelectedNodes();
-                if(nodes.length == 0){
+                if (nodes.length == 0){
                     $.modal.msgError("请选择节点后提交");
                     return false;
                 }
@@ -1549,6 +1549,10 @@ var table = {
             isNotEmpty: function (value) {
                 return !$.common.isEmpty(value);
             },
+            // 如果值是空，则返回指定默认字符串，否则返回字符串本身
+            nullToDefault: function (value, defaultValue) {
+                return $.common.isEmpty(value) ? defaultValue : value;
+            },
             // 空对象转字符串
             nullToStr: function(value) {
                 if ($.common.isEmpty(value)) {
@@ -1681,7 +1685,7 @@ var table = {
             formToJSON: function(formId) {
                 var json = {};
                 $.each($("#" + formId).serializeArray(), function(i, field) {
-                    if(json[field.name]) {
+                    if (json[field.name]) {
                         json[field.name] += ("," + field.value);
                     } else {
                         json[field.name] = field.value;

ruoyi-admin/src/main/resources/templates/demo/form/progress_bars.html

@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+	<th:block th:include="include :: header('进度条')" />
+</head>
+<body class="gray-bg">
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title">
+                        <h5>进度条 (Progress Bars)</h5>
+                        <div class="ibox-tools">
+                            <a class="collapse-link">
+                                <i class="fa fa-chevron-up"></i>
+                            </a>
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                <i class="fa fa-wrench"></i>
+                            </a>
+                            <ul class="dropdown-menu dropdown-user">
+                                <li><a href="#">选项1</a>
+                                </li>
+                                <li><a href="#">选项2</a>
+                                </li>
+                            </ul>
+                            <a class="close-link">
+                                <i class="fa fa-times"></i>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <!-- style: progress-bar-success/progress-bar-info/progress-bar-warning/progress-bar-danger -->
+                        <h5>基本</h5>
+                        <div class="progress">
+                            <div style="width: 35%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="35" role="progressbar" class="progress-bar progress-bar-success">
+                                <span class="sr-only">35% Complete (success)</span>
+                            </div>
+                        </div>
+
+                        <div class="progress progress-bar-default">
+                            <div style="width: 43%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="43" role="progressbar" class="progress-bar">
+                                <span class="sr-only">43% Complete (success)</span>
+                            </div>
+                        </div>
+
+                        <h5>条纹效果</h5>
+                        <div class="progress progress-striped">
+                            <div style="width: 50%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="50" role="progressbar" class="progress-bar progress-bar-warning">
+                                <span class="sr-only">50% Complete (success)</span>
+                            </div>
+                        </div>
+
+                        <h5>动画效果</h5>
+                        <div class="progress progress-striped active">
+                            <div style="width: 75%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="75" role="progressbar" class="progress-bar progress-bar-danger">
+                                <span class="sr-only">75% Complete (success)</span>
+                            </div>
+                        </div>
+
+                        <h5>堆叠效果</h5>
+                        <div class="progress progress-striped active">
+                            <div style="width: 30%" class="progress-bar progress-bar-success">
+                                <span class="sr-only">30% Complete (success)</span>
+                            </div>
+                            <div style="width: 20%" class="progress-bar progress-bar-warning">
+                                <span class="sr-only">20% Complete (warning)</span>
+                            </div>
+                            <div style="width: 40%" class="progress-bar progress-bar-danger">
+                                <span class="sr-only">40% Complete (danger)</span>
+                            </div>
+                        </div>
+                        
+                        <h5>带有提示标签的进度条</h5>
+                        <div class="progress">
+                            <div class="progress-bar" role="progressbar" aria-valuenow="95" aria-valuemin="0" aria-valuemax="100" style="width: 95%;">
+                                95%
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script type="text/javascript">
+	    $("[data-toggle='tooltip']").tooltip();
+	    $("[data-toggle=popover]").popover();
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/demo/form/summernote.html

@@ -17,7 +17,7 @@
                             <h2>若依后台管理系统</h2>
                             <p>ruoyi是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
                             <p>
-                                <b>当前版本：</b>v4.7.4
+                                <b>当前版本：</b>v4.7.7
                             </p>
                             <p>
                                 <span class="label label-warning">免费开源</span>
@@ -56,7 +56,7 @@
                             <h3>你好，若依 </h3>
                             <p>H+是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如<b>网站管理后台</b>，<b>网站会员中心</b>，<b>CMS</b>，<b>CRM</b>，<b>OA</b>等等，当然，您也可以对她进行深度定制，以做出更强系统。</p>
                             <p>
-                                <b>当前版本：</b>v4.7.4
+                                <b>当前版本：</b>v4.7.7
                             </p>
                             <p>
                                 <span class="label label-warning">开源免费</span>

ruoyi-admin/src/main/resources/templates/demo/form/wizard.html

@@ -181,7 +181,7 @@ $('#smartwizard').smartWizard({
   enableURLhash: true, // Enable selection of the step based on url hash
   transition: {
       animation: 'none', // Effect on navigation, none/fade/slide-horizontal/slide-vertical/slide-swing
-      speed: '400', // Transion animation speed
+      speed: '400', // Transition animation speed
       easing:'' // Transition animation easing. Not supported without a jQuery easing plugin
   },
   toolbarSettings: {

ruoyi-admin/src/main/resources/templates/demo/table/reorderRows.html

@@ -32,11 +32,14 @@
 		        showRefresh: false,
 		        showToggle: false,
 		        showColumns: false,
-		        onReorderRow: function (data) {
+		        onReorderRow: function (data, newRow, oldRow, el) {
-		        	 //当拖拽结束后，data为整个表格的数据
+			        // 当拖拽结束后，data为整个表格的数据
 		            console.table(data)
 		            // 当sidePagination: "server"时，拖拽行后顺序错乱，需要重新调用加载数据方法
-		            $("#" + table.options.id).bootstrapTable('load', data);
+		            $("#" + table.options.id).bootstrapTable('load', {
+			            total: el._xhr.responseJSON.total,
+			            rows: data
+			        });
 		            return false;
 		        },
                 columns: [{

ruoyi-admin/src/main/resources/templates/demo/table/subdata.html

@@ -1,8 +1,11 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-	<th:block th:include="include :: header('主子表提交')" />
+    <th:block th:include="include :: header('主子表提交')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <style type="text/css">
+        table label.error{position: inherit;}select + label.error{z-index:1;right:40px;}
+    </style>
 </head>
 <body class="gray-bg">
     <div class="main-content">
@@ -13,7 +16,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">客户名称：</label>
                         <div class="col-sm-8">
-                            <input name="name" placeholder="请输入客户名称" class="form-control" type="text" maxlength="30">
+                            <input name="name" placeholder="请输入客户名称" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
@@ -31,9 +34,9 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">手机号码：</label>
+                        <label class="col-sm-4 control-label">手机号码：</label>
                         <div class="col-sm-8">
-                            <input id="phonenumber" name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11">
+                            <input id="phonenumber" name="phonenumber" placeholder="请输入手机号码" class="form-control isPhone" type="text" maxlength="11">
                         </div>
                     </div>
                 </div>
@@ -127,7 +130,7 @@
 		            align: 'center',
 		            title: '商品名称',
 		            formatter: function(value, row, index) {
-		            	var html = $.common.sprintf("<input class='form-control' type='text' name='goods[%s].name' value='%s'>", index, value);
+		            	var html = $.common.sprintf("<input class='form-control goodsName' type='text' name='goods[%s].name' value='%s'>", index, value);
 		        		return html;
                     }
 		        },
@@ -136,7 +139,7 @@
 		            align: 'center',
 		            title: '商品重量',
 		            formatter: function(value, row, index) {
-		            	var html = $.common.sprintf("<input class='form-control' type='text' name='goods[%s].weight' value='%s'>", index, value);
+		            	var html = $.common.sprintf("<input class='form-control goodsWeight' type='text' name='goods[%s].weight' value='%s'>", index, value);
 		        		return html;
                     }
 		        },
@@ -179,11 +182,21 @@
 		    $.table.init(options);
 		});
 	    
-	    /* 主子表-提交 */
+        $.validator.addMethod("goodsName", function(value, element) {
+            return !this.optional(element);
+        }, "商品名称必填。");
+        
+        $.validator.addMethod("goodsWeight", function(value, element) {
+            return !this.optional(element) && (value <= 100 && value >= 0);
+        }, "商品重量长度区间0-100。");
+        
+        /* 主子表-提交 */
         function submitHandler(index, layero){
-        	var data = $("#form-add").serializeArray();
+            if ($.validate.form()) {
-        	alert(JSON.stringify(data))
+                var data = $("#form-add").serializeArray();
-			$.operate.saveModal("/demo/operate/customer/add", data);
+                alert(JSON.stringify(data))
+                $.operate.saveModal("/demo/operate/customer/add", data);
+            }
         }
 	    
         $("input[name='birthday']").datetimepicker({

ruoyi-admin/src/main/resources/templates/include.html

@@ -7,19 +7,19 @@
 	<meta name="description" content="">
 	<title th:text="${title}"></title>
 	<link th:href="@{/css/bootstrap.min.css?v=3.3.7}" rel="stylesheet"/>
-	<link th:href="@{/css/font-awesome.min.css?v=4.7.4}" rel="stylesheet"/>
+	<link th:href="@{/css/font-awesome.min.css?v=4.7.0}" rel="stylesheet"/>
 	<!-- bootstrap-table 表格插件样式 -->
 	<link th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css?v=1.18.3}" rel="stylesheet"/>
 	<link th:href="@{/css/animate.min.css?v=20210831}" rel="stylesheet"/>
 	<link th:href="@{/css/style.min.css?v=20210831}" rel="stylesheet"/>
-	<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.4}" rel="stylesheet"/>
+	<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.7}" rel="stylesheet"/>
 </head>
 
 <!-- 通用JS -->
 <div th:fragment="footer">
     <script th:inline="javascript"> var ctx = [[@{/}]]; var lockscreen = [[${session.lockscreen}]]; if(lockscreen){window.top.location=ctx+"lockscreen";} </script>
     <a id="scroll-up" href="#" class="btn btn-sm display"><i class="fa fa-angle-double-up"></i></a>
-	<script th:src="@{/js/jquery.min.js?v=3.6.0}"></script>
+	<script th:src="@{/js/jquery.min.js?v=3.6.3}"></script>
 	<script th:src="@{/js/bootstrap.min.js?v=3.3.7}"></script>
 	<!-- bootstrap-table 表格插件 -->
 	<script th:src="@{/ajax/libs/bootstrap-table/bootstrap-table.min.js?v=1.18.3}"></script>
@@ -35,9 +35,9 @@
 	<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js?v=2.70.0}"></script>
     <script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>
 	<script th:src="@{/ajax/libs/layer/layer.min.js?v=3.5.1}"></script>
-	<script th:src="@{/ajax/libs/layui/layui.min.js?v=2.6.8}"></script>
+	<script th:src="@{/ajax/libs/layui/layui.min.js?v=2.7.5}"></script>
-	<script th:src="@{/ruoyi/js/common.js?v=4.7.4}"></script>
+	<script th:src="@{/ruoyi/js/common.js?v=4.7.7}"></script>
-	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.4}"></script>
+	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.7}"></script>
 </div>
 
 <!-- ztree树插件 -->
@@ -108,10 +108,10 @@
 
 <!-- fileinput文件上传插件 -->
 <div th:fragment="bootstrap-fileinput-css">
-    <link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=5.2.4}" rel="stylesheet"/>
+    <link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=5.5.2}" rel="stylesheet"/>
 </div>
 <div th:fragment="bootstrap-fileinput-js">
-    <script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=5.2.4}"></script>
+    <script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=5.5.2}"></script>
 </div>
 
 <!-- duallistbox双列表框插件 -->

ruoyi-admin/src/main/resources/templates/index-topnav.html

@@ -14,7 +14,8 @@
     <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/skins.css?v=20200902}" rel="stylesheet"/>
-    <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.4}" rel="stylesheet"/>
+    <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.7}" rel="stylesheet"/>
+    <style type="text/css">.fixed-sidebar .nav:not(.navbar-toolbar)>li.active{border-left:0px!important;}</style>
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
 <div id="wrapper">
@@ -98,6 +99,7 @@
 					<li><a class="menuItem" th:href="@{/demo/form/grid}">栅格</a></li>
 					<li><a class="menuItem" th:href="@{/demo/form/select}">下拉框</a></li>
 					<li><a class="menuItem" th:href="@{/demo/form/timeline}">时间轴</a></li>
+					<li><a class="menuItem" th:href="@{/demo/form/progress_bars}">进度条</a></li>
 					<li><a class="menuItem" th:href="@{/demo/form/basic}">基本表单</a></li>
 					<li><a class="menuItem" th:href="@{/demo/form/cards}">卡片列表</a></li>
 					<li><a class="menuItem" th:href="@{/demo/form/jasny}">功能扩展</a></li>
@@ -316,8 +318,8 @@
 <script th:src="@{/js/jquery.contextMenu.min.js}"></script>
 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
-<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.4}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.7}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.7.4}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.7.7}"></script>
 <script th:src="@{/ruoyi/index.js?v=20201208}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:src="@{/js/resize-tabs.js}"></script>

ruoyi-admin/src/main/resources/templates/index.html

@@ -14,7 +14,7 @@
     <link th:href="@{/css/animate.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/skins.css}" rel="stylesheet"/>
-    <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.4}" rel="stylesheet"/>
+    <link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.7}" rel="stylesheet"/>
 </head>
 <body class="fixed-sidebar full-height-layout gray-bg" th:classappend="${isMobile} ? 'canvas-menu'" style="overflow: hidden">
 <div id="wrapper">
@@ -80,6 +80,7 @@
 								<li><a class="menuItem" th:href="@{/demo/form/grid}">栅格</a></li>
 								<li><a class="menuItem" th:href="@{/demo/form/select}">下拉框</a></li>
 								<li><a class="menuItem" th:href="@{/demo/form/timeline}">时间轴</a></li>
+								<li><a class="menuItem" th:href="@{/demo/form/progress_bars}">进度条</a></li>
 								<li><a class="menuItem" th:href="@{/demo/form/basic}">基本表单</a></li>
 								<li><a class="menuItem" th:href="@{/demo/form/cards}">卡片列表</a></li>
 								<li><a class="menuItem" th:href="@{/demo/form/jasny}">功能扩展</a></li>
@@ -263,8 +264,8 @@
 <script th:src="@{/js/jquery.contextMenu.min.js}"></script>
 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
 <script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
-<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.4}"></script>
+<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.7}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.7.4}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.7.7}"></script>
 <script th:src="@{/ruoyi/index.js?v=20201208}"></script>
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">

ruoyi-admin/src/main/resources/templates/lock.html

@@ -38,7 +38,7 @@
 <script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script>
 <script src="../static/js/three.min.js" th:src="@{/js/three.min.js}"></script>
 <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
-<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.4}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.7}"></script>
 </body>
 <script th:inline="javascript">
     var ctx = [[@{/}]];

ruoyi-admin/src/main/resources/templates/login.html

@@ -9,7 +9,7 @@
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
-    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.4}" rel="stylesheet"/>
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.7}" rel="stylesheet"/>
     <!-- 360浏览器急速模式 -->
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
@@ -65,7 +65,7 @@
         </div>
         <div class="signup-footer">
             <div class="pull-left">
-                Copyright © 2018-2022 ruoyi.vip All Rights Reserved. <br>
+                Copyright © 2018-2023 ruoyi.vip All Rights Reserved. <br>
             </div>
         </div>
     </div>
@@ -76,7 +76,7 @@
 <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
 <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
-<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.4}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.7}"></script>
 <script src="../static/ruoyi/login.js" th:src="@{/ruoyi/login.js}"></script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/main.html

@@ -79,7 +79,7 @@
                     <div class="ibox-content">
                         <p><i class="fa fa-send-o"></i> 官网：<a href="http://www.ruoyi.vip" target="_blank">http://www.ruoyi.vip</a>
                         </p>
-                        <p><i class="fa fa-qq"></i> QQ群：<s>满1389287</s> <s>满1679294</s> <s>满1529866</s> <s>满1772718</s> <s>满1366522</s> <s>满1382251</s> <s>满1145125</s> <s>满86752435</s> <s>满134072510</s> <s>满210336300</s> <s>满339522636</s> <s>满130035985</s> <s>满143151071</s> <s>满158781320</s> <s>满201531282</s> <s>满101526938</s> <s>满264355400</s> <s>满298522656</s> <s>满139845794</s> <a href="https://jq.qq.com/?_wv=1027&k=p86p2AJX" target="_blank">213650505</a> 
+                        <p><i class="fa fa-qq"></i> QQ群：<s>满1389287</s> <s>满1679294</s> <s>满1529866</s> <s>满1772718</s> <s>满1366522</s> <s>满1382251</s> <s>满1145125</s> <s>满86752435</s> <s>满134072510</s> <s>满210336300</s> <s>满339522636</s> <s>满130035985</s> <s>满143151071</s> <s>满158781320</s> <s>满201531282</s> <s>满101526938</s> <s>满264355400</s> <s>满298522656</s> <s>满139845794</s>  <s>满185760789</s> <a href="https://jq.qq.com/?_wv=1027&k=7FplYUnR" target="_blank">175104288</a> 
                         </p>
                         <p><i class="fa fa-weixin"></i> 微信：<a href="javascript:;">/ *若依</a>
                         </p>
@@ -96,13 +96,132 @@
                     <div class="ibox-content no-padding">
                         <div class="panel-body">
                             <div class="panel-group" id="version">
+                            <div class="panel panel-default">
+								<div class="panel-heading">
+								   <h5 class="panel-title">
+									   <a data-toggle="collapse" data-parent="#version" href="#v477">v4.7.7</a><code class="pull-right">2023.04.14</code>
+								   </h5>
+								</div>
+								<div id="v477" class="panel-collapse collapse in">
+									<div class="panel-body">
+									   <ol>
+									        <li>操作日志新增消耗时间属性</li>
+									        <li>日志管理使用索引提升查询性能</li>
+									        <li>日志注解支持排除指定的请求参数</li>
+									        <li>新增监控页面图标显示</li>
+									        <li>新增支持登录IP黑名单限制</li>
+									        <li>更新fontawesome图标示例</li>
+									        <li>屏蔽定时任务bean违规的字符</li>
+									        <li>支持自定义隐藏属性列过滤子对象</li>
+									        <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
+									        <li>升级jquery到最新版v3.6.3</li>
+									        <li>升级layui到最新版本2.7.6</li>
+									        <li>升级jasny-bootstrap到最新版4.0.0</li>
+									        <li>升级oshi到最新版本6.4.1</li>
+									        <li>升级druid到最新版本1.2.16</li>
+									        <li>修复异步表格树子项排序问题</li>
+									        <li>修复冻结列不支持IE浏览器的问题</li>
+									        <li>修复主子表使用suggest插件无法新增问题</li>
+									        <li>修复菜单栏快速点击导致展开折叠样式问题</li>
+									        <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
+									        <li>修复异步加载表格树重置列表父节点展开异常问题</li>
+									        <li>修复页签属性refresh为undefined时页面被刷新问题</li>
+									        <li>移除apache/commons-fileupload依赖</li>
+									        <li>优化前端属性提醒说明</li>
+									        <li>优化用户导入更新时需获取用户编号问题</li>
+									        <li>优化主子表根据序号删除方法加入表格ID参数</li>
+									        <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
+									        <li>优化在线用户服务缓存改为从Bean容器获取不使用自动装配</li>
+									        <li>优化表格示例行拖拽后列表底部总记录条数变成了undefined问题</li>
+									        <li>其他细节优化</li>
+										</ol>
+									</div>
+								</div>
+							</div>
+                            <div class="panel panel-default">
+								<div class="panel-heading">
+								   <h5 class="panel-title">
+									   <a data-toggle="collapse" data-parent="#version" href="#v476">v4.7.6</a><code class="pull-right">2022.12.16</code>
+								   </h5>
+								</div>
+								<div id="v476" class="panel-collapse collapse">
+									<div class="panel-body">
+									   <ol>
+									        <li>定时任务违规的字符</li>
+									        <li>忽略不必要的属性数据返回</li>
+									        <li>导入更新用户数据前校验数据权限</li>
+									        <li>修改参数键名时移除前缓存配置</li>
+									        <li>修改用户登录账号进行重复验证</li>
+									        <li>兼容Excel下拉框内容过多无法显示</li>
+									        <li>升级oshi到最新版本6.4.0</li>
+									        <li>升级kaptcha到最新版2.3.3</li>
+									        <li>升级druid到最新版本1.2.15</li>
+									        <li>升级shiro到最新版本1.10.1</li>
+									        <li>升级pagehelper到最新版1.4.6</li>
+									        <li>升级bootstrap-fileinput到最新版本5.5.2</li>
+									        <li>修复sheet超出最大行数异常问题</li>
+									        <li>修复关闭父页签后提交无法跳转的问题</li>
+									        <li>修复操作日志类型多选导出不生效问题</li>
+									        <li>修复导出包含空子列表数据异常的问题</li>
+									        <li>优化树形表格层级显示</li>
+									        <li>优化SQL关键字检查防止注入</li>
+									        <li>优化用户管理重置时取消部门选择</li>
+									        <li>优化代码生成同步后字典值NULL问题</li>
+									        <li>优化导出对象的子列表为空会出现[]问题</li>
+									        <li>优化select2搜索下拉后校验必填样式问题</li>
+									        <li>其他细节优化</li>
+										</ol>
+									</div>
+								</div>
+							</div>
+                            <div class="panel panel-default">
+								<div class="panel-heading">
+								   <h5 class="panel-title">
+									   <a data-toggle="collapse" data-parent="#version" href="#v475">v4.7.5</a><code class="pull-right">2022.09.05</code>
+								   </h5>
+								</div>
+								<div id="v475" class="panel-collapse collapse">
+									<div class="panel-body">
+									   <ol>
+									        <li>Excel支持导出对象的子列表方法</li>
+									        <li>数据逻辑删除不进行唯一验证</li>
+									        <li>优化多角色数据权限匹配规则</li>
+									        <li>新增主子表提交校验示例</li>
+									        <li>支持自定义隐藏Excel属性列</li>
+									        <li>Excel注解支持backgroundColor属性设置背景颜色</li>
+									        <li>菜单配置刷新时Tab页签切换时刷新</li>
+									        <li>增加对AjaxResult消息结果类型的判断</li>
+									        <li>新增示例（进度条）</li>
+									        <li>新增内容编码/解码方便插件集成使用</li>
+									        <li>升级jquery到最新版3.6.1</li>
+									        <li>升级layui到最新版本2.7.5</li>
+									        <li>升级shiro到最新版本1.9.1</li>
+									        <li>升级druid到最新版本1.2.11</li>
+									        <li>升级pagehelper到最新版1.4.3</li>
+									        <li>升级oshi到最新版本6.2.2</li>
+									        <li>修复树表onLoadSuccess不生效的问题</li>
+											<li>修复用户分配角色大于默认页数丢失问题</li>
+									        <li>定时任务支持执行父类方法</li>
+									        <li>自动设置切换多个树表格实例配置</li>
+									        <li>页签创建标题优先data-title属性</li>
+									        <li>优化任务过期不执行调度</li>
+									        <li>优化横向菜单下激活菜单样式</li>
+									        <li>优化按钮打开窗口后按回车反复弹出</li>
+									        <li>优化excel/scale属性导出单元格数值类型</li>
+									        <li>优化druid开启wall过滤器出现的异常问题</li>
+									        <li>优化多个相同角色数据导致权限SQL重复问题</li>
+									        <li>其他细节优化</li>
+										</ol>
+									</div>
+								</div>
+							</div>
                             <div class="panel panel-default">
 								<div class="panel-heading">
 								   <h5 class="panel-title">
 									   <a data-toggle="collapse" data-parent="#version" href="#v474">v4.7.4</a><code class="pull-right">2022.06.01</code>
 								   </h5>
 								</div>
-								<div id="v474" class="panel-collapse collapse in">
+								<div id="v474" class="panel-collapse collapse">
 									<div class="panel-body">
 									   <ol>
 									        <li>用户头像上传图片格式限制</li>

ruoyi-admin/src/main/resources/templates/monitor/cache/cache.html

@@ -11,7 +11,7 @@
                 <div class="col-sm-4">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>缓存列表</h5>
+                            <h5><i class="fa fa-bars"></i> 缓存列表</h5>
                             <div class="ibox-tools">
                                 <a href="javascript:getCacheNames()"><i class="fa fa-refresh"></i></a>
                             </div>
@@ -39,7 +39,7 @@
                 <div class="col-sm-4">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>键名列表</h5>
+                            <h5><i class="fa fa-key"></i> 键名列表</h5>
                             <div class="ibox-tools">
                                 <a href="javascript:getCacheKeys('', true)"><i class="fa fa-refresh"></i></a>
                             </div>
@@ -53,8 +53,8 @@
                                         <th>操作</th>
                                     </tr>
                                 </thead>
-                                <tbody id="cacheKyes">
+                                <tbody id="cacheKeys">
-                                    <tr th:fragment="fragment-cache-kyes" th:each="cacheKey, stat : ${cacheKyes}">
+                                    <tr th:fragment="fragment-cache-kyes" th:each="cacheKey, stat : ${cacheKeys}">
                                         <td>[[${stat.index + 1}]]</td>
                                         <td style="word-wrap:break-word;word-break:break-all;" th:onclick="getCacheValue([[${cacheName}]], [[${cacheKey}]])">[[${cacheKey}]]</td>
                                         <td style="width: 50px"><a href="#" th:onclick="clearCacheKey([[${cacheName}]], [[${cacheKey}]])" title="清空"><i class="fa fa-trash-o text-danger"></i></a></td>
@@ -68,7 +68,7 @@
                 <div class="col-sm-4">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>缓存内容</h5>
+                            <h5><i class="fa fa-file-text"></i> 缓存内容</h5>
                             <div class="ibox-tools">
                                 <a href="javascript:clearAll()"><i class="fa fa-refresh"></i> 清理全部</a>
                             </div>
@@ -125,7 +125,7 @@ function getCacheKeys(cacheName, isMsg) {
             "fragment": 'fragment-cache-kyes'
         },
         success: function(data) {
-            $("#cacheKyes").html(data);
+            $("#cacheKeys").html(data);
             $("#cacheName").val(_cacheName);
             if (isMsg) {
                 $.modal.msgSuccess("刷新键名列表成功");
@@ -174,7 +174,7 @@ function clearCacheKey(cacheName, cacheKey) {
 function clearAll(){
 	$.get(prefix + "/clearAll", function(result) {
 		if (result.code == web_status.SUCCESS) {
-			$.modal.msgSuccess("清理缓存成功")
+			$.modal.msgSuccess("清理全部缓存成功")
         } else {
             $.modal.msgError(result.msg);
         }

ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html

@@ -24,9 +24,9 @@
 							</li>
 							<li class="select-time">
 								<label>登录时间： </label>
-								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间"/>
 								<span>-</span>
-								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间"/>
 							</li>
 							<li>
 								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -69,6 +69,7 @@
 		        cleanUrl: prefix + "/clean",
 		        removeUrl: prefix + "/remove",
 		        exportUrl: prefix + "/export",
+		        queryParams: queryParams,
 		        sortName: "loginTime",
 		        sortOrder: "desc",
 		        modalName: "登录日志",
@@ -90,7 +91,10 @@
 		        },
 		        {
 		            field: 'ipaddr',
-		            title: '登录地址'
+		            title: '登录地址',
+		            formatter: function(value, row, index) {
+                    	return $.table.tooltip(value);
+                    }
 		        },
 		        {
 		            field: 'loginLocation',
@@ -125,6 +129,15 @@
 		    $.table.init(options);
 		});
 		
+		function queryParams(params) {
+			var search = $.table.queryParams(params);
+			search.params = {
+			    beginTime : beginOfTime($("#startTime").val()),
+			    endTime : endOfTime($("#endTime").val())
+			};
+			return search;
+		}
+		
 		function unlock() {
             $.operate.post(prefix + "/unlock?loginName=" + $.table.selectColumns("loginName"));
         }

ruoyi-admin/src/main/resources/templates/monitor/operlog/detail.html

@@ -19,12 +19,7 @@
 		</div>
 		<div class="form-group">
 			<label class="col-sm-2 control-label">请求地址：</label>
-			<div class="form-control-static" th:text="${operLog.operUrl}">
+			<div class="form-control-static" th:text="${operLog.requestMethod} + ' - ' + ${operLog.operUrl} + '  ' + '(' + '耗时' + ${operLog.costTime} + '毫秒)'">
-			</div>
-		</div>
-		<div class="form-group">
-			<label class="col-sm-2 control-label">请求方式：</label>
-			<div class="form-control-static" th:text="${operLog.requestMethod}">
 			</div>
 		</div>
 		<div class="form-group">

ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html

@@ -18,7 +18,7 @@
 								<label>操作人员： </label><input type="text" name="operName"/>
 							</li>
 							<li class="select-selectpicker">
-								<label>操作类型： </label><select id="businessTypes" th:with="type=${@dict.getType('sys_oper_type')}" class="selectpicker" data-none-selected-text="请选择" multiple>
+								<label>操作类型： </label><select id="businessTypes" name="businessTypes" th:with="type=${@dict.getType('sys_oper_type')}" class="selectpicker" data-none-selected-text="请选择" multiple>
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 								</select>
 							</li>
@@ -30,9 +30,9 @@
 							</li>
 							<li class="select-time">
 								<label>操作时间： </label>
-								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间"/>
 								<span>-</span>
-								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间"/>
 							</li>
 							<li>
 								<a class="btn btn-primary btn-rounded btn-sm" onclick="searchPre()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -92,14 +92,17 @@
 		        },
 		        {
 		            field: 'title',
-		            title: '系统模块'
+		            title: '系统模块',
-		        },
+                    formatter: function(value, row, index) {
+                        return $.table.tooltip(value);
+                    }
+                },
 		        {
 		            field: 'businessType',
 		            title: '操作类型',
 		            align: 'center',
 		            formatter: function(value, row, index) {
-		            	return $.table.selectDictLabel(datas, value);
+		                return $.table.selectDictLabel(datas, value);
 		            }
 		        },
 		        {
@@ -136,6 +139,14 @@
 		            title: '操作时间',
 		            sortable: true
 		        },
+		        {
+		            field: 'costTime',
+		            title: '消耗时间',
+		            sortable: true,
+		            formatter: function(value, row, index) {
+		                return $.common.sprintf("%s毫秒", value);
+		            }
+		        },
 		        {
 		            title: '操作',
 		            align: 'center',
@@ -151,6 +162,10 @@
 		
 		function queryParams(params) {
 			var search = $.table.queryParams(params);
+			search.params = {
+			    beginTime : beginOfTime($("#startTime").val()),
+			    endTime : endOfTime($("#endTime").val())
+			};
 			search.businessTypes = $.common.join($('#businessTypes').selectpicker('val'));
 			return search;
 		}
@@ -160,6 +175,7 @@
 		}
 		
 		function resetPre() {
+			resetDate();
 			$("#operlog-form")[0].reset();
 			$("#businessTypes").selectpicker('refresh');
 			$.table.search('operlog-form', 'bootstrap-table');

ruoyi-admin/src/main/resources/templates/monitor/server/server.html

@@ -10,7 +10,7 @@
                 <div class="col-sm-6">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>CPU</h5>
+                            <h5><i class="fa fa-microchip"></i> CPU</h5>
                             <div class="ibox-tools">
                                 <a class="collapse-link"><i class="fa fa-chevron-up"></i>
                                 </a>
@@ -51,7 +51,7 @@
                 <div class="col-sm-6">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>内存</h5>
+                            <h5><i class="fa fa-ticket"></i> 内存</h5>
                             <div class="ibox-tools">
                                 <a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
                                 <a class="close-link"><i class="fa fa-times"></i></a>
@@ -98,7 +98,7 @@
                 <div class="col-sm-12">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>服务器信息</h5>
+                            <h5><i class="fa fa-windows"></i> 服务器信息</h5>
                             <div class="ibox-tools">
                                 <a class="collapse-link">
                                     <i class="fa fa-chevron-up"></i>
@@ -138,7 +138,7 @@
                 <div class="col-sm-12">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>Java虚拟机信息</h5>
+                            <h5><i class="fa fa-coffee"></i> Java虚拟机信息</h5>
                             <div class="ibox-tools">
                                 <a class="collapse-link">
                                     <i class="fa fa-chevron-up"></i>
@@ -191,7 +191,7 @@
                 <div class="col-sm-12">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <h5>磁盘状态</h5>
+                            <h5><i class="fa fa-hdd-o"></i> 磁盘状态</h5>
                             <div class="ibox-tools">
                                 <a class="collapse-link">
                                     <i class="fa fa-chevron-up"></i>

ruoyi-admin/src/main/resources/templates/register.html

@@ -9,7 +9,7 @@
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
     <link href="../static/css/login.min.css" th:href="@{/css/login.min.css}" rel="stylesheet"/>
-    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.4}" rel="stylesheet"/>
+    <link href="../static/ruoyi/css/ry-ui.css" th:href="@{/ruoyi/css/ry-ui.css?v=4.7.7}" rel="stylesheet"/>
     <!-- 360浏览器急速模式 -->
     <meta name="renderer" content="webkit">
     <!-- 避免IE使用兼容模式 -->
@@ -64,7 +64,7 @@
         </div>
         <div class="signup-footer">
             <div class="pull-left">
-                &copy; 2018-2022 All Rights Reserved. RuoYi <br>
+                &copy; 2018-2023 All Rights Reserved. RuoYi <br>
             </div>
         </div>
     </div>
@@ -74,7 +74,7 @@
 <script src="../static/ajax/libs/validate/jquery.validate.min.js" th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
 <script src="../static/ajax/libs/layer/layer.min.js" th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script src="../static/ajax/libs/blockUI/jquery.blockUI.js" th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
-<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.4}"></script>
+<script src="../static/ruoyi/js/ry-ui.js" th:src="@{/ruoyi/js/ry-ui.js?v=4.7.7}"></script>
 <script src="../static/ruoyi/register.js" th:src="@{/ruoyi/register.js}"></script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/skin.html

@@ -140,7 +140,7 @@
 </ul>
 </body>
 <script th:src="@{/js/jquery.min.js}"></script>
-<script th:src="@{/ruoyi/js/common.js?v=4.7.4}"></script>
+<script th:src="@{/ruoyi/js/common.js?v=4.7.7}"></script>
 <script type="text/javascript">
 //皮肤样式列表
 var skins = ["skin-blue", "skin-green", "skin-purple", "skin-red", "skin-yellow"];

ruoyi-admin/src/main/resources/templates/system/config/add.html

@@ -57,9 +57,6 @@
 	                        "configKey": function() {
 	                            return $.common.trim($("#configKey").val());
 	                        }
-	                    },
-	                    dataFilter: function(data, type) {
-	                        return $.validate.unique(data);
 	                    }
 	                }
 	            },

ruoyi-admin/src/main/resources/templates/system/config/edit.html

@@ -61,9 +61,6 @@
 	                        "configKey": function() {
 	                        	return $.common.trim($("#configKey").val());
 	                        }
-	                    },
-	                    dataFilter: function(data, type) {
-	                        return $.validate.unique(data);
 	                    }
 	                }
 	            },

ruoyi-admin/src/main/resources/templates/system/dept/add.html

@@ -76,9 +76,6 @@
 		                	"deptName" : function() {
 		                        return $.common.trim($("#deptName").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},
@@ -116,7 +113,7 @@
 			var options = {
 				title: '部门选择',
 				width: "380",
-				url: prefix + "/selectDeptTree/" + treeId,
+				url: prefix + "/selectDeptTree/" + treeId + "/0",
 				callBack: doSubmit
 			};
 			$.modal.openOptions(options);

ruoyi-admin/src/main/resources/templates/system/dept/edit.html

@@ -80,9 +80,6 @@
 		        			"deptName": function() {
 		                        return $.common.trim($("#deptName").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/dept/tree.html

@@ -32,7 +32,7 @@
 	    var deptId = [[${deptId}]];
 	    var excludeId = [[${excludeId}]];
 		$(function() {
-			var url = $.common.isEmpty(excludeId) ? prefix + "/treeData": prefix + "/treeData/" + excludeId;
+			var url = prefix + "/treeData/" + excludeId;
 			var options = {
 		        url: url,
 		        expandLevel: 2,

ruoyi-admin/src/main/resources/templates/system/dict/type/add.html

@@ -16,6 +16,7 @@
 				<label class="col-sm-3 control-label is-required">字典类型：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictType" id="dictType" required>
+					<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 数据存储中的Key值，如：sys_user_sex</span>
 				</div>
 			</div>
 			<div class="form-group">
@@ -52,9 +53,6 @@
 		                	name : function() {
 		                        return $.common.trim($("#dictType").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/dict/type/edit.html

@@ -17,6 +17,7 @@
 				<label class="col-sm-3 control-label is-required">字典类型：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="dictType" id="dictType" th:field="*{dictType}" required>
+					<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 数据存储中的Key值，如：sys_user_sex</span>
 				</div>
 			</div>
 			<div class="form-group">
@@ -56,9 +57,6 @@
 		                	dictType : function() {
 		                		return $.common.trim($("#dictType").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/menu/add.html

@@ -31,7 +31,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">请求地址：</label>
+				<label class="col-sm-3 control-label" title="访问的请求地址，如：`/system/user`，如外网地址需内链访问则以`http(s)://`开头">请求地址：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-8">
 					<input id="url" name="url" class="form-control" type="text">
 				</div>
@@ -53,13 +53,13 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label is-required">显示排序：</label>
+				<label class="col-sm-3 control-label is-required" title="数字越小越靠前">显示排序：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="orderNum" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">图标：</label>
+				<label class="col-sm-3 control-label" title="单击选择需要使用的FontAwesome图标">图标：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-8">
 					<input id="icon" name="icon" class="form-control" type="text" placeholder="选择图标">
                     <div class="ms-parent" style="width: 100%;">
@@ -70,7 +70,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">菜单状态：</label>
+				<label class="col-sm-3 control-label" title="选择隐藏则菜单将不会出现在侧边栏，也没有权限被访问">菜单状态：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-3">
 				    <div class="radio-box" th:each="dict : ${@dict.getType('sys_show_hide')}">
 						<input type="radio" th:id="${dict.dictCode}" name="visible" th:value="${dict.dictValue}" th:checked="${dict.default}">
@@ -113,9 +113,6 @@
                         	"menuName" : function() {
                                 return $.common.trim($("#menuName").val());
                             }
-                        },
-                        dataFilter: function(data, type) {
-                        	return $.validate.unique(data);
                         }
                     }
         		},

ruoyi-admin/src/main/resources/templates/system/menu/edit.html

@@ -32,7 +32,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">请求地址：</label>
+				<label class="col-sm-3 control-label" title="访问的请求地址，如：`/system/user`，如外网地址需内链访问则以`http(s)://`开头">请求地址：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-8">
 					<input id="url" name="url" class="form-control" type="text" th:field="*{url}">
 				</div>
@@ -54,13 +54,13 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label is-required">显示排序：</label>
+				<label class="col-sm-3 control-label is-required" title="数字越小越靠前">显示排序：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-8">
 					<input class="form-control" type="text" name="orderNum" th:field="*{orderNum}" required>
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">图标：</label>
+				<label class="col-sm-3 control-label" title="单击选择需要使用的FontAwesome图标">图标：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-8">
 					<input id="icon" name="icon" class="form-control" type="text" placeholder="选择图标" th:field="*{icon}">
                     <div class="ms-parent" style="width: 100%;">
@@ -71,7 +71,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">菜单状态：</label>
+				<label class="col-sm-3 control-label" title="选择隐藏则菜单将不会出现在侧边栏，也没有权限被访问">菜单状态：<i class="fa fa-question-circle-o"></i></label>
 				<div class="col-sm-3">
 					<div class="radio-box" th:each="dict : ${@dict.getType('sys_show_hide')}">
 						<input type="radio" th:id="${dict.dictCode}" name="visible" th:value="${dict.dictValue}" th:field="*{visible}">
@@ -122,9 +122,6 @@
                 			"menuName": function() {
                                 return $.common.trim($("#menuName").val());
                             }
-                        },
-                        dataFilter: function(data, type) {
-                        	return $.validate.unique(data);
                         }
                     }
         		},

ruoyi-admin/src/main/resources/templates/system/post/add.html

@@ -57,9 +57,6 @@
 		                	"postName" : function() {
 		                        return $.common.trim($("#postName").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},
@@ -72,9 +69,6 @@
 		                	"postCode" : function() {
 		                        return $.common.trim($("#postCode").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/post/edit.html

@@ -61,9 +61,6 @@
 		                	"postName" : function() {
 		                        return $.common.trim($("#postName").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},
@@ -79,9 +76,6 @@
 		                	"postCode" : function() {
 		                		return $.common.trim($("#postCode").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/role/add.html

@@ -81,9 +81,6 @@
 		                	"roleName" : function() {
 		                		return $.common.trim($("#roleName").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},
@@ -96,9 +93,6 @@
 		                	"roleKey" : function() {
 		                        return $.common.trim($("#roleKey").val());
 		                    }
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/role/dataScope.html

@@ -52,7 +52,7 @@
 	<script type="text/javascript">
 	
 	    $(function() {
-			var url = ctx + "system/dept/roleDeptTreeData?roleId=" + $("#roleId").val();
+			var url = ctx + "system/role/deptTreeData?roleId=" + $("#roleId").val();
 			var options = {
 				id: "deptTrees",
 		        url: url,

ruoyi-admin/src/main/resources/templates/system/role/edit.html

@@ -85,9 +85,6 @@
 							"roleName": function() {
 							    return $.common.trim($("#roleName").val());
 							}
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},
@@ -103,9 +100,6 @@
 							"roleKey": function() {
 							    return $.common.trim($("#roleKey").val());
 							}
-		                },
-		                dataFilter: function(data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/user/add.html

@@ -163,9 +163,6 @@
                         	"loginName": function() {
                                 return $.common.trim($("#loginName").val());
                             }
-                        },
-                        dataFilter: function(data, type) {
-                        	return $.validate.unique(data);
                         }
                     }
         		},
@@ -183,9 +180,6 @@
                             "email": function () {
                                 return $.common.trim($("#email").val());
                             }
-                        },
-                        dataFilter: function (data, type) {
-                        	return $.validate.unique(data);
                         }
                     }
         		},
@@ -199,9 +193,6 @@
                             "phonenumber": function () {
                                 return $.common.trim($("#phonenumber").val());
                             }
-                        },
-                        dataFilter: function (data, type) {
-                        	return $.validate.unique(data);
                         }
                     }
         		},
@@ -239,7 +230,7 @@
         function selectDeptTree() {
         	var treeId = $("#treeId").val();
         	var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
-        	var url = ctx + "system/dept/selectDeptTree/" + deptId;
+        	var url = ctx + "system/user/selectDeptTree/" + deptId;
 			var options = {
 				title: '选择部门',
 				width: "380",
@@ -250,7 +241,6 @@
 		}
 		
 		function doSubmit(index, layero){
-			var tree = layero.find("iframe")[0].contentWindow.$._tree;
 			var body = $.modal.getChildFrame(index);
    			$("#treeId").val(body.find('#treeId').val());
    			$("#treeName").val(body.find('#treeName').val());

ruoyi-admin/src/main/resources/templates/system/user/authRole.html

@@ -100,9 +100,14 @@
 	    
 	    /* 添加角色-提交 */
         function submitHandler(index, layero){
-        	var rows = $.table.selectFirstColumns();
+            var roleIds = [];
-        	var data = { "userId": $("#userId").val(), "roleIds": rows.join() };
+        	var data = $('#bootstrap-table').bootstrapTable('getData');
-			$.operate.saveTab(prefix + "/insertAuthRole", data);
+        	for (var i = 0; i < data.length; i++) {
+        		if (data[i][0] || ($.common.isEmpty(data[i][0]) && data[i].flag)) {
+        		    roleIds.push(data[i].roleId)
+        		}
+			}
+        	$.operate.saveTab(prefix + "/insertAuthRole", { "userId": $("#userId").val(), "roleIds": roleIds.join() });
         }
     </script>
 </body>

ruoyi-admin/src/main/resources/templates/system/user/deptTree.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+	<th:block th:include="include :: header('部门树选择')" />
+	<th:block th:include="include :: ztree-css" />
+</head>
+<style>
+	body{height:auto;font-family: "Microsoft YaHei";}
+	button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
+</style>
+<body class="hold-transition box box-main">
+	<input id="treeId"   name="treeId"    type="hidden" th:value="${dept.deptId}"/>
+	<input id="treeName" name="treeName"  type="hidden" th:value="${dept.deptName}"/>
+	<div class="wrapper"><div class="treeShowHideButton" onclick="$.tree.toggleSearch();">
+		<label id="btnShow" title="显示搜索" style="display:none;">︾</label>
+		<label id="btnHide" title="隐藏搜索">︽</label>
+	</div>
+	<div class="treeSearchInput" id="search">
+		<label for="keyword">关键字：</label><input type="text" class="empty" id="keyword" maxlength="50">
+		<button class="btn" id="btn" onclick="$.tree.searchNode()"> 搜索 </button>
+	</div>
+	<div class="treeExpandCollapse">
+		<a href="#" onclick="$.tree.expand()">展开</a> /
+		<a href="#" onclick="$.tree.collapse()">折叠</a>
+	</div>
+	<div id="tree" class="ztree treeselect"></div>
+	</div>
+	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: ztree-js" />
+	<script th:inline="javascript">
+	    var prefix = ctx + "system/user"
+	    var deptId = [[${deptId}]];
+		$(function() {
+			var url = prefix + "/deptTreeData";
+			var options = {
+		        url: url,
+		        expandLevel: 2,
+		        onClick : zOnClick
+		    };
+			$.tree.init(options);
+		});
+		
+		function zOnClick(event, treeId, treeNode) {
+		    var treeId = treeNode.id;
+		    var treeName = treeNode.name;
+		    $("#treeId").val(treeId);
+		    $("#treeName").val(treeName);
+		}
+	</script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/user/edit.html

@@ -150,9 +150,6 @@
                 			"email": function() {
                                 return $.common.trim($("#email").val());
                             }
-                        },
-                        dataFilter: function (data, type) {
-                        	return $.validate.unique(data);
                         }
                     }
         		},
@@ -169,9 +166,6 @@
                 			"phonenumber": function() {
                                 return $.common.trim($("#phonenumber").val());
                             }
-                        },
-                        dataFilter: function (data, type) {
-                        	return $.validate.unique(data);
                         }
                     }
         		},
@@ -203,7 +197,7 @@
         /* 用户管理-修改-选择部门树 */
         function selectDeptTree() {
         	var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val();
-            var url = ctx + "system/dept/selectDeptTree/" + deptId;
+            var url = ctx + "system/user/selectDeptTree/" + deptId;
 		    var options = {
 				title: '选择部门',
 				width: "380",
@@ -214,7 +208,6 @@
 		}
 		
 		function doSubmit(index, layero){
-			var tree = layero.find("iframe")[0].contentWindow.$._tree;
 			var body = $.modal.getChildFrame(index);
    			$("#treeId").val(body.find('#treeId').val());
    			$("#treeName").val(body.find('#treeName').val());

ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html

@@ -197,9 +197,6 @@
 		        			"email": function() {
 		                        return $.common.trim($("#email").val());
 		                    }
-		                },
-		                dataFilter: function (data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},
@@ -217,9 +214,6 @@
 		        			"phonenumber": function() {
 		                        return $.common.trim($("#phonenumber").val());
 		                    }
-		                },
-		                dataFilter: function (data, type) {
-		                	return $.validate.unique(data);
 		                }
 		            }
 				},

ruoyi-admin/src/main/resources/templates/system/user/user.html

@@ -10,7 +10,7 @@
 		<div class="box box-main">
 			<div class="box-header">
 				<div class="box-title">
-					<i class="fa icon-grid"></i> 组织机构
+					<i class="fa fa-sitemap"></i> 组织机构
 				</div>
 				<div class="box-tools pull-right">
 				    <a type="button" class="btn btn-box-tool" href="#" onclick="dept()" title="管理部门"><i class="fa fa-edit"></i></a>
@@ -54,7 +54,7 @@
 								</li>
 								<li>
 									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 								</li>
 							</ul>
 						</div>
@@ -191,7 +191,7 @@
 		
 		function queryDeptTree()
 		{
-			var url = ctx + "system/dept/treeData";
+			var url = ctx + "system/user/deptTreeData";
 			var options = {
 		        url: url,
 		        expandLevel: 2,
@@ -222,6 +222,16 @@
 			queryDeptTree();
 		});
 		
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+		function resetPre() {
+			resetDate();
+			$("#user-form")[0].reset();
+			$("#deptId").val("");
+			$("#parentId").val("");
+			$(".curSelectedNode").removeClass("curSelectedNode");
+			$.table.search();
+		}
+
 		/* 用户管理-部门 */
 		function dept() {
 			var url = ctx + "system/dept";

ruoyi-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.7.4</version>
+        <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -77,12 +77,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <!-- 文件上传工具类 -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
         <!-- excel工具 -->
         <dependency>
             <groupId>org.apache.poi</groupId>

ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java

@@ -25,4 +25,9 @@ public @interface DataScope
      * 用户表的别名
      */
     public String userAlias() default "";
+
+    /**
+     * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
+     */
+    public String permission() default "";
 }

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -88,6 +88,11 @@ public @interface Excel
      */
     public String[] combo() default {};
 
+    /**
+     * 是否需要纵向合并单元格,应对需求:含有list集合单元格)
+     */
+    public boolean needMerge() default false;
+
     /**
      * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
      */
@@ -104,12 +109,27 @@ public @interface Excel
     public boolean isStatistics() default false;
 
     /**
-     * 导出类型（0数字 1字符串）
+     * 导出类型（0数字 1字符串 2图片）
      */
     public ColumnType cellType() default ColumnType.STRING;
 
     /**
-     * 导出字体颜色
+     * 导出列头背景色
+     */
+    public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
+
+    /**
+     * 导出列头字体颜色
+     */
+    public IndexedColors headerColor() default IndexedColors.WHITE;
+
+    /**
+     * 导出单元格背景色
+     */
+    public IndexedColors backgroundColor() default IndexedColors.WHITE;
+
+    /**
+     * 导出单元格字体颜色
      */
     public IndexedColors color() default IndexedColors.BLACK;
 

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java

@@ -42,4 +42,9 @@ public @interface Log
      * 是否保存响应的参数
      */
     public boolean isSaveResponseData() default true;
+
+    /**
+     * 排除指定的请求参数
+     */
+    public String[] excludeParamNames() default {};
 }

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -111,5 +111,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" };
 }

ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

@@ -36,56 +36,16 @@ public class UserConstants
     /** 是否为系统默认（是） */
     public static final String YES = "Y";
     
+    /** 是否唯一的返回标识 */
+    public final static boolean UNIQUE = true;
+    public final static boolean NOT_UNIQUE = false;
+
     /**
      * 用户名长度限制
      */
     public static final int USERNAME_MIN_LENGTH = 2;
     public static final int USERNAME_MAX_LENGTH = 20;
 
-    /** 登录名称是否唯一的返回结果码 */
-    public final static String USER_NAME_UNIQUE = "0";
-    public final static String USER_NAME_NOT_UNIQUE = "1";
-
-    /** 手机号码是否唯一的返回结果 */
-    public final static String USER_PHONE_UNIQUE = "0";
-    public final static String USER_PHONE_NOT_UNIQUE = "1";
-
-    /** e-mail 是否唯一的返回结果 */
-    public final static String USER_EMAIL_UNIQUE = "0";
-    public final static String USER_EMAIL_NOT_UNIQUE = "1";
-
-    /** 部门名称是否唯一的返回结果码 */
-    public final static String DEPT_NAME_UNIQUE = "0";
-    public final static String DEPT_NAME_NOT_UNIQUE = "1";
-
-    /** 角色名称是否唯一的返回结果码 */
-    public final static String ROLE_NAME_UNIQUE = "0";
-    public final static String ROLE_NAME_NOT_UNIQUE = "1";
-
-    /** 岗位名称是否唯一的返回结果码 */
-    public final static String POST_NAME_UNIQUE = "0";
-    public final static String POST_NAME_NOT_UNIQUE = "1";
-
-    /** 角色权限是否唯一的返回结果码 */
-    public final static String ROLE_KEY_UNIQUE = "0";
-    public final static String ROLE_KEY_NOT_UNIQUE = "1";
-
-    /** 岗位编码是否唯一的返回结果码 */
-    public final static String POST_CODE_UNIQUE = "0";
-    public final static String POST_CODE_NOT_UNIQUE = "1";
-
-    /** 菜单名称是否唯一的返回结果码 */
-    public final static String MENU_NAME_UNIQUE = "0";
-    public final static String MENU_NAME_NOT_UNIQUE = "1";
-
-    /** 字典类型是否唯一的返回结果码 */
-    public final static String DICT_TYPE_UNIQUE = "0";
-    public final static String DICT_TYPE_NOT_UNIQUE = "1";
-
-    /** 参数键名是否唯一的返回结果码 */
-    public final static String CONFIG_KEY_UNIQUE = "0";
-    public final static String CONFIG_KEY_NOT_UNIQUE = "1";
-
     /**
      * 密码长度限制
      */

ruoyi-common/src/main/java/com/ruoyi/common/core/context/PermissionContextHolder.java

@@ -0,0 +1,27 @@
+package com.ruoyi.common.core.context;
+
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 权限信息
+ * 
+ * @author ruoyi
+ */
+public class PermissionContextHolder
+{
+    private static final String PERMISSION_CONTEXT_ATTRIBUTES = "PERMISSION_CONTEXT";
+
+    public static void setContext(String permission)
+    {
+        RequestContextHolder.currentRequestAttributes().setAttribute(PERMISSION_CONTEXT_ATTRIBUTES, permission,
+                RequestAttributes.SCOPE_REQUEST);
+    }
+
+    public static String getContext()
+    {
+        return Convert.toStr(RequestContextHolder.currentRequestAttributes().getAttribute(PERMISSION_CONTEXT_ATTRIBUTES,
+                RequestAttributes.SCOPE_REQUEST));
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.core.domain;
 
 import java.util.HashMap;
+import java.util.Objects;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
@@ -81,20 +82,6 @@ public class AjaxResult extends HashMap<String, Object>
         }
     }
 
-    /**
-     * 方便链式调用
-     *
-     * @param key 键
-     * @param value 值
-     * @return 数据对象
-     */
-    @Override
-    public AjaxResult put(String key, Object value)
-    {
-        super.put(key, value);
-        return this;
-    }
-
     /**
      * 返回成功消息
      *
@@ -193,4 +180,38 @@ public class AjaxResult extends HashMap<String, Object>
     {
         return new AjaxResult(Type.ERROR, msg, data);
     }
+
+    /**
+     * 是否为成功消息
+     *
+     * @return 结果
+     */
+    public boolean isSuccess()
+    {
+        return !isError();
+    }
+
+    /**
+     * 是否为错误消息
+     *
+     * @return 结果
+     */
+    public boolean isError()
+    {
+        return Objects.equals(Type.ERROR.value, this.get(CODE_TAG));
+    }
+
+    /**
+     * 方便链式调用
+     *
+     * @param key 键
+     * @param value 值
+     * @return 数据对象
+     */
+    @Override
+    public AjaxResult put(String key, Object value)
+    {
+        super.put(key, value);
+        return this;
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -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()

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java

@@ -101,4 +101,14 @@ public class R<T> implements Serializable
     {
         this.data = data;
     }
+
+    public static <T> Boolean isError(R<T> ret)
+    {
+        return !isSuccess(ret);
+    }
+
+    public static <T> Boolean isSuccess(R<T> ret)
+    {
+        return R.SUCCESS == ret.getCode();
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java

@@ -131,7 +131,7 @@ public class SysDictData extends BaseEntity
 
     public boolean getDefault()
     {
-        return UserConstants.YES.equals(this.isDefault) ? true : false;
+        return UserConstants.YES.equals(this.isDefault);
     }
 
     public String getIsDefault()

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.domain.entity;
 
+import java.util.Set;
 import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -52,6 +53,9 @@ public class SysRole extends BaseEntity
     /** 部门组（数据权限） */
     private Long[] deptIds;
 
+    /** 角色菜单权限 */
+    private Set<String> permissions;
+
     public SysRole()
     {
 
@@ -177,6 +181,16 @@ public class SysRole extends BaseEntity
         this.deptIds = deptIds;
     }
 
+    public Set<String> getPermissions()
+    {
+        return permissions;
+    }
+
+    public void setPermissions(Set<String> permissions)
+    {
+        this.permissions = permissions;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -250,6 +250,7 @@ public class SysUser extends BaseEntity
         this.password = password;
     }
 
+    @JsonIgnore
     public String getSalt()
     {
         return salt;

ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java

@@ -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)
         {

ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java

@@ -7,7 +7,6 @@ package com.ruoyi.common.exception;
  */
 public class GlobalException extends RuntimeException
 {
-
     private static final long serialVersionUID = 1L;
 
     /**
@@ -45,6 +44,7 @@ public class GlobalException extends RuntimeException
         return this;
     }
 
+    @Override
     public String getMessage()
     {
         return message;

ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java

@@ -44,6 +44,7 @@ public final class ServiceException extends RuntimeException
         return this;
     }
 
+    @Override
     public String getMessage()
     {
         return message;

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java

@@ -0,0 +1,61 @@
+package com.ruoyi.common.exception.file;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * 文件上传异常类
+ * 
+ * @author ruoyi
+ */
+public class FileUploadException extends Exception
+{
+
+    private static final long serialVersionUID = 1L;
+
+    private final Throwable cause;
+
+    public FileUploadException()
+    {
+        this(null, null);
+    }
+
+    public FileUploadException(final String msg)
+    {
+        this(msg, null);
+    }
+
+    public FileUploadException(String msg, Throwable cause)
+    {
+        super(msg);
+        this.cause = cause;
+    }
+
+    @Override
+    public void printStackTrace(PrintStream stream)
+    {
+        super.printStackTrace(stream);
+        if (cause != null)
+        {
+            stream.println("Caused by:");
+            cause.printStackTrace(stream);
+        }
+    }
+
+    @Override
+    public void printStackTrace(PrintWriter writer)
+    {
+        super.printStackTrace(writer);
+        if (cause != null)
+        {
+            writer.println("Caused by:");
+            cause.printStackTrace(writer);
+        }
+    }
+
+    @Override
+    public Throwable getCause()
+    {
+        return cause;
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java

@@ -1,7 +1,6 @@
 package com.ruoyi.common.exception.file;
 
 import java.util.Arrays;
-import org.apache.commons.fileupload.FileUploadException;
 
 /**
  * 文件上传 误异常类

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/BlackListException.java

@@ -0,0 +1,16 @@
+package com.ruoyi.common.exception.user;
+
+/**
+ * 黑名单IP异常类
+ * 
+ * @author ruoyi
+ */
+public class BlackListException extends UserException
+{
+    private static final long serialVersionUID = 1L;
+
+    public BlackListException()
+    {
+        super("login.blocked", null);
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -145,16 +145,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     }
 
     /**
-     * 计算两个时间差
+     * 计算时间差
+     *
+     * @param endTime 最后时间
+     * @param startTime 开始时间
+     * @return 时间差（天/小时/分钟）
      */
-    public static String getDatePoor(Date endDate, Date nowDate)
+    public static String timeDistance(Date endDate, Date startTime)
     {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
         // long ns = 1000;
         // 获得两个时间的毫秒时间差异
-        long diff = endDate.getTime() - nowDate.getTime();
+        long diff = endDate.getTime() - startTime.getTime();
         // 计算差多少天
         long day = diff / nd;
         // 计算差多少小时

ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

@@ -82,7 +82,7 @@ public class DictUtils
         StringBuilder propertyString = new StringBuilder();
         List<SysDictData> datas = getDictCache(dictType);
 
-        if (StringUtils.containsAny(separator, dictValue) && StringUtils.isNotEmpty(datas))
+        if (StringUtils.containsAny(dictValue, separator) && StringUtils.isNotEmpty(datas))
         {
             for (SysDictData dict : datas)
             {
@@ -122,7 +122,7 @@ public class DictUtils
         StringBuilder propertyString = new StringBuilder();
         List<SysDictData> datas = getDictCache(dictType);
 
-        if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas))
+        if (StringUtils.containsAny(dictLabel, separator) && StringUtils.isNotEmpty(datas))
         {
             for (SysDictData dict : datas)
             {

ruoyi-common/src/main/java/com/ruoyi/common/utils/IpUtils.java

@@ -11,6 +11,13 @@ import javax.servlet.http.HttpServletRequest;
  */
 public class IpUtils
 {
+    public final static String REGX_0_255 = "(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)";
+    // 匹配 ip
+    public final static String REGX_IP = "((" + REGX_0_255 + "\\.){3}" + REGX_0_255 + ")";
+    public final static String REGX_IP_WILDCARD = "(((\\*\\.){3}\\*)|(" + REGX_0_255 + "(\\.\\*){3})|(" + REGX_0_255 + "\\." + REGX_0_255 + ")(\\.\\*){2}" + "|((" + REGX_0_255 + "\\.){3}\\*))";
+    // 匹配网段
+    public final static String REGX_IP_SEG = "(" + REGX_IP + "\\-" + REGX_IP + ")";
+
     /**
      * 获取客户端IP
      * 
@@ -247,7 +254,7 @@ public class IpUtils
                 }
             }
         }
-        return ip;
+        return StringUtils.substring(ip, 0, 255);
     }
 
     /**
@@ -260,4 +267,104 @@ public class IpUtils
     {
         return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
     }
+
+    /**
+     * 是否为IP
+     */
+    public static boolean isIP(String ip)
+    {
+        return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP);
+    }
+
+    /**
+     * 是否为IP，或 *为间隔的通配符地址
+     */
+    public static boolean isIpWildCard(String ip)
+    {
+        return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP_WILDCARD);
+    }
+
+    /**
+     * 检测参数是否在ip通配符里
+     */
+    public static boolean ipIsInWildCardNoCheck(String ipWildCard, String ip)
+    {
+        String[] s1 = ipWildCard.split("\\.");
+        String[] s2 = ip.split("\\.");
+        boolean isMatchedSeg = true;
+        for (int i = 0; i < s1.length && !s1[i].equals("*"); i++)
+        {
+            if (!s1[i].equals(s2[i]))
+            {
+                isMatchedSeg = false;
+                break;
+            }
+        }
+        return isMatchedSeg;
+    }
+
+    /**
+     * 是否为特定格式如:“10.10.10.1-10.10.10.99”的ip段字符串
+     */
+    public static boolean isIPSegment(String ipSeg)
+    {
+        return StringUtils.isNotBlank(ipSeg) && ipSeg.matches(REGX_IP_SEG);
+    }
+
+    /**
+     * 判断ip是否在指定网段中
+     */
+    public static boolean ipIsInNetNoCheck(String iparea, String ip)
+    {
+        int idx = iparea.indexOf('-');
+        String[] sips = iparea.substring(0, idx).split("\\.");
+        String[] sipe = iparea.substring(idx + 1).split("\\.");
+        String[] sipt = ip.split("\\.");
+        long ips = 0L, ipe = 0L, ipt = 0L;
+        for (int i = 0; i < 4; ++i)
+        {
+            ips = ips << 8 | Integer.parseInt(sips[i]);
+            ipe = ipe << 8 | Integer.parseInt(sipe[i]);
+            ipt = ipt << 8 | Integer.parseInt(sipt[i]);
+        }
+        if (ips > ipe)
+        {
+            long t = ips;
+            ips = ipe;
+            ipe = t;
+        }
+        return ips <= ipt && ipt <= ipe;
+    }
+
+    /**
+     * 校验ip是否符合过滤串规则
+     * 
+     * @param filter 过滤IP列表,支持后缀'*'通配,支持网段如:`10.10.10.1-10.10.10.99`
+     * @param ip 校验IP地址
+     * @return boolean 结果
+     */
+    public static boolean isMatchedIp(String filter, String ip)
+    {
+        if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
+        {
+            return false;
+        }
+        String[] ips = filter.split(";");
+        for (String iStr : ips)
+        {
+            if (isIP(iStr) && iStr.equals(ip))
+            {
+                return true;
+            }
+            else if (isIpWildCard(iStr) && ipIsInWildCardNoCheck(iStr, ip))
+            {
+                return true;
+            }
+            else if (isIPSegment(iStr) && ipIsInNetNoCheck(iStr, ip))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java

@@ -1,12 +1,16 @@
 package com.ruoyi.common.utils;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.text.Convert;
 
 /**
@@ -173,4 +177,40 @@ public class ServletUtils
         }
         return flag;
     }
+
+    /**
+     * 内容编码
+     * 
+     * @param str 内容
+     * @return 编码后的内容
+     */
+    public static String urlEncode(String str)
+    {
+        try
+        {
+            return URLEncoder.encode(str, Constants.UTF8);
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            return StringUtils.EMPTY;
+        }
+    }
+
+    /**
+     * 内容解码
+     * 
+     * @param str 内容
+     * @return 解码后的内容
+     */
+    public static String urlDecode(String str)
+    {
+        try
+        {
+            return URLDecoder.decode(str, Constants.UTF8);
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            return StringUtils.EMPTY;
+        }
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java

@@ -65,7 +65,7 @@ public class ShiroUtils
 
     public static String getIp()
     {
-        return getSubject().getSession().getHost();
+        return StringUtils.substring(getSubject().getSession().getHost(), 0, 128);
     }
 
     public static String getSessionId()

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

@@ -324,6 +324,32 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return list;
     }
 
+    /**
+     * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
+     *
+     * @param collection 给定的集合
+     * @param array 给定的数组
+     * @return boolean 结果
+     */
+    public static boolean containsAny(Collection<String> collection, String... array)
+    {
+        if (isEmpty(collection) || isEmpty(array))
+        {
+            return false;
+        }
+        else
+        {
+            for (String str : array)
+            {
+                if (collection.contains(str))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
     /**
      * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
      *

ruoyi-common/src/main/java/com/ruoyi/common/utils/YamlUtil.java

@@ -1,87 +0,0 @@
-package com.ruoyi.common.utils;
-
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 配置处理工具类
- * 
- * @author yml
- */
-public class YamlUtil
-{
-    public static Map<?, ?> loadYaml(String fileName) throws FileNotFoundException
-    {
-        InputStream in = YamlUtil.class.getClassLoader().getResourceAsStream(fileName);
-        return StringUtils.isNotEmpty(fileName) ? (LinkedHashMap<?, ?>) new Yaml().load(in) : null;
-    }
-
-    public static void dumpYaml(String fileName, Map<?, ?> map) throws IOException
-    {
-        if (StringUtils.isNotEmpty(fileName))
-        {
-            FileWriter fileWriter = new FileWriter(YamlUtil.class.getResource(fileName).getFile());
-            DumperOptions options = new DumperOptions();
-            options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-            Yaml yaml = new Yaml(options);
-            yaml.dump(map, fileWriter);
-        }
-    }
-
-    public static Object getProperty(Map<?, ?> map, Object qualifiedKey)
-    {
-        if (map != null && !map.isEmpty() && qualifiedKey != null)
-        {
-            String input = String.valueOf(qualifiedKey);
-            if (!"".equals(input))
-            {
-                if (input.contains("."))
-                {
-                    int index = input.indexOf(".");
-                    String left = input.substring(0, index);
-                    String right = input.substring(index + 1, input.length());
-                    return getProperty((Map<?, ?>) map.get(left), right);
-                }
-                else if (map.containsKey(input))
-                {
-                    return map.get(input);
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void setProperty(Map<?, ?> map, Object qualifiedKey, Object value)
-    {
-        if (map != null && !map.isEmpty() && qualifiedKey != null)
-        {
-            String input = String.valueOf(qualifiedKey);
-            if (!input.equals(""))
-            {
-                if (input.contains("."))
-                {
-                    int index = input.indexOf(".");
-                    String left = input.substring(0, index);
-                    String right = input.substring(index + 1, input.length());
-                    setProperty((Map<?, ?>) map.get(left), right, value);
-                }
-                else
-                {
-                    ((Map<Object, Object>) map).put(qualifiedKey, value);
-                }
-            }
-        }
-    }
-}